Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tuya: properly indicate wifi-status #4221

Merged
merged 7 commits into from Oct 31, 2018
Merged

tuya: properly indicate wifi-status #4221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
166f6ce
tuya: proper indication of wifi-state
chaosmaster Oct 29, 2018
d891490
Merge branch 'development' of https://github.com/arendst/Sonoff-Tasmo…
chaosmaster Oct 29, 2018
ccd10e1
tuya: wifi-state: add default state
chaosmaster Oct 29, 2018
4a03b1c
tuya: wifi-state switch debug-arguments
chaosmaster Oct 30, 2018
8f3f1f3
tuya: implement seperate WifiState() so we actually know, when we're …
chaosmaster Oct 30, 2018
faab6f1
tuya: modify WifiState() in support.ino to reflect not-connected-stat…
chaosmaster Oct 30, 2018
9125823
tuya: remove default from switch, since wifi_state is already initial…
chaosmaster Oct 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions sonoff/sonoff.ino
View file
Open in desktop
Expand Up @@ -1110,7 +1110,7 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len)
wifi_state_flag = Settings.sta_config;
snprintf_P(stemp1, sizeof(stemp1), kWifiConfig[Settings.sta_config]);
snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_CMND_WIFICONFIG "\":\"%s " D_JSON_SELECTED "\"}"), stemp1);
if (WifiState() != WIFI_RESTART) {
if (WifiState() > WIFI_RESTART) {
// snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s after restart"), mqtt_data);
restart_flag = 2;
}
Expand Down Expand Up @@ -1795,7 +1795,7 @@ void ButtonHandler()
// Success
} else {
if (multipress[button_index] < 3) { // Single or Double press
if (WifiState()) { // WPSconfig, Smartconfig or Wifimanager active
if (WifiState() > WIFI_RESTART) { // WPSconfig, Smartconfig or Wifimanager active
restart_flag = 1;
} else {
ExecuteCommandPower(button_index + multipress[button_index], POWER_TOGGLE, SRC_BUTTON); // Execute Toggle command internally
Expand Down
2 changes: 1 addition & 1 deletion sonoff/support.ino
View file
Open in desktop
Expand Up @@ -1613,7 +1613,7 @@ void WifiCheck(uint8_t param)

int WifiState()
{
int state;
int state = -1;

if ((WL_CONNECTED == WiFi.status()) && (static_cast<uint32_t>(WiFi.localIP()) != 0)) {
state = WIFI_RESTART;
Expand Down
34 changes: 24 additions & 10 deletions sonoff/xdrv_16_tuyadimmer.ino
View file
Open in desktop
Expand Up @@ -33,7 +33,7 @@ boolean tuya_ignore_dim = false; // Flag to skip serial send to preve
uint8_t tuya_cmd_status = 0; // Current status of serial-read
uint8_t tuya_cmd_checksum = 0; // Checksum of tuya command
uint8_t tuya_data_len = 0; // Data lenght of command
bool tuya_wifi_state = false;
int8_t tuya_wifi_state = -2;

char tuya_buffer[TUYA_BUFFER_SIZE]; // Serial receive buffer
int tuya_byte_counter = 0; // Index in serial receive buffer
Expand Down Expand Up @@ -148,10 +148,10 @@ void TuyaPacketProcess()
AddLog_P(LOG_LEVEL_DEBUG, PSTR("TYA: WiFi Reset Rcvd"));
TuyaResetWifi();
}
else if (tuya_byte_counter == 7 && tuya_buffer[3] == 3 && tuya_buffer[6] == 2) { // WiFi LED has been sucessfully reset.
else if (tuya_byte_counter == 7 && tuya_buffer[3] == 3 && tuya_buffer[6] == 2) { // WiFi LED has been sucessfully set.

AddLog_P(LOG_LEVEL_DEBUG, PSTR("TYA: WiFi LED reset ACK"));
tuya_wifi_state = true;
AddLog_P(LOG_LEVEL_DEBUG, PSTR("TYA: WiFi LED set ACK"));
tuya_wifi_state = WifiState();
}
}

Expand Down Expand Up @@ -225,8 +225,22 @@ boolean TuyaModuleSelected()
return true;
}

void TuyaResetWifiLed(){
snprintf_P(log_data, sizeof(log_data), "TYA: Reset WiFi LED");
void TuyaSetWifiLed(){
uint8_t wifi_state = 0x02;
switch(WifiState()){
case WIFI_SMARTCONFIG:
wifi_state = 0x00;
break;
case WIFI_MANAGER:
case WIFI_WPSCONFIG:
wifi_state = 0x01;
break;
case WIFI_RESTART:
wifi_state = 0x03;
break;
}

snprintf_P(log_data, sizeof(log_data), "TYA: Set WiFi LED to state %d (%d)", wifi_state, WifiState());
AddLog(LOG_LEVEL_DEBUG);

TuyaSerial->write((uint8_t)0x55); // header 55AA
Expand All @@ -235,8 +249,8 @@ void TuyaResetWifiLed(){
TuyaSerial->write((uint8_t)0x03); // command 03 - set wifi state
TuyaSerial->write((uint8_t)0x00);
TuyaSerial->write((uint8_t)0x01); // following data length 0x01
TuyaSerial->write((uint8_t)0x03); // wifi state 4 (configured and connected)
TuyaSerial->write((uint8_t)0x06); // checksum:sum of all bytes in packet mod 256
TuyaSerial->write((uint8_t)wifi_state); // wifi state (0x00 == smartconfig, 0x01 == AP, 0x02 == not connected, 0x03 == connected)
TuyaSerial->write((uint8_t)(0x03 + wifi_state)); // checksum:sum of all bytes in packet mod 256
TuyaSerial->flush();
}

Expand Down Expand Up @@ -268,9 +282,9 @@ void TuyaResetWifi()
{
if (!Settings.flag.button_restrict) {
char scmnd[20];
tuya_wifi_state = -1;
snprintf_P(scmnd, sizeof(scmnd), D_CMND_WIFICONFIG " %d", 2);
ExecuteCommand(scmnd, SRC_BUTTON);
tuya_wifi_state = false;
}
}

Expand Down Expand Up @@ -314,7 +328,7 @@ boolean Xdrv16(byte function)
result = TuyaButtonPressed();
break;
case FUNC_EVERY_SECOND:
if(TuyaSerial && !tuya_wifi_state) { TuyaResetWifiLed(); }
if(TuyaSerial && tuya_wifi_state!=WifiState()) { TuyaSetWifiLed(); }
break;
}
}
Expand Down