Diff: settings/settings.c

Revision:

98:52506c675c82

Parent:

88:2c72beb1debe

Child:

99:8046e818f3dd

--- a/settings/settings.c	Wed May 06 18:40:02 2020 +0000
+++ b/settings/settings.c	Tue Dec 29 20:20:39 2020 +0000
@@ -18,8 +18,7 @@
 #include  "ntpclient.h"
 #include       "dhcp.h"
 #include         "ns.h"
-#include        "nr4.h"
-#include        "nr6.h"
+#include         "nr.h"
 #include     "clkgov.h"
 #include      "echo4.h"
 #include      "echo6.h"
@@ -54,7 +53,7 @@
 */
 
 enum { iLogUart, iNetStack, iNetNewLine, iNetVerbose, iLink, iDnsName, iDnsQuery, iDnsReply, iDnsServer,
-       iNtp, iDhcp, iNsRecvSol, iNsRecvAdv, iNsSendSol, iNr4, iNr6, iNtpClient, iClkGov, iEcho4, iEcho6,
+       iNtp, iDhcp, iNsRecvSol, iNsRecvAdv, iNsSendSol, iNr4, iNr, iNtpClient, iClkGov, iEcho4, iEcho6,
        iDest6, iRa, iRs, iAr4, iAr6, iArp, iIp4, iIp6, iUdp, iTcp, iHttp, iTftp };
 
 int GetSensorHeight()
@@ -104,7 +103,7 @@
 void ChgTraceNsRecvAdv () {        NsTraceRecvAdv =        !NsTraceRecvAdv; setBit(iNsRecvAdv,         NsTraceRecvAdv); }
 void ChgTraceNsSendSol () {        NsTraceSendSol =        !NsTraceSendSol; setBit(iNsSendSol,         NsTraceSendSol); }
 void ChgTraceNr4       () {       Nr4Trace        =       !Nr4Trace       ; setBit(iNr4,              Nr4Trace       ); }
-void ChgTraceNr6       () {       Nr6Trace        =       !Nr6Trace       ; setBit(iNr6,              Nr6Trace       ); }
+void ChgTraceNr6       () {        NrTrace        =        !NrTrace       ; setBit(iNr,                NrTrace       ); }
 void ChgTraceNtpClient () { NtpClientTrace        = !NtpClientTrace       ; setBit(iNtpClient,  NtpClientTrace       ); }
 void ChgTraceSync      () {    ClkGovTrace        =    !ClkGovTrace       ; setBit(iClkGov,        ClkGovTrace       ); }
 void ChgTraceEcho4     () {     Echo4Trace        =     !Echo4Trace       ; setBit(iEcho4,          Echo4Trace       ); }
@@ -194,7 +193,7 @@
            NsTraceRecvAdv = getBit(iNsRecvAdv);
            NsTraceSendSol = getBit(iNsSendSol);
           Nr4Trace        = getBit(iNr4);
-          Nr6Trace        = getBit(iNr6);
+           NrTrace        = getBit(iNr);
     NtpClientTrace        = getBit(iNtpClient);
        ClkGovTrace        = getBit(iClkGov);
         Echo4Trace        = getBit(iEcho4);