mirror of https://github.com/arendst/Tasmota.git
Theo Arends
parent
e876b5aa77
commit
f75ab4f25f
|
|
@ -15,7 +15,7 @@ If you like **Sonoff-Tasmota**, give it a star, or fork it and contribute!
|
|||
### Development
|
||||
[](https://travis-ci.org/arendst/Sonoff-Tasmota)
|
||||
|
||||
Current version is **6.1.0b** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information.
|
||||
Current version is **6.1.1a** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information.
|
||||
|
||||
### Disclaimer
|
||||
:warning: **DANGER OF ELECTROCUTION** :warning:
|
||||
|
|
@ -157,9 +157,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 | 399k | 548k | 562k |
|
||||
| ESP/Arduino lib v2.4.0 | 543k | 498k | 406k | 553k | 565k |
|
||||
| ESP/Arduino lib v2.4.1 | 544k | 500k | 408k | 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.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
/* 6.1.0b
|
||||
/* 6.1.1a
|
||||
* Add user selection of WPS as define USE_WPS in user_config.h in preparation for core v2.4.2 (#3221)
|
||||
* Change default Wifi config option from WPS to Wifi Manager if WPS is disabled (or Wifi Smartconfig if webserver is disabled)
|
||||
* Remove WPS from sonoff-minimal saving 33k code space
|
||||
* Revert wifi changes implemented in v6.0.0a due to possible bad initial wifi connections
|
||||
* Revert sonoff-minimal removals causing failure of wifi connection (#3177)
|
||||
*
|
||||
* 6.1.0a
|
||||
* Fix TM1638 compile error (#3212)
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
- Select IDE Tools - Flash Size: "1M (no SPIFFS)"
|
||||
====================================================*/
|
||||
|
||||
#define VERSION 0x06010002 // 6.1.0b
|
||||
#define VERSION 0x06010101 // 6.1.1a
|
||||
|
||||
// Location specific includes
|
||||
#include <core_version.h> // 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}};
|
||||
|
||||
|
|
@ -489,7 +482,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;
|
||||
|
|
@ -523,7 +515,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;
|
||||
|
|
@ -598,7 +589,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
|
||||
|
|
@ -1159,7 +1149,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) {
|
||||
|
|
|
|||
|
|
@ -989,7 +989,7 @@ void WifiConfig(uint8_t type)
|
|||
if (WIFI_MANAGER == wifi_config_type) {
|
||||
wifi_config_type = WIFI_SMARTCONFIG;
|
||||
}
|
||||
#endif // USE_WPS
|
||||
#endif // USE_WEBSERVER
|
||||
wifi_config_counter = WIFI_CONFIG_SEC; // Allow up to WIFI_CONFIG_SECS seconds for phone to provide ssid/pswd
|
||||
wifi_counter = wifi_config_counter +5;
|
||||
blinks = 1999;
|
||||
|
|
|
|||
Loading…
Reference in New Issue