Diff: settings/settings.c

Revision:

24:6f3e53833e62

Parent:

18:eda70c3ee1a0

Child:

31:1a1d20352fca

--- a/settings/settings.c	Tue Jan 08 15:07:03 2019 +0000
+++ b/settings/settings.c	Tue Jan 08 21:07:03 2019 +0000
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <stdbool.h>
 
-#include   "clkstate.h"
+#include     "clkutc.h"
 #include        "log.h"
 #include        "net.h"
 #include       "link.h"
@@ -15,7 +15,7 @@
 #include         "ns.h"
 #include        "nr4.h"
 #include        "nr6.h"
-#include    "clksync.h"
+#include     "clkgov.h"
 #include      "echo4.h"
 #include      "echo6.h"
 #include      "dest6.h"
@@ -49,7 +49,7 @@
 */
 
 enum { iLogUart, iNetStack, iNetNewLine, iNetVerbose, iLink, iDnsName, iDnsQuery, iDnsReply, iDnsServer,
-       iNtp, iDhcp, iNsRecvSol, iNsRecvAdv, iNsSendSol, iNr4, iNr6, iNtpClient, iClkSync, iEcho4, iEcho6,
+       iNtp, iDhcp, iNsRecvSol, iNsRecvAdv, iNsSendSol, iNr4, iNr6, iNtpClient, iClkGov, iEcho4, iEcho6,
        iDest6, iRa, iRs, iAr4, iAr6, iArp, iIp4, iIp6, iUdp, iTcp, iHttp, iTftp };
 
 int GetSensorHeight()
@@ -96,7 +96,7 @@
 void ChgTraceNr4       () {       Nr4Trace        =       !Nr4Trace       ; setBit(iNr4,              Nr4Trace       ); }
 void ChgTraceNr6       () {       Nr6Trace        =       !Nr6Trace       ; setBit(iNr6,              Nr6Trace       ); }
 void ChgTraceNtpClient () { NtpClientTrace        = !NtpClientTrace       ; setBit(iNtpClient,  NtpClientTrace       ); }
-void ChgTraceSync      () {   ClkSyncTrace        =   !ClkSyncTrace       ; setBit(iClkSync,      ClkSyncTrace       ); }
+void ChgTraceSync      () {    ClkGovTrace        =    !ClkGovTrace       ; setBit(iClkGov,        ClkGovTrace       ); }
 void ChgTraceEcho4     () {     Echo4Trace        =     !Echo4Trace       ; setBit(iEcho4,          Echo4Trace       ); }
 void ChgTraceEcho6     () {     Echo6Trace        =     !Echo6Trace       ; setBit(iEcho6,          Echo6Trace       ); }
 void ChgTraceDest6     () {     Dest6Trace        =     !Dest6Trace       ; setBit(iDest6,          Dest6Trace       ); }
@@ -117,27 +117,27 @@
 void ChgTftpSendRequestsViaIp4() { TftpSendRequestsViaIp4 = !TftpSendRequestsViaIp4; }
 
 //Clock settings
-void SetClockSlewDivisor      (int  value) { ClockSlewDivisor       = value; }
-void SetClockSlewMaxMs        (int  value) { ClockSlewMaxMs         = value; }
-void SetClockPpbDivisor       (int  value) { ClockPpbDivisor        = value; }
-void SetClockPpbChangeMax     (int  value) { ClockPpbChangeMax      = value; }
-void SetClockSyncedLimitNs    (int  value) { ClockSyncedLimitNs     = value; }
-void SetClockSyncedLimitPpb   (int  value) { ClockSyncedLimitPpb    = value; }
-void SetClockSyncedHysterisNs (int  value) { ClockSyncedHysterisNs  = value; }
-void SetClockSyncedHysterisPpb(int  value) { ClockSyncedHysterisPpb = value; }
-void SetClockMaxOffsetSecs    (int  value) { ClockMaxOffsetSecs     = value; }
+void SetClockSlewDivisor      (int  value) { ClkGovSlewDivisor       = value; }
+void SetClockSlewMaxMs        (int  value) { ClkGovSlewMaxMs         = value; }
+void SetClockPpbDivisor       (int  value) { ClkGovPpbDivisor        = value; }
+void SetClockPpbChangeMax     (int  value) { ClkGovPpbChangeMax      = value; }
+void SetClockSyncedLimitNs    (int  value) { ClkGovSyncedLimitNs     = value; }
+void SetClockSyncedLimitPpb   (int  value) { ClkGovSyncedLimitPpb    = value; }
+void SetClockSyncedHysterisNs (int  value) { ClkGovSyncedHysterisNs  = value; }
+void SetClockSyncedHysterisPpb(int  value) { ClkGovSyncedHysterisPpb = value; }
+void SetClockMaxOffsetSecs    (int  value) { ClkGovMaxOffsetSecs     = value; }
 
 int SettingsInit()
 {
-    ClockSlewDivisor       =       10;
-    ClockSlewMaxMs         =       20;
-    ClockPpbDivisor        =     1000;
-    ClockPpbChangeMax      = 10000000;
-    ClockSyncedLimitNs     =   100000;
-    ClockSyncedLimitPpb    =   100000;
-    ClockSyncedHysterisNs  =    10000;
-    ClockSyncedHysterisPpb =     1000;
-    ClockMaxOffsetSecs     =        3;
+    ClkGovSlewDivisor       =       10;
+    ClkGovSlewMaxMs         =       20;
+    ClkGovPpbDivisor        =     1000;
+    ClkGovPpbChangeMax      = 10000000;
+    ClkGovSyncedLimitNs     =   100000;
+    ClkGovSyncedLimitPpb    =   100000;
+    ClkGovSyncedHysterisNs  =    10000;
+    ClkGovSyncedHysterisPpb =     1000;
+    ClkGovMaxOffsetSecs     =        3;
     
      DnsSendRequestsViaIp4 = false;
      NtpSendRequestsViaIp4 = false;
@@ -163,7 +163,7 @@
           Nr4Trace        = getBit(iNr4);
           Nr6Trace        = getBit(iNr6);
     NtpClientTrace        = getBit(iNtpClient);
-      ClkSyncTrace        = getBit(iClkSync);
+       ClkGovTrace        = getBit(iClkGov);
         Echo4Trace        = getBit(iEcho4);
         Echo6Trace        = getBit(iEcho6);
         Dest6Trace        = getBit(iDest6);