Andrew Boyson / web

Dependents:   oldheating gps motorhome heating

Revision:
106:7cff473be687
Parent:
105:43ef124233cd
Parent:
104:40097d08edd5
Child:
107:8ce0c528e2e5
--- a/web-base.h	Sun Apr 28 08:37:44 2019 +0000
+++ b/web-base.h	Sun Apr 28 09:45:02 2019 +0000
@@ -70,7 +70,20 @@
 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