souko/Kettenoeler
1
0
Fork 0
Code Issues Pull Requests Releases 4 Wiki Activity

Disabled autocorrect of Config after SanityCheck

Browse Source
This commit is contained in:
Marcel Peterkau
2022-09-01 23:00:19 +02:00
parent dc4dbb05ca
commit 64f9e102a5
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Software/data_src/static/tt_dtc/dtc_13.json
View File

@@ -1,4 +1,4 @@
{ {
"title": "Config-Validierung", "title": "Config-Validierung",
"description": "Ein oder mehrer Einstellungswerte waren ausserhalb gültiger Werte. Diese wurden automatisch korrigiert. Prüfen Sie Ihre Einstellungen" "description": "Ein oder mehrer Einstellungswerte sind ausserhalb plausibler Werte. Prüfen Sie Ihre Einstellungen"
} }

2
Software/data_src/version
View File

@@ -1 +1 @@
1.2 1.3

5
Software/src/common.h
View File

@@ -26,9 +26,8 @@
#define HOST_NAME "ChainLube_%06X" // Use printf-Formatting - Chip-ID (uin32_t) will be added #define HOST_NAME "ChainLube_%06X" // Use printf-Formatting - Chip-ID (uin32_t) will be added
#endif #endif
#define SW_VERSION 1.2 #define SW_VERSION 1.3
#define FLASH_FS_VERSION 1.3
#define FLASH_FS_VERSION 1.2
#ifndef OTA_DELAY #ifndef OTA_DELAY
#define OTA_DELAY 50 // ticks -> 10ms / tick #define OTA_DELAY 50 // ticks -> 10ms / tick

10
Software/src/config.cpp
View File

@@ -25,37 +25,45 @@ void EEPROM_Process()
case EE_CFG_SAVE: case EE_CFG_SAVE:
StoreConfig_EEPROM(); StoreConfig_EEPROM();
globals.requestEEAction = EE_IDLE; globals.requestEEAction = EE_IDLE;
Serial.println("Stored EEPROM CFG");
break; break;
case EE_CFG_LOAD: case EE_CFG_LOAD:
GetConfig_EEPROM(); GetConfig_EEPROM();
globals.requestEEAction = EE_IDLE; globals.requestEEAction = EE_IDLE;
Serial.println("Loaded EEPROM CFG");
break; break;
case EE_CFG_FORMAT: case EE_CFG_FORMAT:
FormatConfig_EEPROM(); FormatConfig_EEPROM();
globals.requestEEAction = EE_IDLE; globals.requestEEAction = EE_IDLE;
globals.systemStatus = sysStat_Shutdown; globals.systemStatus = sysStat_Shutdown;
Serial.println("Formated EEPROM CFG");
break; break;
case EE_PDS_SAVE: case EE_PDS_SAVE:
StorePersistence_EEPROM(); StorePersistence_EEPROM();
globals.requestEEAction = EE_IDLE; globals.requestEEAction = EE_IDLE;
Serial.println("Stored EEPROM PDS");
break; break;
case EE_PDS_LOAD: case EE_PDS_LOAD:
GetPersistence_EEPROM(); GetPersistence_EEPROM();
globals.requestEEAction = EE_IDLE; globals.requestEEAction = EE_IDLE;
Serial.println("Loaded EEPROM PDS");
break; break;
case EE_PDS_FORMAT: case EE_PDS_FORMAT:
FormatPersistence_EEPROM(); FormatPersistence_EEPROM();
globals.requestEEAction = EE_IDLE; globals.requestEEAction = EE_IDLE;
Serial.println("Formated EEPROM PDS");
break; break;
case EE_FORMAT_ALL: case EE_FORMAT_ALL:
FormatConfig_EEPROM(); FormatConfig_EEPROM();
FormatPersistence_EEPROM(); FormatPersistence_EEPROM();
globals.requestEEAction = EE_IDLE; globals.requestEEAction = EE_IDLE;
Serial.println("Formated EEPROM ALL");
break; break;
case EE_ALL_SAVE: case EE_ALL_SAVE:
StorePersistence_EEPROM(); StorePersistence_EEPROM();
StoreConfig_EEPROM(); StoreConfig_EEPROM();
globals.requestEEAction = EE_IDLE; globals.requestEEAction = EE_IDLE;
Serial.println("Stored EEPROM ALL");
break; break;
case EE_IDLE: case EE_IDLE:
default: default:
@@ -89,7 +97,7 @@ void GetConfig_EEPROM()
} }
LubeConfig.checksum = checksum; LubeConfig.checksum = checksum;
uint32_t ConfigSanityCheckResult = ConfigSanityCheck(true); uint32_t ConfigSanityCheckResult = ConfigSanityCheck(false);
if (ConfigSanityCheckResult > 0) if (ConfigSanityCheckResult > 0)
{ {