Diff: clock/http-clock-html.c

Revision:

77:4689596a2f3f

Parent:

73:4e769dbbf9f2

Child:

87:c51478679090

--- a/clock/http-clock-html.c	Thu Mar 21 11:21:19 2019 +0000
+++ b/clock/http-clock-html.c	Sat Mar 23 12:26:49 2019 +0000
@@ -19,60 +19,60 @@
     PageAddH1(PageSite, "Clock");
     
     PageAddH2("Status");
-    PageAddAjaxLed(10.0, "RTC is set"           , "ajax-rtc-set"    );
-    PageAddAjaxLed(10.0, "Clock is set"         , "ajax-clock-set"  );
-    PageAddAjaxLed(10.0, "External source is ok", "ajax-source-ok"  );
-    PageAddAjaxLed(10.0, "Time synchronised"    , "ajax-time-locked");
-    PageAddAjaxLed(10.0, "Rate synchronised"    , "ajax-rate-locked");
+    PageAddAjaxLed("RTC is set"           , "ajax-rtc-set"    );
+    PageAddAjaxLed("Clock is set"         , "ajax-clock-set"  );
+    PageAddAjaxLed("External source is ok", "ajax-source-ok"  );
+    PageAddAjaxLed("Time synchronised"    , "ajax-time-locked");
+    PageAddAjaxLed("Rate synchronised"    , "ajax-rate-locked");
     
     PageAddH2("Server UTC time");
-    HttpAddText("<div id='date-utc'></div>\r\n");
+    HttpAddText("<div id='ajax-date-utc'></div>\r\n");
 
     PageAddH2("Server local time");
-    HttpAddText("<div id='date-pc'></div>\r\n");
+    HttpAddText("<div id='ajax-date-pc'></div>\r\n");
     
     PageAddH2("Server - PC (ms)");
-    HttpAddText("<div id='date-diff'></div>\r\n");    
+    HttpAddText("<div id='ajax-date-diff'></div>\r\n");    
     
     PageAddH2("UTC");
-    PageAddAjaxInputToggle(16, "Enable epoch change"      ,       "ajax-leap-enable"  , "chg-clock-leap-enable" );
-    PageAddAjaxInputToggle(16, "Direction of next epoch"  ,       "ajax-leap-forward" , "chg-clock-leap-forward");
-    PageAddAjaxInput      (12, "Year next epoch starts"   , 5.2 , "ajax-leap-year"    , "set-clock-leap-year"   );
-    PageAddAjaxInput      (12, "Month next epoch starts"  , 5.2 , "ajax-leap-month"   , "set-clock-leap-month"  );
-    PageAddAjaxInput      (12, "Current era offset"       , 5.2 , "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");
-    PageAddInputInt (12, "Ppb",                      5, ClkGovGetPpb()                  , "/clock", "ppb"           );
-    PageAddInputInt (12, "Ppb divisor",              5, ClkGovFreqDivisor               , "/clock", "ppbdivisor"    );
-    PageAddInputInt (12, "Ppb max change",           5, ClkGovFreqChangeMaxPpb          , "/clock", "ppbmaxchange"  );
-    PageAddInputInt (12, "Ppb synced limit",         5, ClkGovFreqSyncedLimPpb          , "/clock", "syncedlimitppb");
-    PageAddInputInt (12, "Ppb synced hysteresis",    5, ClkGovFreqSyncedHysPpb          , "/clock", "syncedhysppb"  );
+    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 (12, "Offset divisor",           5, ClkGovSlewDivisor               , "/clock", "slewdivisor"   );
-    PageAddInputInt (12, "Offset max (ms)",          5, ClkGovSlewChangeMaxMs           , "/clock", "slewmax"       );
-    PageAddInputInt (12, "Offset synced limit (ms)", 5, ClkGovSlewSyncedLimNs / 1000000 , "/clock", "syncedlimitns" );
-    PageAddInputInt (12, "Offset synced hys (ms)",   5, ClkGovSlewSyncedHysNs / 1000000 , "/clock", "syncedhysns"   );
-    PageAddInputInt (12, "Offset reset limit (s)",   5, ClkGovSlewOffsetMaxSecs         , "/clock", "maxoffsetsecs" );
+    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(10, "Trace gov is on",  "turn off", "/clock", "clockgovtrace");
-    else             PageAddInputButton(10, "Trace gov is off", "turn on" , "/clock", "clockgovtrace");
+    if (ClkGovTrace) PageAddInputButton("Trace gov is on",  "turn off", "/clock", "clockgovtrace");
+    else             PageAddInputButton("Trace gov is off", "turn on" , "/clock", "clockgovtrace");
 
     PageAddH2("NTP");
-    PageAddInputText(12, "Server url",           5, NtpClientQueryServerName,          "/clock", "ntpserver"    );
-    PageAddInputInt (12, "Initial interval (s)", 5, NtpClientQueryInitialInterval,     "/clock", "clockinitial" );
-    PageAddInputInt (12, "Normal interval (m)",  5, NtpClientQueryNormalInterval / 60, "/clock", "clocknormal"  );
-    PageAddInputInt (12, "Retry interval (s)",   5, NtpClientQueryRetryInterval,       "/clock", "clockretry"   );
-    PageAddInputInt (12, "Offset (ms)",          5, NtpClientReplyOffsetMs,            "/clock", "clockoffset"  );
-    PageAddInputInt (12, "Max delay (ms)",       5, NtpClientReplyMaxDelayMs,          "/clock", "clockmaxdelay");
+    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");
 
     PageAddH2("Scan times");
-    PageAddLabelledInt(17, "Program cycles avg", ScanAverage);
-    PageAddLabelledInt(17, "Program cycles max", ScanMaximum);
-    PageAddLabelledInt(17, "Program cycles min", ScanMinimum);
+    PageAddAjaxLabelled("Program cycles avg", "ajax-scan-avg");
+    PageAddAjaxLabelled("Program cycles max", "ajax-scan-max");
+    PageAddAjaxLabelled("Program cycles min", "ajax-scan-min");
 
     PageAddH2("Ajax");
     HttpAddText("<code id='ajax-headers'></code>\r\n");