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

Diff: web-base.h

Revision:
107:8ce0c528e2e5
Parent:
106:7cff473be687
Child:
108:91bfb40e7487
--- a/web-base.h	Sun Apr 28 09:45:02 2019 +0000
+++ b/web-base.h	Sun Apr 28 09:49:40 2019 +0000
@@ -70,20 +70,7 @@
 extern bool        WebFirmwarePost  (int contentLength, int contentStart, int size, char* pRequestStream, uint32_t positionInRequestStream);
 extern void        WebFirmwareAjax  (void);
 
-<<<<<<< working copy
-extern int  WebInit(void);
-=======
-#ifdef INCLUDE_1_WIRE
-extern void        WebOneWireHtml      (void        );
-extern void        WebOneWireQuery     (char* pQuery);
-extern void        WebOneWireAjax      (void        );
-extern void        WebOneWireScript    (void        );
-extern const char* WebOneWireScriptDate              ;
-extern const char* WebOneWireScriptTime              ;
-#endif
-
 extern int  WebBaseInit(void);
->>>>>>> merge rev
 
 #define DO_NOTHING         0
 #define DO_NOT_FOUND       1