wn/rgbled
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drop generated files from repo

Browse Source
This commit is contained in:
Wolfgang Hottgenroth
2019-05-17 17:58:09 +02:00
parent 6e840379d4
commit 86c8551368
3 changed files with 6 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -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

389
libraries/includes/configuration.cpp
View File

@ -1,389 +0,0 @@
#include <Arduino.h>
#include <ESP8266WiFi.h>
#include <ESP8266WebServer.h>
#include <EEPROM.h>
#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 =
"<!doctype html"
"<html lang=\"en\">"
" <head>"
" <title>ESP8266 based RGB-LED-Light</title>"
" </head>"
" <body>"
" <h1>ESP8266 based RGB-LED-Light - ESP8266 Configuration Page</h1>";
if (configSaved) {
configSaved = false;
buffer += "<h2>Configuration saved</h2>";
}
buffer +=
" <form action=\"/config\" method=\"GET\">"
" <table>"
" <tr>"
" <td>"
" <label for\"confUser\">Config Username</label>"
" </td><td>"
" <input type=\"text\" name=\"confUser\" id=\"confUser\" ";
buffer += " size=\"16\" ";
buffer += " value=\"";
buffer += configBlock.confUser;
buffer += "\"";
buffer +=
" />"
" </td>"
" </tr>"
" <tr>"
" <td>"
" <label for\"confPasswd\">Config Password</label>"
" </td><td>"
" <input type=\"text\" name=\"confPasswd\" id=\"confPasswd\" ";
buffer += " size=\"16\" ";
buffer += " value=\"";
buffer += configBlock.confPasswd;
buffer += "\"";
buffer +=
" />"
" </td>"
" </tr>"
" <tr>"
" <td>"
" <label for\"wifiSsid\">Wifi SSID</label>"
" </td><td>"
" <input type=\"text\" name=\"wifiSsid\" id=\"wifiSsid\" ";
buffer += " size=\"32\" ";
buffer += " value=\"";
buffer += configBlock.wifiSsid;
buffer += "\"";
buffer +=
" />"
" </td>"
" </tr>"
" <tr>"
" <td>"
" <label for\"wifiKey\">Wifi Key</label>"
" </td><td>"
" <input type=\"text\" name=\"wifiKey\" id=\"wifiKey\" ";
buffer += " size=\"64\" ";
buffer += " value=\"";
buffer += configBlock.wifiKey;
buffer += "\"";
buffer +=
" />"
" </td>"
" </tr>"
" <tr>"
" <td>"
" <label for\"mqttBroker\">MQTT Broker</label>"
" </td><td>"
" <input type=\"text\" name=\"mqttBroker\" id=\"mqttBroker\" ";
buffer += " size=\"32\" ";
buffer += " value=\"";
buffer += configBlock.mqttBroker;
buffer += "\"";
buffer +=
" />"
" </td>"
" </tr>"
" <tr>"
" <td>"
" <label for\"mqttUser\">MQTT Username</label>"
" </td><td>"
" <input type=\"text\" name=\"mqttUser\" id=\"mqttUser\" ";
buffer += " size=\"32\" ";
buffer += " value=\"";
buffer += configBlock.mqttUser;
buffer += "\"";
buffer +=
" />"
" </td>"
" </tr>"
" <tr>"
" <td>"
" <label for\"mqttPass\">MQTT Password</label>"
" </td><td>"
" <input type=\"text\" name=\"mqttPass\" id=\"mqttPass\" ";
buffer += " size=\"32\" ";
buffer += " value=\"";
buffer += configBlock.mqttPass;
buffer += "\"";
buffer +=
" />"
" </td>"
" </tr>"
" <tr>"
" <td>"
" <label for\"mqttClientId\">MQTT ClientId</label>"
" </td><td>"
" <input type=\"text\" name=\"mqttClientId\" id=\"mqttClientId\" ";
buffer += " size=\"32\" ";
buffer += " value=\"";
buffer += configBlock.mqttClientId;
buffer += "\"";
buffer +=
" />"
" </td>"
" </tr>"
" <tr>"
" <td>"
" <label for\"mqttPort\">MQTT Port</label>"
" </td><td>"
" <input type=\"text\" name=\"mqttPort\" id=\"mqttPort\" ";
buffer += " value=\"";
buffer += configBlock.mqttPort;
buffer += "\"";
buffer +=
" />"
" </td>"
" </tr>"
" <tr>"
" <td>"
" <label for\"mqttTopicColorCommand\">MQTT Topic Color Command</label>"
" </td><td>"
" <input type=\"text\" name=\"mqttTopicColorCommand\" id=\"mqttTopicColorCommand\" ";
buffer += " size=\"64\" ";
buffer += " value=\"";
buffer += configBlock.mqttTopicColorCommand;
buffer += "\"";
buffer +=
" />"
" </td>"
" </tr>"
" <tr>"
" <td>"
" <label for\"mqttTopicCommand\">MQTT Topic Command</label>"
" </td><td>"
" <input type=\"text\" name=\"mqttTopicCommand\" id=\"mqttTopicCommand\" ";
buffer += " size=\"64\" ";
buffer += " value=\"";
buffer += configBlock.mqttTopicCommand;
buffer += "\"";
buffer +=
" />"
" </td>"
" </tr>"
" <tr>"
" <td>"
" <label for\"mqttDebugTopic\">MQTT DebugTopic</label>"
" </td><td>"
" <input type=\"text\" name=\"mqttDebugTopic\" id=\"mqttDebugTopic\" ";
buffer += " size=\"64\" ";
buffer += " value=\"";
buffer += configBlock.mqttDebugTopic;
buffer += "\"";
buffer +=
" />"
" </td>"
" </tr>"
" <tr>"
" <td>"
" <label for\"debugMode\">DebugMode</label>"
" </td><td>"
" <input type=\"text\" name=\"debugMode\" id=\"debugMode\" ";
buffer += " value=\"";
buffer += configBlock.debugMode;
buffer += "\"";
buffer +=
" />"
" </td>"
" </tr>"
" <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() {
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("---");
}

24
libraries/includes/configuration.h
View File

@ -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();