HTTP Request push datas

nicolas leger · nicolas leger · commit 9553519681cd · 2016-12-31T17:34:24.000+01:00
diff --git a/examples/Wifinfo/Wifinfo.h b/examples/Wifinfo/Wifinfo.h
@@ -124,13 +124,15 @@ extern unsigned long seconds;
 extern _sysinfo sysinfo;
 extern Ticker Tick_emoncms;
 extern Ticker Tick_jeedom;
+extern Ticker Tick_httpRequest;
 
 
 // Exported function located in main sketch
 // ===================================================
 void ResetConfig(void);
 void Task_emoncms();
 void Task_jeedom();
+void Task_httpRequest();
 
 #endif
 
diff --git a/examples/Wifinfo/Wifinfo.ino b/examples/Wifinfo/Wifinfo.ino
@@ -63,10 +63,12 @@ Ticker red_ticker;
 Ticker Every_1_Sec;
 Ticker Tick_emoncms;
 Ticker Tick_jeedom;
+Ticker Tick_httpRequest;
 
 volatile boolean task_1_sec = false;
 volatile boolean task_emoncms = false;
 volatile boolean task_jeedom = false;
+volatile boolean task_httpRequest = false;
 unsigned long seconds = 0;
 
 // sysinfo data
@@ -129,6 +131,18 @@ void Task_jeedom()
   task_jeedom = true;
 }
 
+/* ======================================================================
+Function: Task_httpRequest
+Purpose : callback of http request ticker
+Input   : 
+Output  : -
+Comments: Like an Interrupt, need to be short, we set flag for main loop
+====================================================================== */
+void Task_httpRequest()
+{
+  task_httpRequest = true;
+}
+
 /* ======================================================================
 Function: LedOff 
 Purpose : callback called after led blink delay
@@ -370,6 +384,11 @@ void ResetConfig(void)
   strcpy_P(config.jeedom.url, CFG_JDOM_DEFAULT_URL);
   //strcpy_P(config.jeedom.adco, CFG_JDOM_DEFAULT_ADCO);
 
+  // HTTP Request
+  strcpy_P(config.httpReq.host, CFG_HTTPREQ_DEFAULT_HOST);
+  config.httpReq.port = CFG_HTTPREQ_DEFAULT_PORT;
+  strcpy_P(config.httpReq.path, CFG_HTTPREQ_DEFAULT_PATH);
+  
   config.config |= CFG_RGB_LED;
 
   // save back
@@ -441,7 +460,7 @@ int WifiHandleConn(boolean setup = false)
         WiFi.begin(config.ssid);
       }
 
-      timeout = 25; // 25 * 200 ms = 5 sec time out
+      timeout = 50; // 50 * 200 ms = 5 sec time out
       // 200 ms loop
       while ( ((ret = WiFi.status()) != WL_CONNECTED) && timeout )
       {
@@ -570,6 +589,7 @@ void setup()
   DebugF("Config size="); Debug(sizeof(_Config));
   DebugF(" (emoncms=");   Debug(sizeof(_emoncms));
   DebugF("  jeedom=");   Debug(sizeof(_jeedom));
+  DebugF("  http request=");   Debug(sizeof(_httpRequest));
   Debugln(')');
   Debugflush();
 
@@ -773,6 +793,10 @@ void setup()
   // Jeedom Update if needed
   if (config.jeedom.freq) 
     Tick_jeedom.attach(config.jeedom.freq, Task_jeedom);
+
+  // HTTP Request Update if needed
+  if (config.httpReq.freq) 
+    Tick_httpRequest.attach(config.httpReq.freq, Task_httpRequest);
 }
 
 /* ======================================================================
@@ -802,6 +826,9 @@ void loop()
   } else if (task_jeedom) { 
     jeedomPost();  
     task_jeedom=false;
+  } else if (task_httpRequest) { 
+    httpRequest();  
+    task_httpRequest=false;
   }
 
   // Handle teleinfo serial
diff --git a/examples/Wifinfo/config.cpp b/examples/Wifinfo/config.cpp
@@ -201,5 +201,11 @@ void showConfig()
   DebugF("key      :"); Debugln(config.jeedom.apikey); 
   DebugF("compteur :"); Debugln(config.jeedom.adco); 
   DebugF("freq     :"); Debugln(config.jeedom.freq); 
+
+  DebuglnF("\r\n===== HTTP request"); 
+  DebugF("host     :"); Debugln(config.httpReq.host); 
+  DebugF("port     :"); Debugln(config.httpReq.port); 
+  DebugF("path     :"); Debugln(config.httpReq.path); 
+  DebugF("freq     :"); Debugln(config.httpReq.freq); 
 }
 
diff --git a/examples/Wifinfo/config.h b/examples/Wifinfo/config.h
@@ -42,9 +42,14 @@
 #define CFG_JDOM_ADCO_SIZE    12
 #define CFG_JDOM_DEFAULT_PORT 80
 #define CFG_JDOM_DEFAULT_HOST "jeedom.local"
-#define CFG_JDOM_DEFAULT_URL  "/jeedom/plugins/teleinfo/core/php/jeeTeleinfo.php"
+#define CFG_JDOM_DEFAULT_URL  "/plugins/teleinfo/core/php/jeeTeleinfo.php"
 #define CFG_JDOM_DEFAULT_ADCO "0000111122223333"
 
+#define CFG_HTTPREQ_HOST_SIZE    32
+#define CFG_HTTPREQ_PATH_SIZE    150
+#define CFG_HTTPREQ_DEFAULT_PORT 80
+#define CFG_HTTPREQ_DEFAULT_HOST "127.0.0.1"
+#define CFG_HTTPREQ_DEFAULT_PATH  "/json.htm?type=command&param=udevice&idx=1&nvalue=0&svalue=%HCHP%;%HCHC%;0;0;%PAPP%;0"
 
 // Port pour l'OTA
 #define DEFAULT_OTA_PORT     8266
@@ -79,6 +84,11 @@
 #define CFG_FORM_JDOM_ADCO  FPSTR("jdom_adco")
 #define CFG_FORM_JDOM_FREQ  FPSTR("jdom_freq")
 
+#define CFG_FORM_HTTPREQ_HOST  FPSTR("httpreq_host")
+#define CFG_FORM_HTTPREQ_PORT  FPSTR("httpreq_port")
+#define CFG_FORM_HTTPREQ_PATH  FPSTR("httpreq_path")
+#define CFG_FORM_HTTPREQ_FREQ  FPSTR("httpreq_freq")
+
 #define CFG_FORM_IP  FPSTR("wifi_ip");
 #define CFG_FORM_GW  FPSTR("wifi_gw");
 #define CFG_FORM_MSK FPSTR("wifi_msk");
@@ -112,6 +122,17 @@ typedef struct
   uint8_t filler[90];                   // in case adding data in config avoiding loosing current conf by bad crc*/
 } _jeedom;
 
+// Config for http request
+// 256 Bytes
+typedef struct 
+{
+  char  host[CFG_HTTPREQ_HOST_SIZE+1];  // FQDN 
+  char  path[CFG_HTTPREQ_PATH_SIZE+1];  // Path
+  uint16_t port;                        // Protocol port (HTTP/HTTPS)
+  uint32_t freq;                        // refresh rate
+  uint8_t filler[24];                   // in case adding data in config avoiding loosing current conf by bad crc*/
+} _httpRequest;
+
 // Config saved into eeprom
 // 1024 bytes total including CRC
 typedef struct 
@@ -126,7 +147,7 @@ typedef struct
   uint8_t  filler[131];      		   // in case adding data in config avoiding loosing current conf by bad crc
   _emoncms emoncms;                // Emoncms configuration
   _jeedom  jeedom;                 // jeedom configuration
-  uint8_t  filler1[256];           // Another filler in case we need more
+  _httpRequest httpReq;            // HTTP request
   uint16_t crc;
 } _Config;
 
diff --git a/examples/Wifinfo/data/index.htm.gz b/examples/Wifinfo/data/index.htm.gz
diff --git a/examples/Wifinfo/webclient.cpp b/examples/Wifinfo/webclient.cpp
@@ -239,3 +239,62 @@ boolean jeedomPost(void)
   return ret;
 }
 
+/* ======================================================================
+Function: HTTP Request
+Purpose : Do a http request
+Input   : 
+Output  : true if post returned 200 OK
+Comments: -
+====================================================================== */
+boolean httpRequest(void)
+{
+  boolean ret = false;
+
+  // Some basic checking
+  if (*config.httpReq.host)
+  {
+    ValueList * me = tinfo.getList();
+    // Got at least one ?
+    if (me && me->next)
+    {
+      String url ; 
+      boolean skip_item;
+
+      url = *config.httpReq.path ? config.httpReq.path : "/";
+      url += "?";
+
+      // Loop thru the node
+      while (me->next) {
+        // go to next node
+        me = me->next;
+        skip_item = false;
+
+        // Si Item virtuel, on le met pas
+        if (*me->name =='_')
+          skip_item = true;
+
+        // On doit ajouter l'item ?
+        if (!skip_item)
+        {
+          String valName = String(me->name);
+          if (valName == "HCHP")
+          {
+            url.replace("%HCHP%", me->value);
+          }
+          if (valName == "HCHC")
+          {
+            url.replace("%HCHC%", me->value);
+          }
+          if (valName == "PAPP")
+          {
+            url.replace("%PAPP%", me->value);
+          }
+        }
+      } // While me
+
+      ret = httpPost( config.httpReq.host, config.httpReq.port, (char *) url.c_str()) ;
+    } // if me
+  } // if host
+  return ret;
+}
+
diff --git a/examples/Wifinfo/webclient.h b/examples/Wifinfo/webclient.h
@@ -34,5 +34,6 @@
 boolean httpPost(char * host, uint16_t port, char * url);
 boolean emoncmsPost(void);
 boolean jeedomPost(void);
+boolean httpRequest(void);
 
 #endif
diff --git a/examples/Wifinfo/webserver.cpp b/examples/Wifinfo/webserver.cpp
@@ -182,6 +182,21 @@ void handleFormConfig(void)
     }
     config.jeedom.freq = itemp;
 
+    // HTTP Request
+    strncpy(config.httpReq.host, server.arg("httpreq_host").c_str(), CFG_HTTPREQ_HOST_SIZE );
+    strncpy(config.httpReq.path, server.arg("httpreq_path").c_str(), CFG_HTTPREQ_PATH_SIZE );
+    itemp = server.arg("httpreq_port").toInt();
+    config.httpReq.port = (itemp>=0 && itemp<=65535) ? itemp : CFG_HTTPREQ_DEFAULT_PORT ; 
+    itemp = server.arg("httpreq_freq").toInt();
+    if (itemp>0 && itemp<=86400)
+    {
+      Tick_httpRequest.detach();
+      Tick_httpRequest.attach(itemp, Task_httpRequest);
+    } else {
+      itemp = 0 ; 
+    }
+    config.httpReq.freq = itemp;
+
     if ( saveConfig() ) {
       ret = 200;
       response = "OK";
@@ -501,6 +516,12 @@ void getConfJSONData(String & r)
   r+=CFG_FORM_JDOM_ADCO; r+=FPSTR(FP_QCQ); r+=config.jeedom.adco;   r+= FPSTR(FP_QCNL); 
   r+=CFG_FORM_JDOM_FREQ; r+=FPSTR(FP_QCQ); r+=config.jeedom.freq;  
 
+  r+=CFG_FORM_HTTPREQ_HOST; r+=FPSTR(FP_QCQ); r+=config.httpReq.host;   r+= FPSTR(FP_QCNL); 
+  r+=CFG_FORM_HTTPREQ_PORT; r+=FPSTR(FP_QCQ); r+=config.httpReq.port;   r+= FPSTR(FP_QCNL); 
+  r+=CFG_FORM_HTTPREQ_PATH; r+=FPSTR(FP_QCQ); r+=config.httpReq.path;   r+= FPSTR(FP_QCNL);  
+  r+=CFG_FORM_HTTPREQ_FREQ; r+=FPSTR(FP_QCQ); r+=config.httpReq.freq;  
+  
+
   r+= F("\""); 
   // Json end
   r += FPSTR(FP_JSON_END);
