github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-05-16 11:39:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved initial setup (#1148)

Browse Source 
* Improved initial setup

* Improvements after testing

* Adjustments after testing

* Fixed ESP8266 build

* Fixed voltage check
This commit is contained in:
Gunnar Skjold
2026-04-09 14:37:34 +02:00
committed by GitHub
parent 4673feaaf3
commit 0bb434f1f7
11 changed files with 212 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/AmsToMqttBridge.cpp
View File

@@ -300,18 +300,7 @@ void WiFiEvent(WiFiEvent_t event, WiFiEventInfo_t info) {
}
case ARDUINO_EVENT_ETH_DISCONNECTED:
case ARDUINO_EVENT_WIFI_STA_DISCONNECTED: {
if(WiFi.getMode() == WIFI_STA) {
wifi_err_reason_t reason = (wifi_err_reason_t) info.wifi_sta_disconnected.reason;
switch(reason) {
case WIFI_REASON_AUTH_FAIL:
case WIFI_REASON_NO_AP_FOUND:
if(sysConfig.dataCollectionConsent == 0) {
debugI_P(PSTR("Unable to connect to configured AP, swapping to AP mode"));
toggleSetupMode();
}
break;
}
}
debugW_P(PSTR("Disconnected from network"));
break;
}
case ARDUINO_EVENT_SC_FOUND_CHANNEL:
@@ -320,6 +309,9 @@ void WiFiEvent(WiFiEvent_t event, WiFiEventInfo_t info) {
case ARDUINO_EVENT_SC_GOT_SSID_PSWD:
debugI_P(PSTR("SmartConfig got config"));
break;
default:
debugD_P(PSTR("WiFi event: %s"), WiFi.eventName(event));
break;
}
}
@@ -478,6 +470,9 @@ void setup() {
#endif
while(!hw.isVoltageOptimal(allowedDrift)) {
uint8_t bootCycles = incrementBootCycleCounter(deepSleep);
#if defined(ESP32)
allowedDrift = bootCycles * 0.01;
#endif
debugW_P(PSTR("Voltage is outside optimal range (%.2fV)"), allowedDrift);
if(gpioConfig.apPin != 0xFF && digitalRead(gpioConfig.apPin) == LOW) {
debugW_P(PSTR("AP button is pressed, skipping voltage wait"));
@@ -540,9 +535,6 @@ void setup() {
WiFi.disconnect(true);
WiFi.softAPdisconnect(true);
WiFi.mode(WIFI_OFF);
#if defined(ESP32)
WiFi.onEvent(WiFiEvent);
#endif
UpgradeInformation upinfo;
if(config.getUpgradeInformation(upinfo)) {
@@ -1222,7 +1214,7 @@ void handleSystem(unsigned long now) {
unsigned long start, end;
if(now - lastSysupdate > 60000) {
start = millis();
if(WiFi.getMode() != WIFI_AP && WiFi.status() == WL_CONNECTED) {
if(WiFi.getMode() == WIFI_STA && WiFi.status() == WL_CONNECTED) {
if(mqttHandler != NULL) {
mqttHandler->publishSystem(&hw, ps, &ea);
mqttHandler->publishFirmware();
@@ -1258,7 +1250,7 @@ void handleTemperature(unsigned long now) {
if(hw.updateTemperatures()) {
lastTemperatureRead = now;
if(mqttHandler != NULL && WiFi.getMode() != WIFI_AP && WiFi.status() == WL_CONNECTED) {
if(mqttHandler != NULL && WiFi.getMode() == WIFI_STA && WiFi.status() == WL_CONNECTED) {
mqttHandler->publishTemperatures(&config, &hw);
}
}