diff --git a/source/Core/Inc/Settings.h b/source/Core/Inc/Settings.h index 72eb7d8d..e9bddfaf 100644 --- a/source/Core/Inc/Settings.h +++ b/source/Core/Inc/Settings.h @@ -11,7 +11,13 @@ #define SETTINGS_H_ #include #include -#define SETTINGSVERSION (0x2A) // This number is frozen, do not edit + +#ifdef MODEL_Pinecilv2 +// Required settings reset for PR #1916 +#define SETTINGSVERSION (0x55AB) // This number is frozen, do not edit +#else +#define SETTINGSVERSION (0x55AA) // This number is frozen, do not edit +#endif enum SettingsOptions { SolderingTemp = 0, // current set point for the iron diff --git a/source/Core/Src/Settings.cpp b/source/Core/Src/Settings.cpp index 77512b9d..72e9e7ff 100644 --- a/source/Core/Src/Settings.cpp +++ b/source/Core/Src/Settings.cpp @@ -135,9 +135,9 @@ bool sanitiseSettings() { // For all settings, need to ensure settings are in a valid range // First for any not know about due to array growth, reset them and update the length value bool dirty = false; - if (systemSettings.versionMarker != 0x55AA) { + if (systemSettings.versionMarker != SETTINGSVERSION) { memset((void *)&systemSettings, 0xFF, sizeof(systemSettings)); - systemSettings.versionMarker = 0x55AA; + systemSettings.versionMarker = SETTINGSVERSION; dirty = true; } if (systemSettings.padding != 0xFFFFFFFF) {