initial

2018-01-24 12:48:12 +01:00
commit 3155b01470
20 changed files with 2298 additions and 0 deletions
--- a/ConfigGenerator/configGen.py
+++ b/ConfigGenerator/configGen.py
@ -0,0 +1,24 @@
+#!/usr/bin/python
+
+from Cheetah.Template import Template
+
+
+
+
+configItems = [
+    {"label":"_", "key":"magic", "type":"I", "default": ""},
+    {"label":"Wifi SSID", "key":"wifiSsid", "type":"C", "length":32, "default":"test"},
+    {"label":"Wifi Key", "key":"wifiKey", "type":"C", "length":64, "default":"geheim"},
+    {"label":"MQTT Broker", "key":"mqttBroker", "type":"C", "length":64, "default":"broker.hottis.de"},
+    {"label":"MQTT Username", "key":"mqttUser", "type":"C", "length":32, "default":"esp1"},
+    {"label":"MQTT Password", "key":"mqttPass", "type":"C", "length":32, "default":"geheim"},
+    {"label":"MQTT ClientId", "key":"mqttClientId", "type":"C", "length":32, "default":"changeThis"},
+    {"label":"MQTT Topic", "key":"mqttTopic", "type":"C", "length":64, "default":"IoT/espThermometer2/measurement"},
+    {"label":"MQTT Port", "key":"mqttPort", "type":"I", "default":8883}
+]
+
+
+h_file = Template(file="configuration_h.tmpl", searchList=[{"configItems":configItems}])
+open('configuration.h','w').write(str(h_file))
+c_file = Template(file="configuration_c.tmpl", searchList=[{"configItems":configItems}])
+open('configuration.cpp','w').write(str(c_file))
--- a/ConfigGenerator/configuration_c.tmpl
+++ b/ConfigGenerator/configuration_c.tmpl
@ -0,0 +1,134 @@
+#raw
+#include <Arduino.h>
+
+#include <ESP8266WiFi.h>
+#include <ESP8266WebServer.h>
+#include <EEPROM.h>
+
+#include "defines.h"
+#include "configuration.h"
+#end raw
+
+
+tConfigBlock configBlock;
+const uint32_t MAGIC = 0xC0DE0001;
+extern ESP8266WebServer webServer;
+
+bool configSaved = false;
+
+void configServeIndex() {
+  bool configValid = (configBlock.magic == MAGIC);
+
+  if (! configValid) {
+  #for $configItem in $configItems
+  #if $configItem.label != "_"
+  #if $configItem.type == "C"
+    strcpy(configBlock.$configItem.key, "$configItem.default");
+  #else if $configItem.type == "I"
+    configBlock.$configItem.key = $configItem.default;
+  #end if
+  #end if
+  #end for
+  }
+  
+  String buffer =
+  "<!doctype html"
+  "<html lang=\"en\">"
+  "  <head>"
+  "    <title>ESP8266 Thermometer Configuration Page</title>"
+  "  </head>"
+  "  <body>"
+  "    <h1>ESP8266 Configuration Page</h1>";
+  
+  if (configSaved) {
+    configSaved = false;
+    buffer += "<h2>Configuration saved</h2>";
+  }  
+  
+  buffer +=
+  "    <form action=\"/config\" method=\"GET\">"
+  "      <table>"
+  #for $configItem in $configItems
+  #if $configItem.label != "_"
+  "        <tr>"
+  "          <td>"
+  "            <label for\"$configItem.key\">$configItem.label</label>"
+  "          </td><td>"
+  "            <input type=\"text\" name=\"$configItem.key\" id=\"$configItem.key\" ";
+  
+  #if $configItem.type == "C"
+  buffer += "    size=\"$configItem.length\" ";
+  buffer += "    value=\"";
+  buffer += configBlock.$configItem.key; 
+  buffer += "\"";
+  #else if $configItem.type == "I"
+  buffer += "    value=\""; 
+  buffer += configBlock.$configItem.key; 
+  buffer += "\"";
+  #end if  
+  
+  buffer +=
+  "            />"
+  "          </td>"
+  "        </tr>"
+  #end if
+  #end for
+  "        <tr>"
+  "          <td colspan=\"2\">"
+  "            <button type=\"submit\">Save</button>"
+  "          </td>"
+  "        </tr>"
+  "      </table>"
+  "    </form>"
+  "  </body>"
+  "</html>";
+
+  webServer.send(200, "text/html", buffer);
+
+
+#ifdef DEBUG
+  Serial.println("indexHtml request served");
+#endif    
+}
+
+void configServeGetConfiguration() {
+  String arg;
+
+  #for $configItem in $configItems
+  #if $configItem.label != "_"
+  arg = webServer.arg("$configItem.key");
+  #if $configItem.type == "C"
+  strcpy(configBlock.$configItem.key, arg.c_str());
+  #else if $configItem.type == "I"
+  configBlock.$configItem.key = atoi(arg.c_str());
+  #end if
+  #end if
+  #end for
+  
+  configBlock.magic = MAGIC;
+  
+  showConfiguration();
+  
+  EEPROM.begin(512);
+  EEPROM.put(EEPROM_ADDR, configBlock);  
+  EEPROM.commit();
+  
+  Serial.println("EEPROM saved");
+
+  configSaved = true;
+  webServer.sendHeader("Location", String("/"), true);
+  webServer.send(302, "text/plain", "");
+  //webServer.send(200, "text/html", "configuration saved");
+}
+  
+void showConfiguration() {
+  Serial.println("Configuration is");
+
+  #for $configItem in $configItems
+  Serial.print("$configItem.key = ");
+  Serial.println(configBlock.$configItem.key);
+    
+  #end for
+  
+  Serial.println("---");
+}
--- a/ConfigGenerator/configuration_h.tmpl
+++ b/ConfigGenerator/configuration_h.tmpl
@ -0,0 +1,16 @@
+typedef struct {
+#for $configItem in $configItems
+#if $configItem.type == 'C'
+  char ${configItem.key}[$configItem.length];
+#else if $configItem.type == 'I'
+  uint32_t $configItem.key;
+#end if
+#end for
+} tConfigBlock;
+
+extern const uint32_t MAGIC;
+extern tConfigBlock configBlock;
+
+void configServeIndex();
+void configServeGetConfiguration();
+void showConfiguration();