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
Diff: web-base.c
- Revision:
- 106:7cff473be687
- Parent:
- 105:43ef124233cd
- Parent:
- 104:40097d08edd5
- Child:
- 107:8ce0c528e2e5
diff -r 43ef124233cd -r 7cff473be687 web-base.c
--- a/web-base.c Sun Apr 28 08:37:44 2019 +0000
+++ b/web-base.c Sun Apr 28 09:45:02 2019 +0000
@@ -56,7 +56,13 @@
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;
+<<<<<<< working copy
+=======
+#ifdef INCLUDE_1_WIRE
+ if (HttpSameStr(pPath, "/1wire.js" )) return HttpSameDate(WebOneWireScriptDate, WebOneWireScriptTime, pLastModified) ? DO_NOT_MODIFIED : DO_1WIRE_SCRIPT;
+#endif
+>>>>>>> merge rev
return WebDerivedRequest(pPath, pLastModified);
}
static void handleQuery(int todo, char* pQuery)
@@ -189,7 +195,11 @@
WebDerivedReply(todo);
}
+<<<<<<< working copy
int WebInit()
+=======
+int WebBaseInit()
+>>>>>>> merge rev
{
HttpRequestFunction = serverRequest;
HttpReplyFunction = serverReply;