Seich
/
HomeSpan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updating hsEventCallback with more events

This commit is contained in:
HomeSpan 2022-10-24 06:46:04 -04:00
parent 5b38c6a04a
commit 4e23c5e357
2 changed files with 42 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/HomeSpan.cpp
View File

@ -341,7 +341,8 @@ void Span::commandMode(){
int mode=1;
boolean done=false;
statusLED->start(500,0.3,mode,1000);
if(hsEventCallback)
hsEventCallback(HS_CONFIG_MODE_EXIT);
unsigned long alarmTime=millis()+comModeLife;
while(!done){
@ -360,6 +361,8 @@ void Span::commandMode(){
if(mode==6)
mode=1;
statusLED->start(500,0.3,mode,1000);
if(hsEventCallback)
hsEventCallback((HS_EVENT)(HS_CONFIG_MODE_EXIT+mode-1));
} else {
done=true;
}
@ -373,13 +376,28 @@ void Span::commandMode(){
case 1:
Serial.print("*** NO ACTION\n\n");
if(strlen(network.wifiData.ssid)==0)
if(strlen(network.wifiData.ssid)==0){
statusLED->start(LED_WIFI_NEEDED);
if(hsEventCallback)
hsEventCallback(HS_WIFI_NEEDED);
}
else
if(!HAPClient::nAdminControllers())
if(WiFi.status()!=WL_CONNECTED){
statusLED->start(LED_WIFI_CONNECTING);
if(hsEventCallback)
hsEventCallback(HS_WIFI_CONNECTING);
}
else
if(!HAPClient::nAdminControllers()){
statusLED->start(LED_PAIRING_NEEDED);
else
if(hsEventCallback)
hsEventCallback(HS_PAIRING_NEEDED);
}
else{
statusLED->on();
if(hsEventCallback)
hsEventCallback(HS_PAIRED);
}
break;
case 2:
@ -411,11 +429,13 @@ void Span::checkConnect(){
if(WiFi.status()==WL_CONNECTED)
return;
addWebLog(true,"*** WiFi Connection Lost!"); // losing and re-establishing connection has not been tested
addWebLog(true,"*** WiFi Connection Lost!");
connected++;
waitTime=60000;
alarmConnect=0;
statusLED->start(LED_WIFI_CONNECTING);
if(hsEventCallback)
hsEventCallback(HS_WIFI_CONNECTING);
}
if(WiFi.status()!=WL_CONNECTED){
@ -442,10 +462,16 @@ void Span::checkConnect(){
return;
}
if(!HAPClient::nAdminControllers())
if(!HAPClient::nAdminControllers()){
statusLED->start(LED_PAIRING_NEEDED);
else
if(hsEventCallback)
hsEventCallback(HS_PAIRING_NEEDED);
}
else{
statusLED->on();
if(hsEventCallback)
hsEventCallback(HS_PAIRED);
}
connected++;

9
src/HomeSpan.h
View File

@ -69,7 +69,14 @@ enum {
enum HS_EVENT {
HS_WIFI_NEEDED,
HS_WIFI_CONNECTING
HS_WIFI_CONNECTING,
HS_PAIRING_NEEDED,
HS_PAIRED,
HS_CONFIG_MODE_EXIT,
HS_CONFIG_MODE_REBOOT,
HS_CONFIG_MODE_LAUNCH_AP,
HS_CONFIG_MODE_UNPAIR,
HS_CONFIG_MODE_ERASE_WIFI
};
///////////////////////////////