Diff: clock/http-clock-html.c

Revision:

94:d7226b2c14b6

Parent:

89:615fb951df69

Child:

95:8c9dda8a0caf

diff -r 8995561d995f -r d7226b2c14b6 clock/http-clock-html.c
--- a/clock/http-clock-html.c	Fri Apr 12 14:12:02 2019 +0000
+++ b/clock/http-clock-html.c	Tue Apr 16 19:18:27 2019 +0000
@@ -4,12 +4,6 @@
 #include         "page.h"
 #include "page-derived.h"
 #include  "http-server.h"
-#include          "clk.h"
-#include          "rtc.h"
-#include       "clkutc.h"
-#include       "clkgov.h"
-#include         "scan.h"
-#include    "ntpclient.h"
 
 void HttpClockHtml()
 {
@@ -35,44 +29,41 @@
     HttpAddText("<div id='ajax-date-diff'></div>\r\n");    
     
     PageAddH2("UTC");
-    PageAddAjaxInputToggle("Enable epoch change"      ,    "ajax-leap-enable"  , "chg-clock-leap-enable" );
-    PageAddAjaxInputToggle("Direction of next epoch"  ,    "ajax-leap-forward" , "chg-clock-leap-forward");
-    PageAddAjaxInput      ("Year next epoch starts"   , 4, "ajax-leap-year"    , "set-clock-leap-year"   );
-    PageAddAjaxInput      ("Month next epoch starts"  , 4, "ajax-leap-month"   , "set-clock-leap-month"  );
-    PageAddAjaxInput      ("Current era offset"       , 4, "ajax-leap-count"   , "set-clock-leap-count"  );
+    PageAddAjaxInputToggle("Enable epoch change"     ,    "ajax-leap-enable"  , "chg-clock-leap-enable" );
+    PageAddAjaxInputToggle("Direction of next epoch" ,    "ajax-leap-forward" , "chg-clock-leap-forward");
+    PageAddAjaxInput      ("Year next epoch starts"  , 4, "ajax-leap-year"    , "set-clock-leap-year"   );
+    PageAddAjaxInput      ("Month next epoch starts" , 4, "ajax-leap-month"   , "set-clock-leap-month"  );
+    PageAddAjaxInput      ("Current era offset"      , 4, "ajax-leap-count"   , "set-clock-leap-count"  );
 
     HttpAddText("<div><button type='button' onclick='DisplayLeap()'>Display leap</button></div>\r\n");
     
     HttpAddText("<div>The leap seconds list is available from <a href='https://www.ietf.org/timezones/data/leap-seconds.list' target='_blank'>ietf</a></div>\r\n");
         
     PageAddH2("Governer");
-    PageAddAjaxInput("Ppb",                      5, "ajax-ppb"                                , "ppb"           );
-    PageAddInputInt ("Ppb divisor",              5, ClkGovFreqDivisor               , "/clock", "ppbdivisor"    );
-    PageAddInputInt ("Ppb max change",           5, ClkGovFreqChangeMaxPpb          , "/clock", "ppbmaxchange"  );
-    PageAddInputInt ("Ppb synced limit",         5, ClkGovFreqSyncedLimPpb          , "/clock", "syncedlimitppb");
-    PageAddInputInt ("Ppb synced hysteresis",    5, ClkGovFreqSyncedHysPpb          , "/clock", "syncedhysppb"  );
-
-    PageAddInputInt ("Offset divisor",           5, ClkGovSlewDivisor               , "/clock", "slewdivisor"   );
-    PageAddInputInt ("Offset max (ms)",          5, ClkGovSlewChangeMaxMs           , "/clock", "slewmax"       );
-    PageAddInputInt ("Offset synced limit (ms)", 5, ClkGovSlewSyncedLimNs / 1000000 , "/clock", "syncedlimitns" );
-    PageAddInputInt ("Offset synced hys (ms)",   5, ClkGovSlewSyncedHysNs / 1000000 , "/clock", "syncedhysns"   );
-    PageAddInputInt ("Offset reset limit (s)",   5, ClkGovSlewOffsetMaxSecs         , "/clock", "maxoffsetsecs" );
-    
-    if (ClkGovTrace) PageAddInputButton("Trace gov is on",  "Turn off", "/clock", "clockgovtrace");
-    else             PageAddInputButton("Trace gov is off", "Turn on" , "/clock", "clockgovtrace");
+    PageAddAjaxInput      ("Ppb"                     , 5, "ajax-ppb"          , "ppb"           );
+    PageAddAjaxInput      ("Ppb divisor"             , 5, "ajax-ppb-divisor"  , "ppbdivisor"    );
+    PageAddAjaxInput      ("Ppb max change"          , 5, "ajax-ppb-max-chg"  , "ppbmaxchange"  );
+    PageAddAjaxInput      ("Ppb synced limit"        , 5, "ajax-ppb-syn-lim"  , "syncedlimitppb");
+    PageAddAjaxInput      ("Ppb synced hysteresis"   , 5, "ajax-ppb-syn-hys"  , "syncedhysppb"  );
+    PageAddAjaxInput      ("Offset divisor"          , 5, "ajax-off-divisor"  , "slewdivisor"   );
+    PageAddAjaxInput      ("Offset max (ms)"         , 5, "ajax-off-max"      , "slewmax"       );
+    PageAddAjaxInput      ("Offset synced limit (ms)", 5, "ajax-off-syn-lim"  , "syncedlimitns" );
+    PageAddAjaxInput      ("Offset synced hys (ms)"  , 5, "ajax-off-syn-hys"  , "syncedhysns"   );
+    PageAddAjaxInput      ("Offset reset limit (s)"  , 5, "ajax-off-rst-lim"  , "maxoffsetsecs" );
+    PageAddAjaxInputToggle("Trace"                      , "ajax-gov-trace"    , "clockgovtrace" );
 
     PageAddH2("NTP");
-    PageAddInputText("Server url",           5, NtpClientQueryServerName,          "/clock", "ntpserver"    );
-    PageAddInputInt ("Initial interval (s)", 5, NtpClientQueryInitialInterval,     "/clock", "clockinitial" );
-    PageAddInputInt ("Normal interval (m)",  5, NtpClientQueryNormalInterval / 60, "/clock", "clocknormal"  );
-    PageAddInputInt ("Retry interval (s)",   5, NtpClientQueryRetryInterval,       "/clock", "clockretry"   );
-    PageAddInputInt ("Offset (ms)",          5, NtpClientReplyOffsetMs,            "/clock", "clockoffset"  );
-    PageAddInputInt ("Max delay (ms)",       5, NtpClientReplyMaxDelayMs,          "/clock", "clockmaxdelay");
+    PageAddAjaxInput      ("Server url"              , 5, "ajax-ntp-server"   , "ntpserver"     );
+    PageAddAjaxInput      ("Initial interval (s)"    , 5, "ajax-ntp-initial"  , "clockinitial"  );
+    PageAddAjaxInput      ("Normal interval (m)"     , 5, "ajax-ntp-normal"   , "clocknormal"   );
+    PageAddAjaxInput      ("Retry interval (s)"      , 5, "ajax-ntp-retry"    , "clockretry"    );
+    PageAddAjaxInput      ("Offset (ms)"             , 5, "ajax-ntp-offset"   , "clockoffset"   );
+    PageAddAjaxInput      ("Max delay (ms)"          , 5, "ajax-ntp-max-delay", "clockmaxdelay" );
 
     PageAddH2("Scan times");
-    PageAddAjaxLabelled("Program cycles avg", "ajax-scan-avg");
-    PageAddAjaxLabelled("Program cycles max", "ajax-scan-max");
-    PageAddAjaxLabelled("Program cycles min", "ajax-scan-min");
+    PageAddAjaxLabelled   ("Program cycles avg", "ajax-scan-avg");
+    PageAddAjaxLabelled   ("Program cycles max", "ajax-scan-max");
+    PageAddAjaxLabelled   ("Program cycles min", "ajax-scan-min");
 
     PageAddEnd();
 }