jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-27 21:26:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Load all settings before the setup functions

Browse Source
This commit is contained in:
fvanroie 2020-03-29 03:10:37 +02:00
parent 33b62e3583
commit 95a7ed74e1
8 changed files with 87 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/hasp_config.cpp
View File

@ -174,13 +174,44 @@ void configWriteConfig()
}
}
void configSetup(JsonDocument & settings)
void configSetup(JsonObject dummy)
{
if(!SPIFFS.begin()) {
Log.error(F("FILE: SPI flash init failed. Unable to mount FS."));
Log.error(F("FILE: SPI flash init failed. Unable to mount FS: Using default settings..."));
} else {
DynamicJsonDocument settings(1024 + 128);
configGetConfig(settings, true);
Log.verbose(F("Loading debug settings"));
debugSetConfig(settings[F("debug")]);
Log.verbose(F("Loading GUI settings"));
guiSetConfig(settings[F("gui")]);
Log.verbose(F("Loading HASP settings"));
haspSetConfig(settings[F("hasp")]);
// otaGetConfig(settings[F("ota")]);
#if HASP_USE_WIFI
Log.verbose(F("Loading WiFi settings"));
wifiSetConfig(settings[F("wifi")]);
#if HASP_USE_MQTT
Log.verbose(F("Loading MQTT settings"));
mqttSetConfig(settings[F("mqtt")]);
#endif
#if HASP_USE_TELNET
Log.verbose(F("Loading Telnet settings"));
telnetSetConfig(settings[F("telnet")]);
#endif
#if HASP_USE_MDNS
Log.verbose(F("Loading MDNS settings"));
mdnsSetConfig(settings[F("mdns")]);
#endif
#if HASP_USE_HTTP
Log.verbose(F("Loading HTTP settings"));
httpSetConfig(settings[F("http")]);
#endif
#endif
}
Log.notice(F("User configuration loaded"));
}
void configOutput(const JsonObject & settings)

2
src/hasp_config.h
View File

@ -32,7 +32,7 @@ const char F_DEBUG_TELEPERIOD[] PROGMEM = "teleperiod";
const char HASP_CONFIG_FILE[] PROGMEM = "/config.json";
void configSetup(JsonDocument & settings);
void configSetup(JsonObject settings);
void configStop(void);
void configSetConfig(JsonObject & settings);

2
src/hasp_gui.h
View File

@ -16,7 +16,7 @@ void guiTakeScreenshot(ESP8266WebServer & client);
void guiTakeScreenshot(WebServer & client);
#endif // ESP32
void guiSetup(JsonObject settings);
void guiSetup(const JsonObject & settings);
void guiLoop(void);
void guiStop(void);

38
src/hasp_http.cpp
View File

@ -541,7 +541,7 @@ static inline String httpGetNodename()
}
////////////////////////////////////////////////////////////////////////////////////////////////////
bool httpIsAuthenticated(const String & page)
bool httpIsAuthenticated(const __FlashStringHelper * page)
{
if(httpPassword[0] != '\0') { // Request HTTP auth if httpPassword is set
if(!webServer.authenticate(httpUser, httpPassword)) {
@ -551,7 +551,7 @@ bool httpIsAuthenticated(const String & page)
}
{
Log.verbose(F("HTTP: Sending %s page to client connected from: %s"), page.c_str(),
Log.verbose(F("HTTP: Sending %s page to client connected from: %s"), page,
webServer.client().remoteIP().toString().c_str());
}
return true;
@ -982,10 +982,7 @@ bool handleFileRead(String path)
{
if(!httpIsAuthenticated(F("fileread"))) return false;
// path = urldecode(path).substring(0, 31);
path = webServer.urlDecode(path);
if(!httpIsAuthenticated(path)) return false;
path = webServer.urlDecode(path).substring(0, 31);
if(path.endsWith("/")) {
path += F("index.htm");
}
@ -1829,10 +1826,25 @@ void httpHandleResetConfig()
}
}
void webStart()
{
webServer.begin();
webServerStarted = true;
Log.notice(F("HTTP: Server started @ http://%s"),
(WiFi.getMode() == WIFI_AP ? WiFi.softAPIP().toString().c_str() : WiFi.localIP().toString().c_str()));
}
void webStop()
{
webServer.stop();
webServerStarted = false;
Log.warning(F("HTTP: Server stoped"));
}
////////////////////////////////////////////////////////////////////////////////////////////////////
void httpSetup(const JsonObject & settings)
{
httpSetConfig(settings);
// httpSetConfig(settings);
if(WiFi.getMode() == WIFI_AP) {
Log.notice(F("HTTP: Wifi access point"));
@ -1905,8 +1917,8 @@ void httpSetup(const JsonObject & settings)
webServer.on(F("/config"), webHandleConfig);
webServer.onNotFound(httpHandleNotFound);
httpReconnect();
Log.verbose(F("HTTP: Setup Complete"));
webStart();
}
////////////////////////////////////////////////////////////////////////////////////////////////////
@ -1915,15 +1927,9 @@ void httpReconnect()
if(!httpEnable) return;
if(webServerStarted) {
webServer.stop();
webServerStarted = false;
Log.warning(F("HTTP: Server stoped"));
webStop();
} else if(WiFi.status() == WL_CONNECTED || WiFi.getMode() == WIFI_AP) {
webServer.begin();
webServerStarted = true;
Log.notice(
F("HTTP: Server started @ http://%s"),
(WiFi.getMode() == WIFI_AP ? WiFi.softAPIP().toString().c_str() : WiFi.localIP().toString().c_str()));
webStart();
}
}

4
src/hasp_mdns.cpp
View File

@ -22,7 +22,7 @@ uint8_t mdnsEnabled = true;
void mdnsSetup(const JsonObject & settings)
{
mdnsSetConfig(settings);
// mdnsSetConfig(settings);
Log.verbose(F("MDNS: Setup Complete"));
}
@ -43,7 +43,6 @@ void mdnsStart()
HASP_VERSION_REVISION);
MDNS.addServiceTxt(hasp2Node, "tcp", "app_version", buffer); */
if(MDNS.begin(hasp2Node.c_str())) {
Log.notice(F("MDNS: Responder started"));
MDNS.addService(F("http"), F("tcp"), 80);
MDNS.addService(F("telnet"), F("tcp"), 23);
MDNS.addServiceTxt(hasp2Node, F("tcp"), F("app_name"), F("HASP-lvgl"));
@ -53,6 +52,7 @@ void mdnsStart()
addServiceTxt("arduino", "tcp", "ssh_upload", "no");
addServiceTxt("arduino", "tcp", "board", ARDUINO_BOARD);
addServiceTxt("arduino", "tcp", "auth_upload", (auth) ? "yes" : "no");*/
Log.notice(F("MDNS: Responder started"));
} else {
Log.error(F("MDNS: Responder failed to start %s"), hasp2Node.c_str());
};

2
src/hasp_spiffs.cpp
View File

@ -44,7 +44,7 @@ void spiffsSetup()
#endif
Log.error(F("FILE: SPI flash init failed. Unable to mount FS."));
} else {
Log.notice(F("FILE: SPI Flash FS mounted"));
Log.verbose(F("FILE: SPI Flash FS mounted"));
}
#endif
}

2
src/hasp_wifi.h
View File

@ -4,7 +4,7 @@
#include "ArduinoJson.h"
void wifiSetup(JsonObject settings);
bool wifiLoop(void);
bool wifiEvery5Seconds(void);
void wifiStop(void);
bool wifiGetConfig(const JsonObject & settings);

39
src/main.cpp
View File

@ -54,6 +54,10 @@ unsigned long mainLastLoopTime = 0;
void setup()
{
/****************************
* Constant initialzations
***************************/
#if defined(ARDUINO_ARCH_ESP8266)
pinMode(D1, OUTPUT);
pinMode(D2, INPUT_PULLUP);
@ -68,20 +72,29 @@ void setup()
spiffsSetup();
#endif
/* Read Config File */
DynamicJsonDocument settings(1024 + 512);
configSetup(settings);
#if HASP_USE_SDCARD
sdcardSetup();
#endif
/****************************
* Read & Apply User Configuration
***************************/
DynamicJsonDocument settings(128);
configSetup(settings[F("debug")]);
/****************************
* Apply User Configuration
***************************/
debugSetup(settings[F("debug")]);
/* Init Graphics */
// TFT_eSPI screen = TFT_eSPI();
guiSetup(settings[F("gui")]);
#if HASP_USE_WIFI
wifiSetup(settings[F("wifi")]);
#endif
/* Init GUI Application */
haspSetup(settings[F("hasp")]);
@ -89,6 +102,10 @@ void setup()
#if HASP_USE_WIFI
wifiSetup(settings[F("wifi")]);
#if HASP_USE_HTTP
httpSetup(settings[F("http")]);
#endif
#if HASP_USE_MQTT
mqttSetup(settings[F("mqtt")]);
#endif
@ -101,19 +118,15 @@ void setup()
mdnsSetup(settings[F("mdns")]);
#endif
#if HASP_USE_HTTP
httpSetup(settings[F("http")]);
#endif
#if HASP_USE_BUTTON
buttonSetup();
#endif
#if HASP_USE_OTA
otaSetup(settings[F("ota")]);
#endif
#endif // WIFI
#if HASP_USE_BUTTON
buttonSetup();
#endif
}
void loop()
@ -183,7 +196,7 @@ void loop()
/* Run Every 5 Seconds */
if(mainLoopCounter == 0 || mainLoopCounter == 5) {
httpEvery5Seconds();
isConnected = wifiLoop();
isConnected = wifiEvery5Seconds();
mqttEvery5Seconds(isConnected);
}
}