diff --git a/README.md b/README.md index d1d7b226c..ea17031d1 100644 --- a/README.md +++ b/README.md @@ -158,9 +158,9 @@ Different firmware images are released based on Features and Sensors selection g | ESP/Arduino library version | sonoff | classic | minimal | knx | allsensors | |-----------------------------|--------|---------|---------|------|------------| -| ESP/Arduino lib v2.3.0 | 538k | 490k | 400k | 548k | 562k | -| ESP/Arduino lib v2.4.0 | 543k | 498k | 407k | 553k | 565k | -| ESP/Arduino lib v2.4.1 | 544k | 500k | 409k | 555k | 567k | +| ESP/Arduino lib v2.3.0 | 538k | 490k | 407k | 548k | 562k | +| ESP/Arduino lib v2.4.0 | 543k | 498k | 414k | 553k | 565k | +| ESP/Arduino lib v2.4.1 | 544k | 500k | 416k | 555k | 567k | See [Tasmota ESP/Arduino library version related issues](https://github.com/arendst/Sonoff-Tasmota/wiki/Theo's-Tasmota-Tips#20180523---relation-tasmota-and-esp8266arduino-core-version) for more information. diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 64754a84c..4973965f2 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,4 +1,8 @@ -/* 6.1.0 20180706 +/* 6.1.1 20180714 + * Revert wifi changes (#3177) + * Revert sonoff-minimal removals causing failure of wifi connection (#3177) + * + * 6.1.0 20180706 * Remove version 3, 4 and pre 5.2 settings auto-upgrade. See https://github.com/arendst/Sonoff-Tasmota/wiki/Upgrade#migration-path * Change default CFG_HOLDER from 0x20161209 to 4617 (=0x1209) - no impact on default upgrades * Change number of supported switches from 4 to 8 (#2885, #3086) diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino index 1301b97fd..bcd1a08e6 100644 --- a/sonoff/sonoff.ino +++ b/sonoff/sonoff.ino @@ -25,7 +25,7 @@ - Select IDE Tools - Flash Size: "1M (no SPIFFS)" ====================================================*/ -#define VERSION 0x06010000 // 6.1.0 +#define VERSION 0x06010100 // 6.1.1 // Location specific includes #include // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_3_0) @@ -75,12 +75,6 @@ // Structs #include "settings.h" -#ifdef BE_MINIMAL -enum TasmotaCommands { - CMND_POWER, CMND_FANSPEED, CMND_STATUS, CMND_STATE, CMND_SLEEP, CMND_UPGRADE, CMND_UPLOAD, CMND_OTAURL, CMND_SERIALLOG, CMND_RESTART }; -const char kTasmotaCommands[] PROGMEM = - D_CMND_POWER "|" D_CMND_FANSPEED "|" D_CMND_STATUS "|" D_CMND_STATE "|" D_CMND_SLEEP "|" D_CMND_UPGRADE "|" D_CMND_UPLOAD "|" D_CMND_OTAURL "|" D_CMND_SERIALLOG "|" D_CMND_RESTART; -#else enum TasmotaCommands { CMND_BACKLOG, CMND_DELAY, CMND_POWER, CMND_FANSPEED, CMND_STATUS, CMND_STATE, CMND_POWERONSTATE, CMND_PULSETIME, CMND_BLINKTIME, CMND_BLINKCOUNT, CMND_SENSOR, CMND_SAVEDATA, CMND_SETOPTION, CMND_TEMPERATURE_RESOLUTION, CMND_HUMIDITY_RESOLUTION, @@ -101,7 +95,6 @@ const char kTasmotaCommands[] PROGMEM = D_CMND_WIFICONFIG "|" D_CMND_FRIENDLYNAME "|" D_CMND_SWITCHMODE "|" D_CMND_TELEPERIOD "|" D_CMND_RESTART "|" D_CMND_RESET "|" D_CMND_TIMEZONE "|" D_CMND_TIMESTD "|" D_CMND_TIMEDST "|" D_CMND_ALTITUDE "|" D_CMND_LEDPOWER "|" D_CMND_LEDSTATE "|" D_CMND_I2CSCAN "|" D_CMND_SERIALSEND "|" D_CMND_BAUDRATE "|" D_CMND_SERIALDELIMITER; -#endif const uint8_t kIFan02Speed[4][3] = {{6,6,6}, {7,6,6}, {7,7,6}, {7,6,7}}; @@ -487,7 +480,6 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) type = NULL; // Unknown command } } -#ifndef BE_MINIMAL else if (CMND_BACKLOG == command_code) { if (data_len) { uint8_t bl_pointer = (!backlog_pointer) ? MAX_BACKLOG -1 : backlog_pointer; @@ -521,7 +513,6 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) if ((payload >= MIN_BACKLOG_DELAY) && (payload <= 3600)) backlog_delay = payload; snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_NVALUE, command, backlog_delay); } -#endif // Not BE_MINIMAL else if ((CMND_POWER == command_code) && (index > 0) && (index <= devices_present)) { if ((payload < 0) || (payload > 4)) payload = 9; // Settings.flag.device_index_enable = user_append_index; @@ -596,7 +587,6 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_COMMAND_SVALUE, command, D_JSON_ONE_TO_RESTART); } } -#ifndef BE_MINIMAL else if ((CMND_POWERONSTATE == command_code) && (Settings.module != MOTOR)) { /* 0 = Keep relays off after power on * 1 = Turn relays on after power on, if PulseTime set wait for PulseTime seconds, and turn relays off @@ -1157,7 +1147,6 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len) I2cScan(mqtt_data, sizeof(mqtt_data)); } #endif // USE_I2C -#endif // Not BE_MINIMAL else type = NULL; // Unknown command } if (type == NULL) { diff --git a/sonoff/support.ino b/sonoff/support.ino index 54ec20b73..ba91ab28d 100644 --- a/sonoff/support.ino +++ b/sonoff/support.ino @@ -1159,7 +1159,7 @@ void WifiCheck(uint8_t param) if (WIFI_SMARTCONFIG == wifi_config_type) { WiFi.stopSmartConfig(); } - SettingsSdkErase(); +// SettingsSdkErase(); // Disabled v6.1.0b due to possible bad wifi connects restart_flag = 2; } } else { @@ -1240,6 +1240,8 @@ void WifiConnect() wifi_counter = 1; } +/* +// Enable from 6.0.0a until 6.1.0a - disabled due to possible cause of bad wifi connect on core 2.3.0 void WifiDisconnect() { // Courtesy of EspEasy @@ -1252,10 +1254,17 @@ void WifiDisconnect() void EspRestart() { - delay(100); // Allow time for message xfer + // This results in exception 3 on restarts + delay(100); // Allow time for message xfer - disabled v6.1.0b WifiDisconnect(); ESP.restart(); } +*/ + +void EspRestart() +{ + ESP.restart(); +} #ifdef USE_DISCOVERY /*********************************************************************************************\