GitHub-Proxy/ESP3D
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/luc-github/ESP3D.git synced 2025-08-01 00:21:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug introduced by latest PR if doing reset on clean EEPROM => going to dead loop because of upside down test

Browse Source 
Fix wrong parsing of settings during  reset
Fix typo that generate wrong IP for AP
This commit is contained in:
Luc 2023-11-13 19:44:23 +08:00
parent cda276e2e6
commit f562e55a6d
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
esp3d/src/core/settings_esp3d.cpp
View File

@ -172,7 +172,7 @@
#define DEFAULT_TIME_SERVER2 "time.google.com" #define DEFAULT_TIME_SERVER2 "time.google.com"
#define DEFAULT_TIME_SERVER3 "0.pool.ntp.org" #define DEFAULT_TIME_SERVER3 "0.pool.ntp.org"
#define DEFAULT_SETTINGS_VERSION "ESP3D" #define DEFAULT_SETTINGS_VERSION "ESP3D30"
// default IP values // default IP values
#define DEFAULT_STA_IP_VALUE "192.168.0.254" #define DEFAULT_STA_IP_VALUE "192.168.0.254"
@ -180,7 +180,7 @@
#define DEFAULT_STA_MASK_VALUE "255.255.255.0" #define DEFAULT_STA_MASK_VALUE "255.255.255.0"
#define DEFAULT_STA_DNS_VALUE DEFAULT_STA_IP_VALUE #define DEFAULT_STA_DNS_VALUE DEFAULT_STA_IP_VALUE
#define DEFAULT_AP_IP_VALUE "192.1680.0.1" #define DEFAULT_AP_IP_VALUE "192.168.0.1"
#define DEFAULT_AP_GATEWAY_VALUE DEFAULT_AP_IP_VALUE #define DEFAULT_AP_GATEWAY_VALUE DEFAULT_AP_IP_VALUE
#define DEFAULT_AP_MASK_VALUE "255.255.255.0" #define DEFAULT_AP_MASK_VALUE "255.255.255.0"
#define DEFAULT_AP_DNS_VALUE DEFAULT_AP_IP_VALUE #define DEFAULT_AP_DNS_VALUE DEFAULT_AP_IP_VALUE
@ -644,7 +644,8 @@ bool Settings_ESP3D::write_IP(int pos, const uint32_t value) {
// clear all entries // clear all entries
bool Settings_ESP3D::reset(bool networkonly) { bool Settings_ESP3D::reset(bool networkonly) {
uint nb_settings = sizeof(ESP3DSettingsData) / sizeof(uint16_t); uint nb_settings = sizeof(ESP3DSettingsData) / sizeof(uint16_t);
for (uint i = 0; i < nb_settings; i++) { for (uint j = 0; j < nb_settings; j++) {
uint16_t i = ESP3DSettingsData[j];
if (networkonly && i == ESP_SETTINGS_VERSION) { if (networkonly && i == ESP_SETTINGS_VERSION) {
return true; return true;
} }
@ -690,9 +691,10 @@ bool Settings_ESP3D::reset(bool networkonly) {
int8_t Settings_ESP3D::GetSettingsVersion() { int8_t Settings_ESP3D::GetSettingsVersion() {
int8_t v = -1; int8_t v = -1;
String version = Settings_ESP3D::read_string(ESP_SETTINGS_VERSION); String version = Settings_ESP3D::read_string(ESP_SETTINGS_VERSION);
if ((version == "ESP3D") || (version.length() != 7) || if (!Settings_ESP3D::isValidStringSetting(version.c_str(),
(version.indexOf("ESP3D") != 0)) { ESP_SETTINGS_VERSION)) {
log_esp3d_e("Invalid Settings Version %s", version.c_str()); log_esp3d_e("Invalid Settings Version %s expected %s", version.c_str(),
DEFAULT_SETTINGS_VERSION);
return v; return v;
} }
v = version.substring(5).toInt(); v = version.substring(5).toInt();
@ -803,7 +805,7 @@ bool Settings_ESP3D::isValidStringSetting(const char *value,
} }
switch (settingElement) { switch (settingElement) {
case ESP_SETTINGS_VERSION: case ESP_SETTINGS_VERSION:
return (!strcmp(value, DEFAULT_SETTINGS_VERSION) == 0); return (strcmp(value, DEFAULT_SETTINGS_VERSION) == 0);
break; break;
case ESP_HOSTNAME: case ESP_HOSTNAME:
// only letter and digit // only letter and digit