Central Heating controller using the real time clock, PHY module for internet, 1-wire interface for temperature sensors, a system log and a configuration file

Dependencies:   net lpc1768 clock http-base log

/media/uploads/andrewboyson/heating.sch

/media/uploads/andrewboyson/heating.brd

/media/uploads/andrewboyson/eagle.epf

Files at this revision

API Documentation at this revision

Comitter:
andrewboyson
Date:
Thu Mar 14 16:58:03 2019 +0000
Parent:
38:2bfeefa8709a
Child:
40:e3b01bec9b7e
Commit message:
Libraries updated

Changed in this revision

http-base.lib Show annotated file Show diff for this revision Revisions of this file
http-derived/boiler/http-boiler-query.c Show annotated file Show diff for this revision Revisions of this file
http-derived/heating/http-heating-query.c Show annotated file Show diff for this revision Revisions of this file
http-derived/http-server-derived.c Show annotated file Show diff for this revision Revisions of this file
http-derived/http-server-derived.h Show annotated file Show diff for this revision Revisions of this file
http-derived/program/http-program-query.c Show annotated file Show diff for this revision Revisions of this file
http-derived/radiator/http-radiator-query.c Show annotated file Show diff for this revision Revisions of this file
http-derived/system/http-system-query.c Show annotated file Show diff for this revision Revisions of this file
lpc1768.lib Show annotated file Show diff for this revision Revisions of this file
net.lib Show annotated file Show diff for this revision Revisions of this file
--- a/http-base.lib	Mon Mar 11 16:47:54 2019 +0000
+++ b/http-base.lib	Thu Mar 14 16:58:03 2019 +0000
@@ -1,1 +1,1 @@
-https://os.mbed.com/users/andrewboyson/code/http-base/#74036bb0d1dc
+https://os.mbed.com/users/andrewboyson/code/http-base/#46db70f046f7
--- a/http-derived/boiler/http-boiler-query.c	Mon Mar 11 16:47:54 2019 +0000
+++ b/http-derived/boiler/http-boiler-query.c	Thu Mar 14 16:58:03 2019 +0000
@@ -11,7 +11,7 @@
         char* pValue;
         pQuery = HttpQuerySplit(pQuery, &pName, &pValue);
 
-        int value = (int)strtol(pValue, NULL, 10);
+        int value = HttpQueryValueAsInt(pValue);
                     
         if (HttpSameStr(pName, "tanksetpoint"  )) BoilerSetTankSetPoint  (value);
         if (HttpSameStr(pName, "tankhysteresis")) BoilerSetTankHysteresis(value);
--- a/http-derived/heating/http-heating-query.c	Mon Mar 11 16:47:54 2019 +0000
+++ b/http-derived/heating/http-heating-query.c	Thu Mar 14 16:58:03 2019 +0000
@@ -10,7 +10,7 @@
         char* pName;
         char* pValue;
         pQuery = HttpQuerySplit(pQuery, &pName, &pValue);
-        int value = (int)strtol(pValue, NULL, 10);
+        int value = HttpQueryValueAsInt(pValue);
         
         if (HttpSameStr(pName, "htg-chg-mode"     )) RadiatorChgMode();
         if (HttpSameStr(pName, "htg-chg-override" )) RadiatorChgOverride();
--- a/http-derived/http-server-derived.c	Mon Mar 11 16:47:54 2019 +0000
+++ b/http-derived/http-server-derived.c	Thu Mar 14 16:58:03 2019 +0000
@@ -4,6 +4,14 @@
 #include "http-server-derived.h"
 #include "http-server.h"
 
+#define DO_HOME_HTML      DO_DERIVED + 0
+#define DO_SYSTEM_HTML    DO_DERIVED + 1
+#define DO_PROGRAM_HTML   DO_DERIVED + 2
+#define DO_RADIATOR_HTML  DO_DERIVED + 3
+#define DO_HEATING_AJAX   DO_DERIVED + 4
+#define DO_HEATING_SCRIPT DO_DERIVED + 5
+#define DO_BOILER_HTML    DO_DERIVED + 6
+
 int HttpServerDerivedRequest(char *pPath, char* pLastModified)
 {
     if (HttpSameStr(pPath, "/"            )) return DO_HOME_HTML;
--- a/http-derived/http-server-derived.h	Mon Mar 11 16:47:54 2019 +0000
+++ b/http-derived/http-server-derived.h	Thu Mar 14 16:58:03 2019 +0000
@@ -26,11 +26,3 @@
 extern void HttpServerDerivedGet  (int todo, char* pQuery);
 extern bool HttpServerDerivedPost (int todo, int contentLength, int size, char* pRequestStream, uint32_t positionInRequestStream);
 extern void HttpServerDerivedReply(int todo);
-
-#define DO_HOME_HTML      100
-#define DO_SYSTEM_HTML    101
-#define DO_PROGRAM_HTML   102
-#define DO_RADIATOR_HTML  103
-#define DO_HEATING_AJAX   104
-#define DO_HEATING_SCRIPT 105
-#define DO_BOILER_HTML    106
\ No newline at end of file
--- a/http-derived/program/http-program-query.c	Mon Mar 11 16:47:54 2019 +0000
+++ b/http-derived/program/http-program-query.c	Thu Mar 14 16:58:03 2019 +0000
@@ -12,7 +12,7 @@
         pQuery = HttpQuerySplit(pQuery, &pName, &pValue);
                 
         HttpQueryUnencode(pValue);
-        int value = (int)strtol(pValue, NULL, 10);
+        int value = HttpQueryValueAsInt(pValue);
         int program = value;
         if (program < 1) program = 1;
         if (program > 3) program = 3;
--- a/http-derived/radiator/http-radiator-query.c	Mon Mar 11 16:47:54 2019 +0000
+++ b/http-derived/radiator/http-radiator-query.c	Thu Mar 14 16:58:03 2019 +0000
@@ -10,7 +10,7 @@
         char* pName;
         char* pValue;
         pQuery = HttpQuerySplit(pQuery, &pName, &pValue);
-        int value = (int)strtol(pValue, NULL, 10);
+        int value = HttpQueryValueAsInt(pValue);
         
         if (HttpSameStr(pName, "nighttemp")) RadiatorSetNightTemperature(value);
         if (HttpSameStr(pName, "frosttemp")) RadiatorSetFrostTemperature(value);
--- a/http-derived/system/http-system-query.c	Mon Mar 11 16:47:54 2019 +0000
+++ b/http-derived/system/http-system-query.c	Thu Mar 14 16:58:03 2019 +0000
@@ -20,7 +20,7 @@
         
         HttpQueryUnencode(pValue);
 
-        int value = (int)strtol(pValue, NULL, 10);
+        int value = HttpQueryValueAsInt(pValue);
                     
         if (HttpSameStr(pName, "watchdogflagoff")) WatchdogFlag = 0;
         if (HttpSameStr(pName, "tankrom"))
--- a/lpc1768.lib	Mon Mar 11 16:47:54 2019 +0000
+++ b/lpc1768.lib	Thu Mar 14 16:58:03 2019 +0000
@@ -1,1 +1,1 @@
-https://os.mbed.com/users/andrewboyson/code/lpc1768/#f10bf577ece3
+https://os.mbed.com/users/andrewboyson/code/lpc1768/#9b1b14c86e6d
--- a/net.lib	Mon Mar 11 16:47:54 2019 +0000
+++ b/net.lib	Thu Mar 14 16:58:03 2019 +0000
@@ -1,1 +1,1 @@
-https://os.mbed.com/users/andrewboyson/code/net/#79052cb4a41c
+https://os.mbed.com/users/andrewboyson/code/net/#ebe9bc4e5067