ChangeLog, refclock_wwv.c:

  * ntpd/refclock_wwv.c: More improvements
  From: Dave Mills <mills@udel.edu>

bk: 387bba9aJaF4eHe5EyBEIWQVRPINPw

diff --git a/ChangeLog b/ChangeLog
index 6de8ae8e0f918c5e6e5e473281bb37b2455c4b1a..7d7ae203d622642ee91d0951560ab156e59ebe49 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-01-11  Harlan Stenn  <stenn@whimsy.udel.edu>
+
+       * ntpd/refclock_wwv.c: More improvements
+       From: Dave Mills <mills@udel.edu>
+
 2000-01-10  Harlan Stenn  <stenn@whimsy.udel.edu>
 
        * ntpd/refclock_wwv.c: Bugfixes/improvements

diff --git a/ntpd/refclock_wwv.c b/ntpd/refclock_wwv.c
index da831a308db737e4bfbb39c08b6cb855073438ad..d561a0f66814cb0c5390a371314540b5b9396196 100644 (file)
--- a/ntpd/refclock_wwv.c
+++ b/ntpd/refclock_wwv.c
@@ -1220,7 +1220,7 @@ wwv_rf(
 
                        /*
                         * If the second sync times out, dim the sync
-                        * lamp and raises an alarm.
+                        * lamp and raise an alarm.
                         */
                        up->swatch++;
                        if (up->swatch > HSPEC)
@@ -1347,6 +1347,8 @@ wwv_rf(
                wwv_endpoc(peer, epomax, epopos);
                up->epomax = epomax;
                epomax = 0;
+               if (!(up->status & MSYNC))
+                       wwv_gain(peer);
        }
        dtemp = (epobuf[up->epoch] += (mfsync - epobuf[up->epoch]) /
            (MINAVG << up->avgint));
@@ -1517,10 +1519,10 @@ wwv_qrz(
                                        break;
                        }
                        sprintf(tbuf,
-                           "wwv8 %-3s %d %5.0f %5.1f %7ld %7ld %7ld",
-                           sp->ident, sp->count, sp->sigmax, snr,
-                           sp->pos, sp->jitter, MOD(sp->pos -
-                           up->nepoch - SYNSIZ, MINUTE));
+                           "wwv8 %d %3d %-3s %d %5.0f %5.1f %7ld %7ld %7ld",
+                           up->port, up->gain, sp->ident, sp->count,
+                           sp->sigmax, snr, sp->pos, sp->jitter,
+                           MOD(sp->pos - up->nepoch - SYNSIZ, MINUTE));
                        if (pp->sloppyclockflag & CLK_FLAG4)
                                record_clock_stats(&peer->srcadr, tbuf);
 #ifdef DEBUG
@@ -2013,11 +2015,11 @@ wwv_rsec(
 
                cp->errcnt = 0;
                sprintf(tbuf,
-    "wwv5 %d %s %04x %d %.0f/%.1f/%ld %s %04x %d %.0f/%.1f/%ld",
-                   up->gain, sp->ident, sp->select, sp->count,
-                   sp->synmax, sp->synsnr, sp->jitter, rp->ident,
-                   rp->select, rp->count, rp->synmax,rp->synsnr,
-                   rp->jitter);
+    "wwv5 %d %3d %-3s %04x %d %.0f/%.1f/%ld %s %04x %d %.0f/%.1f/%ld",
+                   up->port, up->gain, sp->ident, sp->select,
+                   sp->count, sp->synmax, sp->synsnr, sp->jitter,
+                   rp->ident, rp->select, rp->count, rp->synmax,
+                   rp->synsnr, rp->jitter);
                if (pp->sloppyclockflag & CLK_FLAG4)
                        record_clock_stats(&peer->srcadr, tbuf);
 #ifdef DEBUG