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

allow gpio template via user_config_override

Browse Source
This commit is contained in:
arovak 2021-04-23 20:43:58 +02:00
parent 761b3f02f3
commit 489a321473
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/hasp_config.cpp
View File

@ -152,6 +152,13 @@ void configRead(JsonDocument& settings, bool setupdebug = false)
#if HASP_USE_SPIFFS > 0 || HASP_USE_LITTLEFS > 0 #if HASP_USE_SPIFFS > 0 || HASP_USE_LITTLEFS > 0
LOG_ERROR(TAG_CONF, F(D_FILE_LOAD_FAILED), configFile.c_str()); LOG_ERROR(TAG_CONF, F(D_FILE_LOAD_FAILED), configFile.c_str());
#ifdef HASP_GPIO_TEMPLATE
char json[100];
snprintf(json, sizeof(json), PSTR("{\"%s\":{\"%s\":%s}}"), (char*)(FPSTR(FP_GPIO)), (char*)(FPSTR(FP_GPIO_CONFIG)), (char*)(FPSTR(HASP_GPIO_TEMPLATE)));
error = deserializeJson(settings, json);
gpioSetConfig(settings[FPSTR(FP_GPIO)]);
#endif
#endif #endif
} }
/* /*
@ -380,7 +387,7 @@ void configSetup()
//#if HASP_USE_SPIFFS > 0 //#if HASP_USE_SPIFFS > 0
LOG_INFO(TAG_DEBG, F("Loading debug settings")); LOG_INFO(TAG_DEBG, F("Loading debug settings"));
debugSetConfig(settings[FPSTR(FP_DEBUG)]); debugSetConfig(settings[FPSTR(FP_DEBUG)]);
LOG_INFO(TAG_GUI, F("Loading GUI settings")); LOG_INFO(TAG_GPIO, F("Loading GUI settings"));
guiSetConfig(settings[FPSTR(FP_GUI)]); guiSetConfig(settings[FPSTR(FP_GUI)]);
LOG_INFO(TAG_HASP, F("Loading HASP settings")); LOG_INFO(TAG_HASP, F("Loading HASP settings"));
haspSetConfig(settings[FPSTR(FP_HASP)]); haspSetConfig(settings[FPSTR(FP_HASP)]);

4
src/hasp_config.h
View File

@ -71,6 +71,10 @@ const char FP_HASP[] PROGMEM = "hasp";
const char FP_GUI[] PROGMEM = "gui"; const char FP_GUI[] PROGMEM = "gui";
const char FP_DEBUG[] PROGMEM = "debug"; const char FP_DEBUG[] PROGMEM = "debug";
#ifdef HASP_GPIO_TEMPLATE
const char FP_GPIO_TEMPLATE[] PROGMEM = HASP_GPIO_TEMPLATE;
#endif
#endif #endif
#endif // HASP_USE_CONFIG #endif // HASP_USE_CONFIG