Andrew Boyson
/
web
Important changes to repositories hosted on mbed.com
Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.
To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.
It is also possible to export all your personal repositories from the account settings page.
Dependents: oldheating gps motorhome heating
Revision 59:309e78f243dd, committed 2019-03-08
- Comitter:
- andrewboyson
- Date:
- Fri Mar 08 18:42:58 2019 +0000
- Parent:
- 58:e5ab14ef6ea6
- Child:
- 60:8133f9bb78e6
- Commit message:
- Introduced leds to supplement toggles when no changes are needed.
Changed in this revision
--- a/clock/http-clock-html.c Fri Mar 08 16:07:56 2019 +0000
+++ b/clock/http-clock-html.c Fri Mar 08 18:42:58 2019 +0000
@@ -62,9 +62,9 @@
else PageAddInputButton(10, "Trace gov is off", "turn on" , "/clock", "clockgovtrace");
PageAddH2("Scan times");
- PageAddLabelledInt("Program cycles avg", 17, ScanAverage);
- PageAddLabelledInt("Program cycles max", 17, ScanMaximum);
- PageAddLabelledInt("Program cycles min", 17, ScanMinimum);
+ PageAddLabelledInt(17, "Program cycles avg", ScanAverage);
+ PageAddLabelledInt(17, "Program cycles max", ScanMaximum);
+ PageAddLabelledInt(17, "Program cycles min", ScanMinimum);
PageAddH2("Ajax");
HttpAddText("<code id='ajax-headers'></code>\r\n");
--- a/fault/http-fault-html.c Fri Mar 08 16:07:56 2019 +0000
+++ b/fault/http-fault-html.c Fri Mar 08 18:42:58 2019 +0000
@@ -17,12 +17,12 @@
int faultType = FaultTypeGet();
char text[20];
FaultTypeToString(faultType, sizeof(text), text);
- PageAddLabelledValue("Fault type", 17, text);
+ PageAddLabelledValue(17, "Fault type", text);
if (faultType)
{
FaultZoneToString(FaultZoneGet(), sizeof(text), text);
- PageAddLabelledValue("Fault zone", 17, text);
- PageAddLabelledInt("After point", 17, FaultPointGet());
+ PageAddLabelledValue(17, "Fault zone", text);
+ PageAddLabelledInt(17, "After point", FaultPointGet());
PageAddInputButton(0, "Clear fault", "clear", "/fault", "faultclear");
}
else
--- a/net/http-net-html.c Fri Mar 08 16:07:56 2019 +0000
+++ b/net/http-net-html.c Fri Mar 08 18:42:58 2019 +0000
@@ -24,40 +24,40 @@
PageAddH1(PageSite, "Net");
PageAddH2("Ethernet");
- PageAddLabelledMac ("MAC", WIDTH, MacLocal);
+ PageAddLabelledMac (WIDTH, "MAC", MacLocal);
PageAddH2("IP4 DHCP");
- PageAddLabelledIp4 ("IP4 address", WIDTH, DhcpLocalIp);
- PageAddLabelledValue("Domain", WIDTH, DhcpDomainName);
- PageAddLabelledValue("Host name", WIDTH, DhcpHostName);
- PageAddLabelledIp4 ("NTP server", WIDTH, DhcpNtpIp);
- PageAddLabelledIp4 ("DNS server", WIDTH, DhcpDnsServerIp);
- PageAddLabelledIp4 ("DHCP server", WIDTH, DhcpServerIp);
- PageAddLabelledIp4 ("Router", WIDTH, DhcpRouterIp);
- PageAddLabelledIp4 ("Subnet mask", WIDTH, DhcpSubnetMask);
- PageAddLabelledIp4 ("Broadcast IP", WIDTH, DhcpBroadcastIp);
- PageAddLabelledInt ("Lease time IP", WIDTH, DhcpLeaseTime);
- PageAddLabelledInt ("Renewal T1", WIDTH, DhcpRenewalT1);
- PageAddLabelledInt ("Renewal T2", WIDTH, DhcpRenewalT2);
- PageAddLabelledInt ("Elapsed", WIDTH, DhcpGetElapsedLife());
+ PageAddLabelledIp4 (WIDTH, "IP4 address", DhcpLocalIp);
+ PageAddLabelledValue(WIDTH, "Domain", DhcpDomainName);
+ PageAddLabelledValue(WIDTH, "Host name", DhcpHostName);
+ PageAddLabelledIp4 (WIDTH, "NTP server", DhcpNtpIp);
+ PageAddLabelledIp4 (WIDTH, "DNS server", DhcpDnsServerIp);
+ PageAddLabelledIp4 (WIDTH, "DHCP server", DhcpServerIp);
+ PageAddLabelledIp4 (WIDTH, "Router", DhcpRouterIp);
+ PageAddLabelledIp4 (WIDTH, "Subnet mask", DhcpSubnetMask);
+ PageAddLabelledIp4 (WIDTH, "Broadcast IP", DhcpBroadcastIp);
+ PageAddLabelledInt (WIDTH, "Lease time IP", DhcpLeaseTime);
+ PageAddLabelledInt (WIDTH, "Renewal T1", DhcpRenewalT1);
+ PageAddLabelledInt (WIDTH, "Renewal T2", DhcpRenewalT2);
+ PageAddLabelledInt (WIDTH, "Elapsed", DhcpGetElapsedLife());
PageAddH2("IP6 NDP");
- PageAddLabelledInt ("Hop limit", WIDTH, NdpHopLimit);
- PageAddLabelledOnOff("Managed address", WIDTH, NdpManagedConfiguration);
- PageAddLabelledOnOff("Other configuration", WIDTH, NdpOtherConfiguration);
- PageAddLabelledMac ("Router MAC", WIDTH, NdpRouterMac);
- PageAddLabelledInt ("Prefix length", WIDTH, NdpPrefixLength);
- PageAddLabelledOnOff("Prefix flag L", WIDTH, NdpPrefixFlagL);
- PageAddLabelledOnOff("Prefix flag A", WIDTH, NdpPrefixFlagA);
- PageAddLabelledInt ("Prefix valid secs", WIDTH, NdpPrefixValidLifetime);
- PageAddLabelledInt ("Prefix preferred secs", WIDTH, NdpPrefixPreferredLifetime);
- PageAddLabelledIp6 ("Prefix", WIDTH, NdpPrefix);
- PageAddLabelledInt ("DNS life secs", WIDTH, NdpDnsLifetime);
- PageAddLabelledIp6 ("DNS server", WIDTH, NdpDnsServer);
- PageAddLabelledInt ("Lease time", WIDTH, NdpGetLease());
- PageAddLabelledInt ("Elapsed", WIDTH, NdpGetElapsedLife());
- PageAddLabelledIp6 ("SLAAC", WIDTH, SlaacLinkLocalIp);
- PageAddLabelledInt ("MTU", WIDTH, NdpMtu);
+ PageAddLabelledInt (WIDTH, "Hop limit", NdpHopLimit);
+ PageAddLabelledOnOff(WIDTH, "Managed address", NdpManagedConfiguration);
+ PageAddLabelledOnOff(WIDTH, "Other configuration", NdpOtherConfiguration);
+ PageAddLabelledMac (WIDTH, "Router MAC", NdpRouterMac);
+ PageAddLabelledInt (WIDTH, "Prefix length", NdpPrefixLength);
+ PageAddLabelledOnOff(WIDTH, "Prefix flag L", NdpPrefixFlagL);
+ PageAddLabelledOnOff(WIDTH, "Prefix flag A", NdpPrefixFlagA);
+ PageAddLabelledInt (WIDTH, "Prefix valid secs", NdpPrefixValidLifetime);
+ PageAddLabelledInt (WIDTH, "Prefix preferred secs", NdpPrefixPreferredLifetime);
+ PageAddLabelledIp6 (WIDTH, "Prefix", NdpPrefix);
+ PageAddLabelledInt (WIDTH, "DNS life secs", NdpDnsLifetime);
+ PageAddLabelledIp6 (WIDTH, "DNS server", NdpDnsServer);
+ PageAddLabelledInt (WIDTH, "Lease time", NdpGetLease());
+ PageAddLabelledInt (WIDTH, "Elapsed", NdpGetElapsedLife());
+ PageAddLabelledIp6 (WIDTH, "SLAAC", SlaacLinkLocalIp);
+ PageAddLabelledInt (WIDTH, "MTU", NdpMtu);
PageAddH2("ARP 4"); HttpAddText("<code>"); Ar4SendHttp(); HttpAddText("</code>\r\n");
PageAddH2("DNS 4"); HttpAddText("<code>"); Nr4SendHttp(); HttpAddText("</code>\r\n");
--- a/page/page.c Fri Mar 08 16:07:56 2019 +0000
+++ b/page/page.c Fri Mar 08 18:42:58 2019 +0000
@@ -88,7 +88,7 @@
HttpAddText("</ul></nav>\r\n");
}
-void PageAddLabelledValue(char* label, float labelwidth, char* value)
+void PageAddLabelledValue(float labelwidth, char* label, char* value)
{
HttpAddF ("<div style='width:%.1fem;'>", labelwidth);
HttpAddText(label);
@@ -98,7 +98,7 @@
HttpAddText("</div>\r\n");
}
-void PageAddLabelledMac(char* label, float labelwidth, char* mac)
+void PageAddLabelledMac(float labelwidth, char* label, char* mac)
{
HttpAddF ("<div style='width:%.1fem;'>", labelwidth);
HttpAddText(label);
@@ -108,7 +108,7 @@
HttpAddText("</div>\r\n");
}
-void PageAddLabelledIp4(char* label, float labelwidth, uint32_t ip)
+void PageAddLabelledIp4(float labelwidth, char* label, uint32_t ip)
{
HttpAddF ("<div style='width:%.1fem;'>", labelwidth);
HttpAddText(label);
@@ -118,7 +118,7 @@
HttpAddText ("</div>\r\n");
}
-void PageAddLabelledIp6(char* label, float labelwidth, char* ip)
+void PageAddLabelledIp6(float labelwidth, char* label, char* ip)
{
HttpAddF ("<div style='width:%.1fem;'>", labelwidth);
HttpAddText(label);
@@ -127,16 +127,16 @@
HttpAddText("</span>");
HttpAddText ("</div>\r\n");
}
-void PageAddLabelledOnOff(char* label, float labelwidth, int value)
+void PageAddLabelledOnOff(float labelwidth, char* label, int value)
{
- if (value) PageAddLabelledValue(label, labelwidth, "On");
- else PageAddLabelledValue(label, labelwidth, "Off");
+ if (value) PageAddLabelledValue(labelwidth, label, "On");
+ else PageAddLabelledValue(labelwidth, label, "Off");
}
-void PageAddLabelledInt(char* label, float labelwidth, int value)
+void PageAddLabelledInt(float labelwidth, char* label, int value)
{
char text[30];
snprintf(text, sizeof(text), "%8d", value); //Right align with enough spaces so that the length is always constant.
- PageAddLabelledValue(label, labelwidth, text);
+ PageAddLabelledValue(labelwidth, label, text);
}
void PageAddInputText(float labelwidth, char* label, float inputwidth, char* value, char* action, char* name)
{
@@ -162,28 +162,6 @@
HttpAddF("<input type='submit' value='%s'>\r\n", value);
HttpAddText("</form>\r\n");
}
-void PageAddTm(struct tm* ptm)
-{
- char text[30];
- snprintf(text, sizeof(text), "%d-%02d-%02d ", ptm->tm_year + 1900, ptm->tm_mon + 1, ptm->tm_mday);
- HttpAddText(text);
- switch(ptm->tm_wday)
- {
- case 0: HttpAddText("Sun"); break;
- case 1: HttpAddText("Mon"); break;
- case 2: HttpAddText("Tue"); break;
- case 3: HttpAddText("Wed"); break;
- case 4: HttpAddText("Thu"); break;
- case 5: HttpAddText("Fri"); break;
- case 6: HttpAddText("Sat"); break;
- default: HttpAddText("???"); break;
- }
- snprintf(text, sizeof(text), " %02d:%02d:%02d", ptm->tm_hour, ptm->tm_min, ptm->tm_sec);
- HttpAddText(text);
- if (ptm->tm_isdst > 0) HttpAddText(" BST");
- else if (ptm->tm_isdst == 0) HttpAddText(" GMT");
- else HttpAddText(" UTC");
-}
void PageAddAjaxInputToggle(float labelwidth, char* label, char* id, char* name)
{
HttpAddText("<div>\r\n");
--- a/page/page.h Fri Mar 08 16:07:56 2019 +0000 +++ b/page/page.h Fri Mar 08 18:42:58 2019 +0000 @@ -1,4 +1,3 @@ -#include <time.h> #include <stdint.h> #define FAULT_PAGE 0 @@ -17,17 +16,16 @@ extern void PageAddH2 (const char* text); extern void PageAddEnd (void); -extern void PageAddLabelledValue(char* label, float labelwidth, char* value); -extern void PageAddLabelledMac (char* label, float labelwidth, char* mac); -extern void PageAddLabelledIp4 (char* label, float labelwidth, uint32_t ip); -extern void PageAddLabelledIp6 (char* label, float labelwidth, char* ip); -extern void PageAddLabelledOnOff(char* label, float labelwidth, int value); -extern void PageAddLabelledInt (char* label, float labelwidth, int value); -extern void PageAddTm (struct tm* ptm); +extern void PageAddLabelledValue (float labelwidth, char* label, char* value); +extern void PageAddLabelledMac (float labelwidth, char* label, char* mac); +extern void PageAddLabelledIp4 (float labelwidth, char* label, uint32_t ip); +extern void PageAddLabelledIp6 (float labelwidth, char* label, char* ip); +extern void PageAddLabelledOnOff (float labelwidth, char* label, int value); +extern void PageAddLabelledInt (float labelwidth, char* label, int value); -extern void PageAddInputText (float labelwidth, char* label, float inputwidth, char* value, char* action, char* name); -extern void PageAddInputInt (float labelwidth, char* label, float inputwidth, int value, char* action, char* name); -extern void PageAddInputButton (float labelwidth, char* label, char* value, char* action, char* name); +extern void PageAddInputText (float labelwidth, char* label, float inputwidth, char* value, char* action, char* name); +extern void PageAddInputInt (float labelwidth, char* label, float inputwidth, int value, char* action, char* name); +extern void PageAddInputButton (float labelwidth, char* label, char* value, char* action, char* name); extern void PageAddAjaxInputToggle(float labelwidth, char* label, char* id, char* name); extern void PageAddAjaxInput (float labelwidth, char* label, float inputwidth, char* id, char* name);