github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-01-14 07:49:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only clear HA config if illegal characters are loaded from flash

Browse Source
This commit is contained in:
Gunnar Skjold 2023-04-15 07:47:48 +02:00
parent be116d5b35
commit 276ac67d2e
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/AmsConfiguration/src/AmsConfiguration.cpp
View File

@ -337,6 +337,9 @@ bool AmsConfiguration::getHomeAssistantConfig(HomeAssistantConfig& config) {
EEPROM.begin(EEPROM_SIZE);
EEPROM.get(CONFIG_HA_START, config);
EEPROM.end();
if(stripNonAscii((uint8_t*) config.discoveryPrefix, 64) || stripNonAscii((uint8_t*) config.discoveryHostname, 64) || stripNonAscii((uint8_t*) config.discoveryNameTag, 16)) {
clearHomeAssistantConfig(config);
}
return true;
} else {
clearHomeAssistantConfig(config);

12
lib/SvelteUi/src/AmsWebServer.cpp
View File

@ -805,19 +805,11 @@ void AmsWebServer::configurationJson() {
DebugConfig debugConfig;
config->getDebugConfig(debugConfig);
DomoticzConfig domo;
if(mqttConfig.payloadFormat == 3) {
config->getDomoticzConfig(domo);
} else {
config->clearDomo(domo);
}
config->getDomoticzConfig(domo);
UiConfig ui;
config->getUiConfig(ui);
HomeAssistantConfig haconf;
if(mqttConfig.payloadFormat == 4) {
config->getHomeAssistantConfig(haconf);
} else {
config->clearHomeAssistantConfig(haconf);
}
config->getHomeAssistantConfig(haconf);
bool qsc = false;
bool qsr = false;