Diff: web-base.c

Revision:

105:43ef124233cd

Parent:

103:91194cc19bbb

Child:

106:7cff473be687

--- a/web-base.c	Sat Apr 27 09:25:28 2019 +0000
+++ b/web-base.c	Sun Apr 28 08:37:44 2019 +0000
@@ -27,9 +27,6 @@
 #define DO_FIRMWARE_HTML    DO_SERVER  +  19
 #define DO_FIRMWARE_AJAX    DO_SERVER  +  20
 #define DO_FIRMWARE_SCRIPT  DO_SERVER  +  21
-#define DO_1WIRE_HTML       DO_SERVER  +  22
-#define DO_1WIRE_AJAX       DO_SERVER  +  23
-#define DO_1WIRE_SCRIPT     DO_SERVER  +  24
 #define DO_SEND_SESSION_ID  DO_DERIVED + 100
 
 #define LOGIN_DELAY_MS 200
@@ -50,10 +47,6 @@
     if (HttpSameStr(pPath, "/fault"        )) return DO_FAULT_HTML;
     if (HttpSameStr(pPath, "/firmware"     )) return DO_FIRMWARE_HTML;
     if (HttpSameStr(pPath, "/firmware-ajax")) return DO_FIRMWARE_AJAX;
-#ifdef INCLUDE_1_WIRE
-    if (HttpSameStr(pPath, "/1wire"        )) return DO_1WIRE_HTML;
-    if (HttpSameStr(pPath, "/1wire-ajax"   )) return DO_1WIRE_AJAX;
-#endif
 
     if (HttpSameStr(pPath, "/favicon.ico"  )) return HttpSameDate(WebFaviconDate,        WebFaviconTime,        pLastModified) ? DO_NOT_MODIFIED : DO_FAVICON;
     if (HttpSameStr(pPath, "/base.css"     )) return HttpSameDate(WebBaseCssDate,        WebBaseCssTime,        pLastModified) ? DO_NOT_MODIFIED : DO_BASE_CSS;
@@ -63,10 +56,8 @@
     if (HttpSameStr(pPath, "/trace.js"     )) return HttpSameDate(WebTraceScriptDate,    WebTraceScriptTime,    pLastModified) ? DO_NOT_MODIFIED : DO_TRACE_SCRIPT;
     if (HttpSameStr(pPath, "/clock.js"     )) return HttpSameDate(WebClockScriptDate,    WebClockScriptTime,    pLastModified) ? DO_NOT_MODIFIED : DO_CLOCK_SCRIPT;
     if (HttpSameStr(pPath, "/firmware.js"  )) return HttpSameDate(WebFirmwareScriptDate, WebFirmwareScriptTime, pLastModified) ? DO_NOT_MODIFIED : DO_FIRMWARE_SCRIPT;
-#ifdef INCLUDE_1_WIRE
-    if (HttpSameStr(pPath, "/1wire.js"     )) return HttpSameDate(WebOneWireScriptDate,  WebOneWireScriptTime,  pLastModified) ? DO_NOT_MODIFIED : DO_1WIRE_SCRIPT;
-#endif
-    return WebServerDerivedRequest(pPath, pLastModified);
+
+    return WebDerivedRequest(pPath, pLastModified);
 }
 static void handleQuery(int todo, char* pQuery)
 {
@@ -80,12 +71,8 @@
         case DO_FAULT_HTML:    WebFaultQuery   (pQuery); return;
         case DO_FIRMWARE_HTML: WebFirmwareQuery(pQuery); return;
         case DO_FIRMWARE_AJAX: WebFirmwareQuery(pQuery); return;
-#ifdef INCLUDE_1_WIRE
-        case DO_1WIRE_HTML:    WebOneWireQuery (pQuery); return;
-        case DO_1WIRE_AJAX:    WebOneWireQuery (pQuery); return;
-#endif
     }
-    WebServerDerivedGet(todo, pQuery);
+    WebDerivedGet(todo, pQuery);
 }
 static bool handlePost(int todo, int contentLength, int contentStart, int size, char* pRequestStream, uint32_t positionInRequestStream)
 {
@@ -93,7 +80,7 @@
     {
         case DO_FIRMWARE_AJAX: return WebFirmwarePost(contentLength, contentStart, size, pRequestStream, positionInRequestStream);
     }
-    return WebServerDerivedPost(todo, contentLength, size, pRequestStream, positionInRequestStream);
+    return WebDerivedPost(todo, contentLength, size, pRequestStream, positionInRequestStream);
 }
 
 static void serverRequest(int size, char* pRequestStream, uint32_t positionInRequestStream, int* pToDo, bool* pPostComplete, uint32_t* pDelayUntil)
@@ -196,18 +183,13 @@
         case DO_FIRMWARE_HTML:   WebFirmwareHtml  (); return;
         case DO_FIRMWARE_AJAX:   WebFirmwareAjax  (); return;
         case DO_FIRMWARE_SCRIPT: WebFirmwareScript(); return;
-#ifdef INCLUDE_1_WIRE
-        case DO_1WIRE_HTML:      WebOneWireHtml   (); return;
-        case DO_1WIRE_AJAX:      WebOneWireAjax   (); return;
-        case DO_1WIRE_SCRIPT:    WebOneWireScript (); return;
-#endif
     }
     
     //If not called then call the derived (child) module
-    WebServerDerivedReply(todo);
+    WebDerivedReply(todo);
 }
 
-int WebServerInit()
+int WebInit()
 {
     HttpRequestFunction = serverRequest;
     HttpReplyFunction   = serverReply;