From 86c855136877cf72406a76ee6f5a233e5226fb5e Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Fri, 17 May 2019 17:58:09 +0200 Subject: [PATCH] drop generated files from repo --- .gitignore | 6 + libraries/includes/configuration.cpp | 389 --------------------------- libraries/includes/configuration.h | 24 -- 3 files changed, 6 insertions(+), 413 deletions(-) delete mode 100644 libraries/includes/configuration.cpp delete mode 100644 libraries/includes/configuration.h diff --git a/.gitignore b/.gitignore index e06c867..00a9be5 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,12 @@ .vscode/ ~* *~ + +# generated files, will be regenerated by CI script +libraries/includes/configuration.cpp +libraries/includes/configuration.h + +# release targets, will be generated by CI script sketch/sketch.esp8266.esp8266.nodemcu.bin sketch/sketch.esp8266.esp8266.nodemcu.elf diff --git a/libraries/includes/configuration.cpp b/libraries/includes/configuration.cpp deleted file mode 100644 index 2438a66..0000000 --- a/libraries/includes/configuration.cpp +++ /dev/null @@ -1,389 +0,0 @@ -#include - -#include -#include -#include - -#include "defines.h" -#include "configuration.h" - - -tConfigBlock configBlock; -const uint32_t MAGIC = 3235774470; -const char* CONFIG_SSID = "espconfig"; -extern ESP8266WebServer webServer; - -bool configSaved = false; - - -static bool checkAuthentication() { - Serial.print("User: "); Serial.println(configBlock.confUser); - Serial.print("Pass: "); Serial.println(configBlock.confPasswd); - return webServer.authenticate(configBlock.confUser, configBlock.confPasswd); -} - -void configServeIndex() { - bool configValid = (configBlock.magic == MAGIC); - - if (! configValid) { - configBlock.magic = MAGIC; - strcpy(configBlock.confUser, "admin"); - strcpy(configBlock.confPasswd, "geheim123"); - strcpy(configBlock.wifiSsid, "test"); - strcpy(configBlock.wifiKey, "geheim"); - strcpy(configBlock.mqttBroker, "broker.hottis.de"); - strcpy(configBlock.mqttUser, "RgbLed1"); - strcpy(configBlock.mqttPass, "geheim123"); - strcpy(configBlock.mqttClientId, "RgbLed1"); - configBlock.mqttPort = 8883; - strcpy(configBlock.mqttTopicColorCommand, "IoT/RgbLed1/ColorCommand"); - strcpy(configBlock.mqttTopicCommand, "IoT/RgbLed1/Command"); - strcpy(configBlock.mqttDebugTopic, "IoT/RgbLed1/Debug"); - configBlock.debugMode = 0; - } - - if (! checkAuthentication()) { - return webServer.requestAuthentication(); - } - - - String buffer = - "" - " " - " ESP8266 based RGB-LED-Light" - " " - " " - "

ESP8266 based RGB-LED-Light - ESP8266 Configuration Page

"; - - if (configSaved) { - configSaved = false; - buffer += "

Configuration saved

"; - } - - buffer += - "
" - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - "
" - " " - " " - " " - "
" - " " - " " - " " - "
" - " " - " " - " " - "
" - " " - " " - " " - "
" - " " - " " - " " - "
" - " " - " " - " " - "
" - " " - " " - " " - "
" - " " - " " - " " - "
" - " " - " " - " " - "
" - " " - " " - " " - "
" - " " - " " - " " - "
" - " " - " " - " " - "
" - " " - " " - " " - "
" - " " - "
" - "
" - " " - ""; - - webServer.send(200, "text/html", buffer); - - -#ifdef DEBUG - Serial.println("indexHtml request served"); -#endif -} - -void configServeGetConfiguration() { - if (! checkAuthentication()) { - return webServer.requestAuthentication(); - } - - String arg; - - arg = webServer.arg("confUser"); - strcpy(configBlock.confUser, arg.c_str()); - arg = webServer.arg("confPasswd"); - strcpy(configBlock.confPasswd, arg.c_str()); - arg = webServer.arg("wifiSsid"); - strcpy(configBlock.wifiSsid, arg.c_str()); - arg = webServer.arg("wifiKey"); - strcpy(configBlock.wifiKey, arg.c_str()); - arg = webServer.arg("mqttBroker"); - strcpy(configBlock.mqttBroker, arg.c_str()); - arg = webServer.arg("mqttUser"); - strcpy(configBlock.mqttUser, arg.c_str()); - arg = webServer.arg("mqttPass"); - strcpy(configBlock.mqttPass, arg.c_str()); - arg = webServer.arg("mqttClientId"); - strcpy(configBlock.mqttClientId, arg.c_str()); - arg = webServer.arg("mqttPort"); - configBlock.mqttPort = atoi(arg.c_str()); - arg = webServer.arg("mqttTopicColorCommand"); - strcpy(configBlock.mqttTopicColorCommand, arg.c_str()); - arg = webServer.arg("mqttTopicCommand"); - strcpy(configBlock.mqttTopicCommand, arg.c_str()); - arg = webServer.arg("mqttDebugTopic"); - strcpy(configBlock.mqttDebugTopic, arg.c_str()); - arg = webServer.arg("debugMode"); - configBlock.debugMode = atoi(arg.c_str()); - - 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"); - - Serial.print("magic = <"); - Serial.print(configBlock.magic); - Serial.println(">"); - - Serial.print("confUser = <"); - Serial.print(configBlock.confUser); - Serial.println(">"); - - Serial.print("confPasswd = <"); - Serial.print(configBlock.confPasswd); - Serial.println(">"); - - Serial.print("wifiSsid = <"); - Serial.print(configBlock.wifiSsid); - Serial.println(">"); - - Serial.print("wifiKey = <"); - Serial.print(configBlock.wifiKey); - Serial.println(">"); - - Serial.print("mqttBroker = <"); - Serial.print(configBlock.mqttBroker); - Serial.println(">"); - - Serial.print("mqttUser = <"); - Serial.print(configBlock.mqttUser); - Serial.println(">"); - - Serial.print("mqttPass = <"); - Serial.print(configBlock.mqttPass); - Serial.println(">"); - - Serial.print("mqttClientId = <"); - Serial.print(configBlock.mqttClientId); - Serial.println(">"); - - Serial.print("mqttPort = <"); - Serial.print(configBlock.mqttPort); - Serial.println(">"); - - Serial.print("mqttTopicColorCommand = <"); - Serial.print(configBlock.mqttTopicColorCommand); - Serial.println(">"); - - Serial.print("mqttTopicCommand = <"); - Serial.print(configBlock.mqttTopicCommand); - Serial.println(">"); - - Serial.print("mqttDebugTopic = <"); - Serial.print(configBlock.mqttDebugTopic); - Serial.println(">"); - - Serial.print("debugMode = <"); - Serial.print(configBlock.debugMode); - Serial.println(">"); - - - Serial.println("---"); -} diff --git a/libraries/includes/configuration.h b/libraries/includes/configuration.h deleted file mode 100644 index 2b21764..0000000 --- a/libraries/includes/configuration.h +++ /dev/null @@ -1,24 +0,0 @@ -typedef struct { - uint32_t magic; - char confUser[16]; - char confPasswd[16]; - char wifiSsid[32]; - char wifiKey[64]; - char mqttBroker[32]; - char mqttUser[32]; - char mqttPass[32]; - char mqttClientId[32]; - uint32_t mqttPort; - char mqttTopicColorCommand[64]; - char mqttTopicCommand[64]; - char mqttDebugTopic[64]; - uint32_t debugMode; -} tConfigBlock; - -extern const uint32_t MAGIC; -extern tConfigBlock configBlock; -extern const char* CONFIG_SSID; - -void configServeIndex(); -void configServeGetConfiguration(); -void showConfiguration(); \ No newline at end of file