andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-07-29 01:52:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

prevent errorlogs for nonexisting nvs values, version numbering to dev.8d

Browse Source
This commit is contained in:
MichaelDvP
2026-07-12 11:05:28 +02:00
parent 20fc5ede78
commit cb1cb356ce
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/analogsensor.cpp
View File

@@ -546,11 +546,13 @@ bool AnalogSensor::update(uint8_t gpio, const char * org_name, double offset, do
if (deleted) { if (deleted) {
LOG_DEBUG("Removing analog sensor GPIO %02d", gpio); LOG_DEBUG("Removing analog sensor GPIO %02d", gpio);
EMSESP::system_.remove_gpio(gpio); // remove from used list only EMSESP::system_.remove_gpio(gpio); // remove from used list only
if (EMSESP::nvs_.isKey(AnalogCustomization.name)) {
EMSESP::nvs_.remove(AnalogCustomization.name); EMSESP::nvs_.remove(AnalogCustomization.name);
}
settings.analogCustomizations.remove(AnalogCustomization); settings.analogCustomizations.remove(AnalogCustomization);
} else { } else {
// update existing record // update existing record
if (!strcmp(name, AnalogCustomization.name)) { if (!strcmp(name, AnalogCustomization.name) && EMSESP::nvs_.isKey(AnalogCustomization.name)) {
EMSESP::nvs_.remove(AnalogCustomization.name); EMSESP::nvs_.remove(AnalogCustomization.name);
} }
strlcpy(AnalogCustomization.name, name, sizeof(AnalogCustomization.name)); strlcpy(AnalogCustomization.name, name, sizeof(AnalogCustomization.name));

2
src/emsesp_version.h
View File

@@ -1 +1 @@
#define EMSESP_APP_VERSION "3.8.3-dev.11" #define EMSESP_APP_VERSION "3.8.3-dev.8d"

2
src/web/WebCustomEntityService.cpp
View File

@@ -77,8 +77,10 @@ StateUpdateResult WebCustomEntity::update(JsonObject root, WebCustomEntity & web
if (entityItem.ram == 2) { // NVS if (entityItem.ram == 2) { // NVS
char key[sizeof(entityItem.name) + 2]; char key[sizeof(entityItem.name) + 2];
snprintf(key, sizeof(key), "c:%s", entityItem.name); snprintf(key, sizeof(key), "c:%s", entityItem.name);
if (EMSESP::nvs_.isKey(key)) {
EMSESP::nvs_.remove(key); EMSESP::nvs_.remove(key);
} }
}
if (entityItem.ram) { // save name/value pairs for change checking if (entityItem.ram) { // save name/value pairs for change checking
doc[entityItem.name] = entityItem.value; doc[entityItem.name] = entityItem.value;
} }

2
src/web/WebSchedulerService.cpp
View File

@@ -76,8 +76,10 @@ StateUpdateResult WebScheduler::update(JsonObject root, WebScheduler & webSchedu
for (ScheduleItem & scheduleItem : webScheduler.scheduleItems) { for (ScheduleItem & scheduleItem : webScheduler.scheduleItems) {
char key[sizeof(scheduleItem.name) + 2]; char key[sizeof(scheduleItem.name) + 2];
snprintf(key, sizeof(key), "s:%s", scheduleItem.name); snprintf(key, sizeof(key), "s:%s", scheduleItem.name);
if (EMSESP::nvs_.isKey(key)) {
EMSESP::nvs_.remove(key); EMSESP::nvs_.remove(key);
} }
}
webScheduler.scheduleItems.clear(); webScheduler.scheduleItems.clear();
EMSESP::webSchedulerService.ha_reset(); EMSESP::webSchedulerService.ha_reset();