airgradienthq/arduino
1
0
Fork 1
mirror of https://github.com/airgradienthq/arduino.git synced 2025-07-18 03:02:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update board support handle and fix connect timeout handle.

Browse Source
This commit is contained in:
Phat Nguyen
2024-06-19 10:33:02 +07:00
parent 5ea01b8e9f
commit c8745e123b
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/AgWiFiConnector.cpp
View File

@ -1,7 +1,8 @@
#include "AgWiFiConnector.h" #include "AgWiFiConnector.h"
#include "Libraries/WiFiManager/WiFiManager.h" #include "Libraries/WiFiManager/WiFiManager.h"
#define WIFI_CONNECT_COUNTDOWN_MAX 180 // FIXME Just for test
#define WIFI_CONNECT_COUNTDOWN_MAX 60
#define WIFI_HOTSPOT_PASSWORD_DEFAULT "cleanair" #define WIFI_HOTSPOT_PASSWORD_DEFAULT "cleanair"
#define WIFI() ((WiFiManager *)(this->wifi)) #define WIFI() ((WiFiManager *)(this->wifi))
@ -48,8 +49,8 @@ bool WifiConnector::connect(void) {
WIFI()->setAPCallback([this](WiFiManager *obj) { _wifiApCallback(); }); WIFI()->setAPCallback([this](WiFiManager *obj) { _wifiApCallback(); });
WIFI()->setSaveConfigCallback([this]() { _wifiSaveConfig(); }); WIFI()->setSaveConfigCallback([this]() { _wifiSaveConfig(); });
WIFI()->setSaveParamsCallback([this]() { _wifiSaveParamCallback(); }); WIFI()->setSaveParamsCallback([this]() { _wifiSaveParamCallback(); });
WIFI()->setConfigPortalTimeoutCallback([this]() {}); WIFI()->setConfigPortalTimeoutCallback([this]() {_wifiTimeoutCallback();});
if (ag->isOne() || (ag->getBoardType() == DIY_PRO_INDOOR_V4_2)) { if (ag->isOne() || (ag->isPro4_2())) {
disp.setText("Connecting to", "WiFi", "..."); disp.setText("Connecting to", "WiFi", "...");
} else { } else {
logInfo("Connecting to WiFi..."); logInfo("Connecting to WiFi...");
@ -142,7 +143,7 @@ bool WifiConnector::connect(void) {
/** Show display wifi connect result failed */ /** Show display wifi connect result failed */
if (WiFi.isConnected() == false) { if (WiFi.isConnected() == false) {
sm.handleLeds(AgStateMachineWiFiManagerConnectFailed); sm.handleLeds(AgStateMachineWiFiManagerConnectFailed);
if (ag->isOne() || ag->getBoardType() == DIY_PRO_INDOOR_V4_2) { if (ag->isOne() || ag->isPro4_2()) {
sm.displayHandle(AgStateMachineWiFiManagerConnectFailed); sm.displayHandle(AgStateMachineWiFiManagerConnectFailed);
} }
delay(6000); delay(6000);
@ -247,7 +248,7 @@ void WifiConnector::_wifiProcess() {
if (WiFi.isConnected() == false) { if (WiFi.isConnected() == false) {
/** Display countdown */ /** Display countdown */
uint32_t ms; uint32_t ms;
if (ag->isOne() || (ag->getBoardType() == DIY_PRO_INDOOR_V4_2)) { if (ag->isOne() || (ag->isPro4_2())) {
ms = (uint32_t)(millis() - dispPeriod); ms = (uint32_t)(millis() - dispPeriod);
if (ms >= 1000) { if (ms >= 1000) {
dispPeriod = millis(); dispPeriod = millis();