Revision 120:85a4d8f7517d, committed 2019-05-09

Comitter:

andrewboyson

Date:

Thu May 09 09:38:42 2019 +0000

Parent:

119:794e5985d6c8

Child:

121:811adea8a6a4

Commit message:

Updated Last Reset page

Changed in this revision

--- a/base/fault/web-fault-html.c	Thu May 09 07:48:03 2019 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-#include <stdio.h>
-
-#include "http.h"
-#include "web-nav-base.h"
-#include "web-add.h"
-#include "reset.h"
-#include "restart.h"
-#include "rsid.h"
-
-void WebFaultHtml()
-{
-    HttpOk("text/html; charset=UTF-8", "no-cache", NULL, NULL);
-    WebAddHeader("Fault", "settings.css", NULL);
-    WebAddNav(FAULT_PAGE);
-    WebAddH1("Fault");
-    
-    WebAddH2("Last reset source id (RSID)");
-    
-    WebAddLabelledLed("Power on"             , RsidPor );
-    WebAddLabelledLed("Brown out"            , RsidBodr);
-    WebAddLabelledLed("Watchdog"             , RsidWdtr);
-    WebAddLabelledLed("External or semi-host", RsidExtr);
-
-    WebAddH2("Last restart");
-    WebAddLabelledText("Cause", RestartGetCauseString());
-    WebAddLabelledText("Zone" , RestartGetZoneString() );
-    WebAddLabelledInt ("Point", RestartGetLastPoint()  );
-    
-    WebAddH2("Test reset");
-    WebAddInputButton("Create hard fault",  "Test",  "/fault", "faulttest");
-    
-    WebAddH2("Alarm");
-    WebAddLabelledLed("Reset has alarm", ResetHasAlarm());
-    WebAddInputButton("Accept alarm", "Accept", "/fault", "faultclear");
-    
-    WebAddEnd();
-}
-

--- a/base/fault/web-fault-query.c	Thu May 09 07:48:03 2019 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-#include <stdbool.h>
-
-#include "http.h"
-#include "reset.h"
-#include "restart.h"
-
-void WebFaultQuery(char* pQuery)
-{
-    while (pQuery)
-    {
-        char* pName;
-        char* pValue;
-        pQuery = HttpQuerySplit(pQuery, &pName, &pValue);
-        
-        if (HttpSameStr(pName, "faultclear")) ResetAccepted = true;
-        
-        if (HttpSameStr(pName, "faulttest" ))
-        {
-            RestartPoint = 999;
-            *(volatile int *)0 = 0; //Dereferencing address 0 will hard fault the processor
-        }
-        
-    }
-}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/base/fault/web-reset-html.c	Thu May 09 09:38:42 2019 +0000
@@ -0,0 +1,38 @@
+#include <stdio.h>
+
+#include "http.h"
+#include "web-nav-base.h"
+#include "web-add.h"
+#include "reset.h"
+#include "restart.h"
+#include "rsid.h"
+
+void WebResetHtml()
+{
+    HttpOk("text/html; charset=UTF-8", "no-cache", NULL, NULL);
+    WebAddHeader("Last reset", "settings.css", NULL);
+    WebAddNav(RESET_PAGE);
+    WebAddH1("Last reset");
+    
+    WebAddH2("Reset source id (RSID)");
+    
+    WebAddLabelledLed("Power on"                       , RsidPor );
+    WebAddLabelledLed("Brown out"                      , RsidBodr);
+    WebAddLabelledLed("Watchdog"                       , RsidWdtr);
+    WebAddLabelledLed("Restart (external or semi-host)", RsidExtr);
+
+    WebAddH2("Restart from GUI, PB or fault");
+    WebAddLabelledText("Cause", RestartGetCauseString());
+    WebAddLabelledText("Zone" , RestartGetZoneString() );
+    WebAddLabelledInt ("Point", RestartGetLastPoint()  );
+    
+    WebAddH2("Test");
+    WebAddInputButton("Create hard fault",  "Test",  "/reset", "resettest");
+    
+    WebAddH2("Alarm");
+    WebAddLabelledLed("Alarm", ResetHasAlarm());
+    WebAddInputButton("Accept alarm", "Accept", "/reset", "resetaccept");
+    
+    WebAddEnd();
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/base/fault/web-reset-query.c	Thu May 09 09:38:42 2019 +0000
@@ -0,0 +1,24 @@
+#include <stdbool.h>
+
+#include "http.h"
+#include "reset.h"
+#include "restart.h"
+
+void WebResetQuery(char* pQuery)
+{
+    while (pQuery)
+    {
+        char* pName;
+        char* pValue;
+        pQuery = HttpQuerySplit(pQuery, &pName, &pValue);
+        
+        if (HttpSameStr(pName, "resetaccept")) ResetAccepted = true;
+        
+        if (HttpSameStr(pName, "resettest" ))
+        {
+            RestartPoint = 999;
+            *(volatile int *)0 = 0; //Dereferencing address 0 will hard fault the processor
+        }
+        
+    }
+}

--- a/base/web-nav-base.c	Thu May 09 07:48:03 2019 +0000
+++ b/base/web-nav-base.c	Thu May 09 09:38:42 2019 +0000
@@ -3,12 +3,12 @@
 
 void WebNavBase(int page)
 {
-    WebAddNavItem(page ==    CLOCK_PAGE, "/clock",    "Clock"    );
-    WebAddNavItem(page ==    FAULT_PAGE, "/fault",    "Fault"    );
-    WebAddNavItem(page ==      NET_PAGE, "/net",      "Net"      );
-    WebAddNavItem(page ==     NET4_PAGE, "/net4",     "Net IPv4" );
-    WebAddNavItem(page ==     NET6_PAGE, "/net6",     "Net IPv6" );
-    WebAddNavItem(page ==    TRACE_PAGE, "/trace",    "Net Trace");
-    WebAddNavItem(page ==      LOG_PAGE, "/log",      "Log"      );
-    WebAddNavItem(page == FIRMWARE_PAGE, "/firmware", "Firmware" );
+    WebAddNavItem(page ==    CLOCK_PAGE, "/clock",    "Clock"     );
+    WebAddNavItem(page ==    RESET_PAGE, "/reset",    "Last Reset");
+    WebAddNavItem(page ==      NET_PAGE, "/net",      "Net"       );
+    WebAddNavItem(page ==     NET4_PAGE, "/net4",     "Net IPv4"  );
+    WebAddNavItem(page ==     NET6_PAGE, "/net6",     "Net IPv6"  );
+    WebAddNavItem(page ==    TRACE_PAGE, "/trace",    "Net Trace" );
+    WebAddNavItem(page ==      LOG_PAGE, "/log",      "Log"       );
+    WebAddNavItem(page == FIRMWARE_PAGE, "/firmware", "Firmware"  );
 }
\ No newline at end of file

--- a/base/web-nav-base.h	Thu May 09 07:48:03 2019 +0000
+++ b/base/web-nav-base.h	Thu May 09 09:38:42 2019 +0000
@@ -1,6 +1,6 @@
 extern void WebNavBase(int page);
 
-#define    FAULT_PAGE 0
+#define    RESET_PAGE 0
 #define    CLOCK_PAGE 1
 #define      NET_PAGE 2
 #define     NET4_PAGE 3

--- a/base/web-pages-base.h	Thu May 09 07:48:03 2019 +0000
+++ b/base/web-pages-base.h	Thu May 09 09:38:42 2019 +0000
@@ -55,8 +55,8 @@
 extern const char* WebNet6ScriptTime;
 extern void        WebNet6Ajax      (void);
 
-extern void        WebFaultHtml     (void);
-extern void        WebFaultQuery    (char* pQuery);
+extern void        WebResetHtml     (void);
+extern void        WebResetQuery    (char* pQuery);
 
 extern void        WebFirmwareHtml  (void);
 extern void        WebFirmwareScript(void);

--- a/base/web-server-base.c	Thu May 09 07:48:03 2019 +0000
+++ b/base/web-server-base.c	Thu May 09 09:38:42 2019 +0000
@@ -19,7 +19,7 @@
 #define DO_TRACE_AJAX      DO_BASE + 15
 #define DO_TRACE_SCRIPT    DO_BASE + 16
 #define DO_LOG_HTML        DO_BASE + 17
-#define DO_FAULT_HTML      DO_BASE + 18
+#define DO_RESET_HTML      DO_BASE + 18
 #define DO_FIRMWARE_HTML   DO_BASE + 19
 #define DO_FIRMWARE_AJAX   DO_BASE + 20
 #define DO_FIRMWARE_SCRIPT DO_BASE + 21
@@ -36,7 +36,7 @@
     if (HttpSameStr(pPath, "/log"          )) return DO_LOG_HTML;
     if (HttpSameStr(pPath, "/trace"        )) return DO_TRACE_HTML;
     if (HttpSameStr(pPath, "/trace-ajax"   )) return DO_TRACE_AJAX;
-    if (HttpSameStr(pPath, "/fault"        )) return DO_FAULT_HTML;
+    if (HttpSameStr(pPath, "/reset"        )) return DO_RESET_HTML;
     if (HttpSameStr(pPath, "/firmware"     )) return DO_FIRMWARE_HTML;
     if (HttpSameStr(pPath, "/firmware-ajax")) return DO_FIRMWARE_AJAX;
     
@@ -60,7 +60,7 @@
         case DO_CLOCK_AJAX:    WebClockQuery   (pQuery); return true;
         case DO_CLOCK_HTML:    WebClockQuery   (pQuery); return true;
         case DO_LOG_HTML:      WebLogQuery     (pQuery); return true;
-        case DO_FAULT_HTML:    WebFaultQuery   (pQuery); return true;
+        case DO_RESET_HTML:    WebResetQuery   (pQuery); return true;
         case DO_FIRMWARE_HTML: WebFirmwareQuery(pQuery); return true;
         case DO_FIRMWARE_AJAX: WebFirmwareQuery(pQuery); return true;
     }
@@ -95,7 +95,7 @@
         case DO_NET6_AJAX:       WebNet6Ajax      (); return true;
         case DO_NET6_SCRIPT:     WebNet6Script    (); return true;
         case DO_LOG_HTML:        WebLogHtml       (); return true;
-        case DO_FAULT_HTML:      WebFaultHtml     (); return true;
+        case DO_RESET_HTML:      WebResetHtml     (); return true;
         case DO_FIRMWARE_HTML:   WebFirmwareHtml  (); return true;
         case DO_FIRMWARE_AJAX:   WebFirmwareAjax  (); return true;
         case DO_FIRMWARE_SCRIPT: WebFirmwareScript(); return true;