3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-05-16 02:16:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix #56

Browse source
This commit is contained in:
lumapu 2022-05-29 22:48:42 +02:00
parent df5a306bb2
commit 247ae3e1db
4 changed files with 20 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

21
tools/esp8266/app.cpp
View file

@ -106,11 +106,16 @@ void app::setup(uint32_t timeout) {
char addr[16] = {0}; char addr[16] = {0};
sprintf(addr, "%d.%d.%d.%d", mqttAddr[0], mqttAddr[1], mqttAddr[2], mqttAddr[3]); sprintf(addr, "%d.%d.%d.%d", mqttAddr[0], mqttAddr[1], mqttAddr[2], mqttAddr[3]);
mMqttActive = (mqttAddr[0] > 0);
if(mqttAddr[0] > 0) {
mMqttActive = true;
if(mMqttInterval < 1)
mMqttInterval = 1;
}
else
mMqttInterval = 0xffff;
if(mMqttInterval < 1)
mMqttInterval = 1;
mMqtt.setup(addr, mqttTopic, mqttUser, mqttPwd, mqttPort); mMqtt.setup(addr, mqttTopic, mqttUser, mqttPwd, mqttPort);
mMqttTicker = 0; mMqttTicker = 0;
@ -118,6 +123,15 @@ void app::setup(uint32_t timeout) {
mMqtt.sendMsg("version", mVersion); mMqtt.sendMsg("version", mVersion);
} }
else {
DPRINTLN(F("Settings not valid, erasing ..."));
eraseSettings();
saveValues(false);
delay(100);
DPRINTLN(F("... restarting ..."));
delay(100);
ESP.restart();
}
mSys->setup(); mSys->setup();
@ -731,6 +745,7 @@ void app::saveValues(bool webSend = true) {
} }
} }
else { else {
updateCrc();
mWeb->send(200, F("text/html"), F("<!doctype html><html><head><title>Error</title><meta http-equiv=\"refresh\" content=\"3; URL=/setup\"></head><body>" mWeb->send(200, F("text/html"), F("<!doctype html><html><head><title>Error</title><meta http-equiv=\"refresh\" content=\"3; URL=/setup\"></head><body>"
"<p>Error while saving</p></body></html>")); "<p>Error while saving</p></body></html>"));
} }

2
tools/esp8266/defines.h
View file

@ -16,7 +16,7 @@
//------------------------------------- //-------------------------------------
#define VERSION_MAJOR 0 #define VERSION_MAJOR 0
#define VERSION_MINOR 4 #define VERSION_MINOR 4
#define VERSION_PATCH 11 #define VERSION_PATCH 13
//------------------------------------- //-------------------------------------

17
tools/esp8266/main.cpp
View file

@ -126,28 +126,11 @@ bool Main::getConfig(void) {
mEep->read(ADDR_DEVNAME, mDeviceName, DEVNAME_LEN); mEep->read(ADDR_DEVNAME, mDeviceName, DEVNAME_LEN);
} }
else { else {
/*mApActive = true;
memset(mStationSsid, 0, SSID_LEN);
memset(mStationPwd, 0, PWD_LEN);
memset(mDeviceName, 0, DEVNAME_LEN);
// erase application settings except wifi settings
eraseSettings();*/
snprintf(mStationSsid, SSID_LEN, "%s", FB_WIFI_SSID); snprintf(mStationSsid, SSID_LEN, "%s", FB_WIFI_SSID);
snprintf(mStationPwd, PWD_LEN, "%s", FB_WIFI_PWD); snprintf(mStationPwd, PWD_LEN, "%s", FB_WIFI_PWD);
snprintf(mDeviceName, DEVNAME_LEN, "%s", DEF_DEVICE_NAME); snprintf(mDeviceName, DEVNAME_LEN, "%s", DEF_DEVICE_NAME);
} }
if(!mSettingsValid) {
DPRINTLN(F("Settings not valid, erasing ..."));
eraseSettings();
saveValues(false);
delay(100);
DPRINTLN(F("... restarting ..."));
delay(100);
ESP.restart();
}
return mApActive; return mApActive;
} }

1
tools/esp8266/main.h
View file

@ -50,6 +50,7 @@ class Main {
uint16_t crcRd, crcCheck; uint16_t crcRd, crcCheck;
crcCheck = buildEEpCrc(start, length); crcCheck = buildEEpCrc(start, length);
mEep->read(crcPos, &crcRd); mEep->read(crcPos, &crcRd);
//DPRINTLN("CRC RD: " + String(crcRd, HEX) + " CRC CALC: " + String(crcCheck, HEX));
return (crcCheck == crcRd); return (crcCheck == crcRd);
} }