v5.9.1e - Fixes and Additions

5.9.1e * Add + (plus) and - (minus) to command color to select 1 out of 12 preset colors * Add + (plus) and - (minus) to command ct to control ColdWarm led ColorTemperature (+34/-34) * Tune Arilux RF code * Fix possible iram1_0_seg compile error by shrinking ICACHE_RAM_ATTR code * Update core_esp8266_wiring_digital.c to latest (staged) level * Workaround Sonoff Bridge Learn Mode hang caused by unrecognised RF code (arendst#1181) * Fix blank console log window by using XML character encoding (arendst#1187)
curzon01 · Nov 17, 2017 · eacc718 · eacc718
1 parent 3eafc65
commit eacc718
Show file tree

Hide file tree

Showing 12 changed files with 214 additions and 162 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 ## Sonoff-Tasmota
 Provide ESP8266 based Sonoff by [iTead Studio](https://www.itead.cc/) and ElectroDragon IoT Relay with Serial, Web and MQTT control allowing 'Over the Air' or OTA firmware updates using Arduino IDE.
 
-Current version is **5.9.1d** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information.
+Current version is **5.9.1e** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information.
 
 ### ATTENTION All versions
 

diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino
@@ -1,5 +1,14 @@
-/* 5.9.1d
- * Add support for Arilux LC11 (CLearing RF home code when selecting no Arilux module)
+/* 5.9.1e
+ * Add + (plus) and - (minus) to command color to select 1 out of 12 preset colors
+ * Add + (plus) and - (minus) to command ct to control ColdWarm led ColorTemperature (+34/-34)
+ * Tune Arilux RF code
+ * Fix possible iram1_0_seg compile error by shrinking ICACHE_RAM_ATTR code
+ * Update core_esp8266_wiring_digital.c to latest (staged) level
+ * Workaround Sonoff Bridge Learn Mode hang caused by unrecognised RF code (#1181)
+ * Fix blank console log window by using XML character encoding (#1187)
+ *
+ * 5.9.1d
+ * Add support for Arilux LC11 (Clearing RF home code when selecting no Arilux module)
  * Add fixed color options 1..12 to command Color
  * Add + (plus) and - (minus) to commands Dimmer (+10/-10), Speed and Scheme
  *

diff --git a/sonoff/language/de-DE.h b/sonoff/language/de-DE.h
@@ -384,7 +384,7 @@
  #define D_DOMOTICZ_CURRENT "Current"
 #define D_DOMOTICZ_UPDATE_TIMER "Update timer"
 
-// xdrv_ir-send.ino
+// xdrv_irremote.ino
 #define D_INVALID_JSON "ungültiger JSON"
 #define D_PROTOCOL_NOT_SUPPORTED "Protokoll nicht unterstützt"
 #define D_IR_PROTOCOL "PROTOKOLL"
@@ -427,18 +427,7 @@
 #define D_HUE_POST_ARGS "Hue POST args"
 #define D_3_RESPONSE_PACKETS_SENT "3 Antwortpakete gesendet"
 
-// xsns_dht.ino
-#define D_TIMEOUT_WAITING_FOR "Timeout wartet auf"
-#define D_START_SIGNAL_LOW "Startausschlag niedrig"
-#define D_START_SIGNAL_HIGH "Startausschlag hoch"
-#define D_PULSE "pulse"
-#define D_CHECKSUM_FAILURE "Checksum-Fehler"
-
-// xsns_ds18b20.ino
-#define D_SENSOR_BUSY "Sensor beschäftigt"
-#define D_SENSOR_CRC_ERROR "Sensor CRC-Fehler"
-
-// xsns_hlw8012.ino
+// xsns_03_hlw8012.ino
 #define D_MAXPOWERREACHED "MaxPowerReached"
 #define D_MAXPOWERREACHEDRETRY "MaxPowerReachedRetry"
 #define D_POWERMONITOR "PowerMonitor"
@@ -448,7 +437,18 @@
 #define D_ENERGY_YESTERDAY "Energie gestern"
 #define D_ENERGY_TOTAL "Energie insgesamt"
 
-// xsns_sht1x.ino
+// xsns_05_ds18b20.ino
+#define D_SENSOR_BUSY "Sensor beschäftigt"
+#define D_SENSOR_CRC_ERROR "Sensor CRC-Fehler"
+
+// xsns_06_dht.ino
+#define D_TIMEOUT_WAITING_FOR "Timeout wartet auf"
+#define D_START_SIGNAL_LOW "Startausschlag niedrig"
+#define D_START_SIGNAL_HIGH "Startausschlag hoch"
+#define D_PULSE "pulse"
+#define D_CHECKSUM_FAILURE "Checksum-Fehler"
+
+// xsns_07_sht1x.ino
 #define D_SENSOR_DID_NOT_ACK_COMMAND "Sensor hat ACK-Befehl nicht ausgeführt"
 #define D_SHT1X_FOUND "SHT1X gefunden"
 
@@ -643,19 +643,11 @@
 #define D_CMND_SENSORIDX "SensorIdx"
 #define D_CMND_UPDATETIMER "UpdateTimer"
 
-// Commands xdrv_ir_send.ino
+// Commands xdrv_irremote.ino
 #define D_CMND_IRSEND "IRSend"
 #define D_CMND_IRHVAC "IRHVAC"
 
-// Commands xdrv_snfbridge.ino
-#define D_CMND_RFCODE "RfCode"
-#define D_CMND_RFHIGH "RfHigh"
-#define D_CMND_RFHOST "RfHost"
-#define D_CMND_RFKEY "RfKey"
-#define D_CMND_RFLOW "RfLow"
-#define D_CMND_RFSYNC "RfSync"
-
-// Commands xdrv_snfled.ino
+// Commands xdrv_light.ino
 #define D_CMND_COLOR "Color"
 #define D_CMND_COLORTEMPERATURE "CT"
 #define D_CMND_DIMMER "Dimmer"
@@ -669,7 +661,15 @@
 #define D_CMND_WAKEUPDURATION "WakeUpDuration"
 #define D_CMND_WIDTH "Width"
 
-// Commands xsns_hlw8012.ino
+// Commands xdrv_snfbridge.ino
+#define D_CMND_RFCODE "RfCode"
+#define D_CMND_RFHIGH "RfHigh"
+#define D_CMND_RFHOST "RfHost"
+#define D_CMND_RFKEY "RfKey"
+#define D_CMND_RFLOW "RfLow"
+#define D_CMND_RFSYNC "RfSync"
+
+// Commands xsns_03_hlw8012.ino
 #define D_CMND_POWERLOW "PowerLow"
 #define D_CMND_POWERHIGH "PowerHigh"
 #define D_CMND_VOLTAGELOW "VoltageLow"

diff --git a/sonoff/language/en-GB.h b/sonoff/language/en-GB.h
@@ -384,7 +384,7 @@
  #define D_DOMOTICZ_CURRENT "Current"
 #define D_DOMOTICZ_UPDATE_TIMER "Update timer"
 
-// xdrv_ir-send.ino
+// xdrv_irremote.ino
 #define D_INVALID_JSON "Invalid JSON"
 #define D_PROTOCOL_NOT_SUPPORTED "Protocol not supported"
 #define D_IR_PROTOCOL "PROTOCOL"
@@ -427,18 +427,7 @@
 #define D_HUE_POST_ARGS "Hue POST args"
 #define D_3_RESPONSE_PACKETS_SENT "3 response packets sent"
 
-// xsns_dht.ino
-#define D_TIMEOUT_WAITING_FOR "Timeout waiting for"
-#define D_START_SIGNAL_LOW "start signal low"
-#define D_START_SIGNAL_HIGH "start signal high"
-#define D_PULSE "pulse"
-#define D_CHECKSUM_FAILURE "Checksum failure"
-
-// xsns_ds18b20.ino
-#define D_SENSOR_BUSY "Sensor busy"
-#define D_SENSOR_CRC_ERROR "Sensor CRC error"
-
-// xsns_hlw8012.ino
+// xsns_03_hlw8012.ino
 #define D_MAXPOWERREACHED "MaxPowerReached"
 #define D_MAXPOWERREACHEDRETRY "MaxPowerReachedRetry"
 #define D_POWERMONITOR "PowerMonitor"
@@ -448,7 +437,18 @@
 #define D_ENERGY_YESTERDAY "Energy Yesterday"
 #define D_ENERGY_TOTAL "Energy Total"
 
-// xsns_sht1x.ino
+// xsns_05_ds18b20.ino
+#define D_SENSOR_BUSY "Sensor busy"
+#define D_SENSOR_CRC_ERROR "Sensor CRC error"
+
+// xsns_06_dht.ino
+#define D_TIMEOUT_WAITING_FOR "Timeout waiting for"
+#define D_START_SIGNAL_LOW "start signal low"
+#define D_START_SIGNAL_HIGH "start signal high"
+#define D_PULSE "pulse"
+#define D_CHECKSUM_FAILURE "Checksum failure"
+
+// xsns_07_sht1x.ino
 #define D_SENSOR_DID_NOT_ACK_COMMAND "Sensor did not ACK command"
 #define D_SHT1X_FOUND "SHT1X found"
 
@@ -643,19 +643,11 @@
 #define D_CMND_SENSORIDX "SensorIdx"
 #define D_CMND_UPDATETIMER "UpdateTimer"
 
-// Commands xdrv_ir_send.ino
+// Commands xdrv_irremote.ino
 #define D_CMND_IRSEND "IRSend"
 #define D_CMND_IRHVAC "IRHVAC"
 
-// Commands xdrv_snfbridge.ino
-#define D_CMND_RFCODE "RfCode"
-#define D_CMND_RFHIGH "RfHigh"
-#define D_CMND_RFHOST "RfHost"
-#define D_CMND_RFKEY "RfKey"
-#define D_CMND_RFLOW "RfLow"
-#define D_CMND_RFSYNC "RfSync"
-
-// Commands xdrv_snfled.ino
+// Commands xdrv_light.ino
 #define D_CMND_COLOR "Color"
 #define D_CMND_COLORTEMPERATURE "CT"
 #define D_CMND_DIMMER "Dimmer"
@@ -669,7 +661,15 @@
 #define D_CMND_WAKEUPDURATION "WakeUpDuration"
 #define D_CMND_WIDTH "Width"
 
-// Commands xsns_hlw8012.ino
+// Commands xdrv_snfbridge.ino
+#define D_CMND_RFCODE "RfCode"
+#define D_CMND_RFHIGH "RfHigh"
+#define D_CMND_RFHOST "RfHost"
+#define D_CMND_RFKEY "RfKey"
+#define D_CMND_RFLOW "RfLow"
+#define D_CMND_RFSYNC "RfSync"
+
+// Commands xsns_03_hlw8012.ino
 #define D_CMND_POWERLOW "PowerLow"
 #define D_CMND_POWERHIGH "PowerHigh"
 #define D_CMND_VOLTAGELOW "VoltageLow"

diff --git a/sonoff/language/nl-NL.h b/sonoff/language/nl-NL.h
@@ -384,7 +384,7 @@
  #define D_DOMOTICZ_CURRENT "Stroom"
 #define D_DOMOTICZ_UPDATE_TIMER "Bijwerk timer"
 
-// xdrv_ir-send.ino
+// xdrv_irremote.ino
 #define D_INVALID_JSON "Ongeldig JSON"
 #define D_PROTOCOL_NOT_SUPPORTED "Protocol wordt niet ondersteund"
 #define D_IR_PROTOCOL "PROTOCOL"
@@ -427,18 +427,7 @@
 #define D_HUE_POST_ARGS "Hue POST argumenten"
 #define D_3_RESPONSE_PACKETS_SENT "3 antwoord paketten verstuurd"
 
-// xsns_dht.ino
-#define D_TIMEOUT_WAITING_FOR "Te lang wachten op"
-#define D_START_SIGNAL_LOW "laag start signaal"
-#define D_START_SIGNAL_HIGH "hoog start signaal"
-#define D_PULSE "signaal"
-#define D_CHECKSUM_FAILURE "Controle mislukt"
-
-// xsns_ds18b20.ino
-#define D_SENSOR_BUSY "Sensor bezet"
-#define D_SENSOR_CRC_ERROR "Sensor CRC fout"
-
-// xsns_hlw8012.ino
+// xsns_03_hlw8012.ino
 #define D_MAXPOWERREACHED "MaxPowerReached"
 #define D_MAXPOWERREACHEDRETRY "MaxPowerReachedRetry"
 #define D_POWERMONITOR "PowerMonitor"
@@ -448,7 +437,18 @@
 #define D_ENERGY_YESTERDAY "Verbruik gisteren"
 #define D_ENERGY_TOTAL "Verbruik totaal"
 
-// xsns_sht1x.ino
+// xsns_05_ds18b20.ino
+#define D_SENSOR_BUSY "Sensor bezet"
+#define D_SENSOR_CRC_ERROR "Sensor CRC fout"
+
+// xsns_06_dht.ino
+#define D_TIMEOUT_WAITING_FOR "Te lang wachten op"
+#define D_START_SIGNAL_LOW "laag start signaal"
+#define D_START_SIGNAL_HIGH "hoog start signaal"
+#define D_PULSE "signaal"
+#define D_CHECKSUM_FAILURE "Controle mislukt"
+
+// xsns_07_sht1x.ino
 #define D_SENSOR_DID_NOT_ACK_COMMAND "Geen opdracht ACK van sensor"
 #define D_SHT1X_FOUND "SHT1X gevonden"
 
@@ -643,19 +643,11 @@
 #define D_CMND_SENSORIDX "SensorIdx"
 #define D_CMND_UPDATETIMER "UpdateTimer"
 
-// Commands xdrv_ir_send.ino
+// Commands xdrv_irremote.ino
 #define D_CMND_IRSEND "IRSend"
 #define D_CMND_IRHVAC "IRHVAC"
 
-// Commands xdrv_snfbridge.ino
-#define D_CMND_RFCODE "RfCode"
-#define D_CMND_RFHIGH "RfHigh"
-#define D_CMND_RFHOST "RfHost"
-#define D_CMND_RFKEY "RfKey"
-#define D_CMND_RFLOW "RfLow"
-#define D_CMND_RFSYNC "RfSync"
-
-// Commands xdrv_snfled.ino
+// Commands xdrv_light.ino
 #define D_CMND_COLOR "Color"
 #define D_CMND_COLORTEMPERATURE "CT"
 #define D_CMND_DIMMER "Dimmer"
@@ -669,7 +661,15 @@
 #define D_CMND_WAKEUPDURATION "WakeUpDuration"
 #define D_CMND_WIDTH "Width"
 
-// Commands xsns_hlw8012.ino
+// Commands xdrv_snfbridge.ino
+#define D_CMND_RFCODE "RfCode"
+#define D_CMND_RFHIGH "RfHigh"
+#define D_CMND_RFHOST "RfHost"
+#define D_CMND_RFKEY "RfKey"
+#define D_CMND_RFLOW "RfLow"
+#define D_CMND_RFSYNC "RfSync"
+
+// Commands xsns_03_hlw8012.ino
 #define D_CMND_POWERLOW "PowerLow"
 #define D_CMND_POWERHIGH "PowerHigh"
 #define D_CMND_VOLTAGELOW "VoltageLow"

diff --git a/sonoff/language/pl-PL.h b/sonoff/language/pl-PL.h
@@ -384,7 +384,7 @@
  #define D_DOMOTICZ_CURRENT "Prad"
 #define D_DOMOTICZ_UPDATE_TIMER "Zaktualizuj czasomierz"
 
-// xdrv_ir-send.ino
+// xdrv_irremote.ino
 #define D_INVALID_JSON "Invalid JSON"
 #define D_PROTOCOL_NOT_SUPPORTED "Protokol nie jest obslugiwany"
 #define D_IR_PROTOCOL "PROTOCOL"
@@ -427,18 +427,7 @@
 #define D_HUE_POST_ARGS "Hue POST args"
 #define D_3_RESPONSE_PACKETS_SENT "3 pakiety odpowiedzi wysylane"
 
-// xsns_dht.ino
-#define D_TIMEOUT_WAITING_FOR "Trwa oczekiwanie"
-#define D_START_SIGNAL_LOW "sygnał startowy niski"
-#define D_START_SIGNAL_HIGH "sygnał startowy wysoki"
-#define D_PULSE "pulse"
-#define D_CHECKSUM_FAILURE "Bledna suma kontrolmna"
-
-// xsns_ds18b20.ino
-#define D_SENSOR_BUSY "Czujnik DS18x20 zajety"
-#define D_SENSOR_CRC_ERROR "Czujnik DS18x20 blad CRC"
-
-// xsns_hlw8012.ino
+// xsns_03_hlw8012.ino
 #define D_MAXPOWERREACHED "MaksMocOsiagnieta"
 #define D_MAXPOWERREACHEDRETRY "MaksMocOsiagnietaPonowienie"
 #define D_POWERMONITOR "MonitorMocy"
@@ -448,7 +437,18 @@
 #define D_ENERGY_YESTERDAY "Energia Wczoraj"
 #define D_ENERGY_TOTAL "Energia suma"
 
-// xsns_sht1x.ino
+// xsns_05_ds18b20.ino
+#define D_SENSOR_BUSY "Czujnik DS18x20 zajety"
+#define D_SENSOR_CRC_ERROR "Czujnik DS18x20 blad CRC"
+
+// xsns_06_dht.ino
+#define D_TIMEOUT_WAITING_FOR "Trwa oczekiwanie"
+#define D_START_SIGNAL_LOW "sygnał startowy niski"
+#define D_START_SIGNAL_HIGH "sygnał startowy wysoki"
+#define D_PULSE "pulse"
+#define D_CHECKSUM_FAILURE "Bledna suma kontrolmna"
+
+// xsns_07_sht1x.ino
 #define D_SENSOR_DID_NOT_ACK_COMMAND "Czujnik nie otrzymal komendy ACK"
 #define D_SHT1X_FOUND "SHT1X znaleziony"
 
@@ -643,19 +643,11 @@
 #define D_CMND_SENSORIDX "SensorIdx"
 #define D_CMND_UPDATETIMER "UpdateTimer"
 
-// Commands xdrv_ir_send.ino
+// Commands xdrv_irremote.ino
 #define D_CMND_IRSEND "IRSend"
 #define D_CMND_IRHVAC "IRHVAC"
 
-// Commands xdrv_snfbridge.ino
-#define D_CMND_RFCODE "RfCode"
-#define D_CMND_RFHIGH "RfHigh"
-#define D_CMND_RFHOST "RfHost"
-#define D_CMND_RFKEY "RfKey"
-#define D_CMND_RFLOW "RfLow"
-#define D_CMND_RFSYNC "RfSync"
-
-// Commands xdrv_snfled.ino
+// Commands xdrv_light.ino
 #define D_CMND_COLOR "Color"
 #define D_CMND_COLORTEMPERATURE "CT"
 #define D_CMND_DIMMER "Dimmer"
@@ -669,7 +661,15 @@
 #define D_CMND_WAKEUPDURATION "WakeUpDuration"
 #define D_CMND_WIDTH "Width"
 
-// Commands xsns_hlw8012.ino
+// Commands xdrv_snfbridge.ino
+#define D_CMND_RFCODE "RfCode"
+#define D_CMND_RFHIGH "RfHigh"
+#define D_CMND_RFHOST "RfHost"
+#define D_CMND_RFKEY "RfKey"
+#define D_CMND_RFLOW "RfLow"
+#define D_CMND_RFSYNC "RfSync"
+
+// Commands xsns_03_hlw8012.ino
 #define D_CMND_POWERLOW "PowerLow"
 #define D_CMND_POWERHIGH "PowerHigh"
 #define D_CMND_VOLTAGELOW "VoltageLow"

diff --git a/sonoff/sonoff.h b/sonoff/sonoff.h
@@ -92,6 +92,12 @@ typedef unsigned long power_t; // Power (Relay) type
 
 #define XSNS_MAX 20 // Max number of allowed Xsns External Sensors (Update xsns_interface.ino if changed)
 
+/*
+// Removed from esp8266 core since 20171105
+#define min(a,b) ((a)<(b)?(a):(b))
+#define max(a,b) ((a)>(b)?(a):(b))
+*/
+
 /*********************************************************************************************\
  * Enumeration
 \*********************************************************************************************/

diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino
@@ -25,7 +25,7 @@
  - Select IDE Tools - Flash Size: "1M (no SPIFFS)"
  ====================================================*/
 
-#define VERSION 0x05090104 // 5.9.1d
+#define VERSION 0x05090105 // 5.9.1e
 
 // Location specific includes
 #include "sonoff.h" // Enumaration used in user_config.h