Merge pull request #1 from bloft/next

Next

Author: bloft

README.md

@@ -1,7 +1,10 @@
 # EasyMqtt
 Easy handling of Mqtt on esp8266
 
-Including a web interface to se current values, and avalible topic, and a rest api
+* Easy wifi configuration using web interface
+* Easy mqtt configuration using web interface
+* Easy configuration of mqtt endpoints
+* Web based UI to see current values
 
 ## Examble usage EasyMqtt
 ```C++
@@ -10,15 +13,15 @@ Including a web interface to se current values, and avalible topic, and a rest a
 EasyMqtt mqtt;
 
 void setup() {
-  // Setup wifi
-  mqtt.wifi("ssid", "password");
-  mqtt.mqtt("host", 1883, "user", "pass");
+  mqtt.config().set("foo", "My Foo");
 
-	mqtt["foo"] << [](){ return String("bar"); };
+  mqtt["foo"] << [&](){
+    return String(mqtt.config().get("foo", "default"));
+  };
 }
 
 void loop() {
-	mqtt.loop();
+  mqtt.loop();
 }
 
 ```

ToDo.md

@@ -2,32 +2,18 @@
 
 ## Improvements
 
-### Change MqttMap to include reference to mqttclient
- * Change loop, publish, ... to not need mqttclient
-
 ### Add easyMqtt/$id/system/connected + will to indicate if device is online
 
+### OTA support
+Add support for OTA using ArduinoOTA
+
 ## Future
 
 ### Support writing to a topic with a subscriber
 Support both << and >> on the same topic with out read out own published values
 
-### Add system info
- * easyMqtt/$id/system/uptime
- * easyMqtt/$id/system/mem
- * easyMqtt/$id/system/reset
- * easyMqtt/$id/system/debug
- * easyMqtt/$id/system/config
-
-### Add better debugging
- * Add new EasyDebug class, extends Print (Print.h), and prints to easyMqtt/$id/system/debug if enabled
- * Add getDebugger on EasyMqtt that returns the EasyDebug instance
-
-### Add support for filters
- * Don't send if value is the same as last.
- * Don't send if value is Nan
-
-### Add support for float type (extend MqttMap)
+### Add support for float type (extend Entry)
+This will make it possible to generate graphs in UI and ease implementations
 
 ### Add publish configured endpoints, to support openhab2 auto configure
 something like
@@ -40,26 +26,3 @@ easyMqtt/$id/system/config
 
    Read / Write / String / Number / ...
 
-### Add config values
-Add config values that is persisted to flash memory
-
-http://esp8266.github.io/Arduino/versions/2.0.0/doc/filesystem.html
-
-```C++
-#include <EasyMqtt.h>
-
-EasyMqtt mqtt;
-
-setup() {
-  // init config with name "test" with default value 123
-  // The value can be changed using easyMqtt/$id/config/test
-  // Is loaded from 
-  mqtt.config("timeout", 5000);  
-}
-
-loop() {
-  mqtt.loop();
-  mqtt.config("timeout"); // Read back config value
-}
-
-```

examples/temperature/temperature.ino

@@ -9,22 +9,12 @@ void setup() {
   mqtt.wifi("ssid", "pass");
   mqtt.mqtt("server", 1883, "user", "password");
 
-  mqtt["temperature"] << []() {
-    float value = dht.readTemperature();
-    if(isnan(value)) {
-      return String("");
-    } else {
-      return String(value);
-    }
+  mqtt["temperature"] << [&]() {
+    return dht.readTemperature();
   };
 
-  mqtt["humidity"] << []() {
-    float value = dht.readHumidity();
-    if(isnan(value)) {
-      return String("");
-    } else {
-      return String(value);
-    }
+  mqtt["humidity"] << [&]() {
+    return dht.readHumidity();
   };
 
 }

html/generateC

@@ -1,19 +1,38 @@
 #!/usr/bin/php
 <?php
 
-$html = file_get_contents("template.html");
-$pattern = "|<!-- split:(.*) -->|U";
+generateC("template.html", "../src/html.h");
+//generateC("test.html", "../src/html.h");
 
-preg_match_all($pattern, $html, $matches, PREG_SET_ORDER);
+function generateC($input, $output) {
+  $library = json_decode(file_get_contents("../library.json"), true);
 
-$split = preg_split($pattern, $html);
+  $html = file_get_contents($input);
+  $html = str_replace("{version}", $library['version'], $html);
+  $html = str_replace("{easymqtt.url}", $library['repository']['url'], $html);
 
-$tmp = array();
-foreach($matches as $key => $value) {
-  if(!array_key_exists($value[1], $tmp)) {
-    $tmp[$value[1]] = addslashes(trimContent($split[$key + 1]));
+  $pattern = "|<!-- split:(.*) -->|U";
+
+  preg_match_all($pattern, $html, $matches, PREG_SET_ORDER);
+
+  $split = preg_split($pattern, $html);
+
+  $tmp = array();
+  foreach($matches as $key => $value) {
+    if(!array_key_exists($value[1], $tmp)) {
+      $tmp[$value[1]] = addslashes(trimContent($split[$key + 1]));
+    }
+  } 
+
+  $fp = fopen($output, "w");
+  fputs($fp, "#pragma once\n");
+  fputs($fp, "\n");
+  foreach($tmp as $header => $content) {
+    $header = strtoupper($header);
+    fputs ($fp, "const char HTML_${header}[] PROGMEM = \"$content\";\n");
   }
-} 
+  fclose ($fp);
+}
 
 function trimContent($str) {
   $arr = explode("\n",$str);
@@ -23,15 +42,3 @@ function trimContent($str) {
   }
   return $output;
 }
-
-$fp = fopen("../src/html.h", "w");
-fputs($fp, "#ifndef html_h\n");
-fputs($fp, "#define html_h\n");
-fputs($fp, "\n");
-foreach($tmp as $header => $content) {
-  $header = strtoupper($header);
-  fputs ($fp, "const char HTML_${header}[] PROGMEM = \"$content\";\n");
-}
-fputs($fp, "\n");
-fputs($fp, "#endif\n");
-fclose ($fp);