Diff: http-clock-html.c

Revision:

19:598dd2145e84

Parent:

15:2cea2bbd5046

Child:

20:007fb5796d20

--- a/http-clock-html.c	Tue Jan 08 14:07:18 2019 +0000
+++ b/http-clock-html.c	Tue Jan 08 20:42:36 2019 +0000
@@ -4,9 +4,10 @@
 #include      "page.h"
 #include       "nav.h"
 #include "http-base.h"
-#include     "clock.h"
+#include       "clk.h"
 #include       "rtc.h"
-#include  "clkstate.h"
+#include    "clkutc.h"
+#include    "clkgov.h"
 #include      "scan.h"
 
 void HttpClockHtml()
@@ -42,17 +43,17 @@
     HttpAddText("<button type='button' onclick='DisplayLeap()'>Display Leap</button>\r\n");
         
     PageAddH2("Settings");
-    PageAddIntInput ("/clock", 0, "Ppb",                     12, "ppb",            5, ClockPpb                        );
-    PageAddIntInput ("/clock", 0, "Ppb divisor",             12, "ppbdivisor",     5, ClockPpbDivisor                 );
-    PageAddIntInput ("/clock", 0, "Ppb max change",          12, "ppbmaxchange",   5, ClockPpbChangeMax               );
-    PageAddIntInput ("/clock", 0, "Ppb synced limit",        12, "syncedlimitppb", 5, ClockSyncedLimitPpb             );
-    PageAddIntInput ("/clock", 0, "Ppb synced hysteresis",   12, "syncedhysppb",   5, ClockSyncedHysterisPpb          );
+    PageAddIntInput ("/clock", 0, "Ppb",                     12, "ppb",            5, ClkGovGetPpb()                   );
+    PageAddIntInput ("/clock", 0, "Ppb divisor",             12, "ppbdivisor",     5, ClkGovPpbDivisor                 );
+    PageAddIntInput ("/clock", 0, "Ppb max change",          12, "ppbmaxchange",   5, ClkGovPpbChangeMax               );
+    PageAddIntInput ("/clock", 0, "Ppb synced limit",        12, "syncedlimitppb", 5, ClkGovSyncedLimitPpb             );
+    PageAddIntInput ("/clock", 0, "Ppb synced hysteresis",   12, "syncedhysppb",   5, ClkGovSyncedHysterisPpb          );
 
-    PageAddIntInput ("/clock", 0, "Offset divisor",          12, "slewdivisor",    5, ClockSlewDivisor                );
-    PageAddIntInput ("/clock", 0, "Offset max (ms)",         12, "slewmax",        5, ClockSlewMaxMs                  );
-    PageAddIntInput ("/clock", 0, "Offset synced limit (ms)",12, "syncedlimitns",  5, ClockSyncedLimitNs    / 1000000 );
-    PageAddIntInput ("/clock", 0, "Offset synced hys (ms)",  12, "syncedhysns",    5, ClockSyncedHysterisNs / 1000000 );
-    PageAddIntInput ("/clock", 0, "Offset reset limit (s)",  12, "maxoffsetsecs",  5, ClockMaxOffsetSecs              );
+    PageAddIntInput ("/clock", 0, "Offset divisor",          12, "slewdivisor",    5, ClkGovSlewDivisor                );
+    PageAddIntInput ("/clock", 0, "Offset max (ms)",         12, "slewmax",        5, ClkGovSlewMaxMs                  );
+    PageAddIntInput ("/clock", 0, "Offset synced limit (ms)",12, "syncedlimitns",  5, ClkGovSyncedLimitNs    / 1000000 );
+    PageAddIntInput ("/clock", 0, "Offset synced hys (ms)",  12, "syncedhysns",    5, ClkGovSyncedHysterisNs / 1000000 );
+    PageAddIntInput ("/clock", 0, "Offset reset limit (s)",  12, "maxoffsetsecs",  5, ClkGovMaxOffsetSecs              );
 
     PageAddH2("Scan times");
     PageAddLabelledInt("Program cycles avg", 17, ScanAverage);