Merge pull request #6 from arendst/development

update my repo

sonoff/_changelog.ino

@@ -1,8 +1,9 @@
-/* 6.2.1.11 20191002
+/* 6.2.1.11 20181002
  * Remove support for MQTT Client based on esp-mqtt-arduino by #define MQTT_LIBRARY_TYPE MQTT_ESPMQTTARDUINO
  * Add support for MQTT Client based on lwmqtt to be selected by #define MQTT_LIBRARY_TYPE MQTT_ARDUINOMQTT
  * Change MQTT_ARDUINOMQTT command timeout from 1 to 10 seconds
  * Add Hebrew language file (#3960)
+ * Fix exception when wrong Domoticz JSON message is received (#3963)
  *
  * 6.2.1.10 20180930
  * Add command RGBWWTable to support color calibration (#3933)

sonoff/language/bg-BG.h

@@ -174,6 +174,7 @@
 #define D_UV_POWER "UV мощност"
 #define D_VERSION "Версия"
 #define D_VOLTAGE "Напрежение"
+#define D_WEIGHT "Weight"
 #define D_WARMLIGHT "Топла"
 #define D_WEB_SERVER "Уеб сървър"
 
@@ -496,12 +497,15 @@
 #define D_SENSOR_TM1638_CLK "TM16 CLK"
 #define D_SENSOR_TM1638_DIO "TM16 DIO"
 #define D_SENSOR_TM1638_STB "TM16 STB"
+#define D_SENSOR_HX711_SCK "HX711 SCK"
+#define D_SENSOR_HX711_DAT "HX711 DAT"
 
 // Units
 #define D_UNIT_AMPERE "A"
 #define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_HERTZ "Hz"
 #define D_UNIT_HOUR "h"
+#define D_UNIT_KILOGRAM "kg"
 #define D_UNIT_INCREMENTS "inc"
 #define D_UNIT_KILOOHM "kΩ"
 #define D_UNIT_KILOWATTHOUR "kWh"

sonoff/language/cs-CZ.h

@@ -28,7 +28,7 @@
  * Use online command StateText to translate ON, OFF, HOLD and TOGGLE.
  * Use online command Prefix to translate cmnd, stat and tele.
  *
- * Updated until v6.1.1c
+ * Updated until v6.2.1.11
 \*********************************************************************/
 
 //#define LANGUAGE_MODULE_NAME         // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English)
@@ -124,9 +124,9 @@
 #define D_PORT "Port"
 #define D_POWER_FACTOR "Účiník"
 #define D_POWERUSAGE "Příkon"
-#define D_POWERUSAGE_ACTIVE "Active Power"
+#define D_POWERUSAGE_ACTIVE "Činný příkon"
-#define D_POWERUSAGE_APPARENT "Apparent Power"
+#define D_POWERUSAGE_APPARENT "Zdánlivý příkon"
-#define D_POWERUSAGE_REACTIVE "Reactive Power"
+#define D_POWERUSAGE_REACTIVE "Jalový příkon"
 #define D_PRESSURE "Tlak"
 #define D_PRESSUREATSEALEVEL "Tlak na hladině moře"
 #define D_PROGRAM_FLASH_SIZE "Velikost paměti flash"
@@ -163,17 +163,18 @@
 #define D_USER "Uživatel"
 #define D_UTC_TIME "UTC"
 #define D_UV_INDEX "UV Index"
-#define D_UV_INDEX_1 "Low"
+#define D_UV_INDEX_1 "Nízký"
-#define D_UV_INDEX_2 "Mid"
+#define D_UV_INDEX_2 "Střední"
-#define D_UV_INDEX_3 "High"
+#define D_UV_INDEX_3 "Vysoký"
-#define D_UV_INDEX_4 "Danger"
+#define D_UV_INDEX_4 "Nebezpečný"
-#define D_UV_INDEX_5 "BurnL1/2"
+#define D_UV_INDEX_5 "Popál1/2"
-#define D_UV_INDEX_6 "BurnL3"
+#define D_UV_INDEX_6 "Popál3"
-#define D_UV_INDEX_7 "OoR"
+#define D_UV_INDEX_7 "MimoRozsah"
 #define D_UV_LEVEL "úroveň UV"
 #define D_UV_POWER "UV Power"
 #define D_VERSION "Verze"
 #define D_VOLTAGE "Napětí"
+#define D_WEIGHT "Hmotnost"
 #define D_WARMLIGHT "Teplé světlo"
 #define D_WEB_SERVER "Web Server"
 
@@ -332,10 +333,10 @@
 #define D_UPLOAD_ERR_7 "Nahrávání přerušeno"
 #define D_UPLOAD_ERR_8 "Špatný soubor"
 #define D_UPLOAD_ERR_9 "Soubor je příliš velký"
-#define D_UPLOAD_ERR_10 "Failed to init RF chip"
+#define D_UPLOAD_ERR_10 "Chyba inicializace RF chipu"
-#define D_UPLOAD_ERR_11 "Failed to erase RF chip"
+#define D_UPLOAD_ERR_11 "Chyba smazání RF chipu"
-#define D_UPLOAD_ERR_12 "Failed to write to RF chip"
+#define D_UPLOAD_ERR_12 "Chyba při zápisu do RF chipu"
-#define D_UPLOAD_ERR_13 "Failed to decode RF firmware"
+#define D_UPLOAD_ERR_13 "Chyba dekódování RF firmwaru"
 #define D_UPLOAD_ERROR_CODE "Chyba nahrávání"
 
 #define D_ENTER_COMMAND "Vlož příkaz"
@@ -496,12 +497,15 @@
 #define D_SENSOR_TM1638_CLK "TM16 CLK"
 #define D_SENSOR_TM1638_DIO "TM16 DIO"
 #define D_SENSOR_TM1638_STB "TM16 STB"
+#define D_SENSOR_HX711_SCK "HX711 SCK"
+#define D_SENSOR_HX711_DAT "HX711 DAT"
 
 // Units
 #define D_UNIT_AMPERE "A"
 #define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_HERTZ "Hz"
 #define D_UNIT_HOUR "hod"
+#define D_UNIT_KILOGRAM "kg"
 #define D_UNIT_INCREMENTS "inc"
 #define D_UNIT_KILOOHM "kOhm"
 #define D_UNIT_KILOWATTHOUR "kWh"

sonoff/language/de-DE.h

@@ -124,9 +124,9 @@
 #define D_PORT "Port"
 #define D_POWER_FACTOR "Leistungsfaktor"
 #define D_POWERUSAGE "Leistung"
-#define D_POWERUSAGE_ACTIVE "Active Power"
+#define D_POWERUSAGE_ACTIVE "Wirkleistung"
-#define D_POWERUSAGE_APPARENT "Apparent Power"
+#define D_POWERUSAGE_APPARENT "Scheinleistung"
-#define D_POWERUSAGE_REACTIVE "Reactive Power"
+#define D_POWERUSAGE_REACTIVE "Blindleistung"
 #define D_PRESSURE "Luftdruck"
 #define D_PRESSUREATSEALEVEL "Luftdruck auf Meereshöhe"
 #define D_PROGRAM_FLASH_SIZE "Ges. Flash Speicher"
@@ -174,6 +174,7 @@
 #define D_UV_POWER "UV Intensität"
 #define D_VERSION "Version"
 #define D_VOLTAGE "Spannung"
+#define D_WEIGHT "Weight"
 #define D_WARMLIGHT "warm"
 #define D_WEB_SERVER "Web-Server"
 
@@ -496,6 +497,8 @@
 #define D_SENSOR_TM1638_CLK "TM16 CLK"
 #define D_SENSOR_TM1638_DIO "TM16 DIO"
 #define D_SENSOR_TM1638_STB "TM16 STB"
+#define D_SENSOR_HX711_SCK "HX711 SCK"
+#define D_SENSOR_HX711_DAT "HX711 DAT"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -503,6 +506,7 @@
 #define D_UNIT_HERTZ "Hz"
 #define D_UNIT_HOUR "h"
 #define D_UNIT_INCREMENTS "inc"
+#define D_UNIT_KILOGRAM "kg"
 #define D_UNIT_KILOOHM "kOhm"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"

sonoff/language/el-GR.h

@@ -174,6 +174,7 @@
 #define D_UV_POWER "UV Power"
 #define D_VERSION "Έκδοση"
 #define D_VOLTAGE "Τάση"
+#define D_WEIGHT "Weight"
 #define D_WARMLIGHT "Ζεστό"
 #define D_WEB_SERVER "Web διακομιστής"
 
@@ -496,6 +497,8 @@
 #define D_SENSOR_TM1638_CLK "TM16 CLK"
 #define D_SENSOR_TM1638_DIO "TM16 DIO"
 #define D_SENSOR_TM1638_STB "TM16 STB"
+#define D_SENSOR_HX711_SCK "HX711 SCK"
+#define D_SENSOR_HX711_DAT "HX711 DAT"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -503,6 +506,7 @@
 #define D_UNIT_HERTZ "Hz"
 #define D_UNIT_HOUR "Hr"
 #define D_UNIT_INCREMENTS "inc"
+#define D_UNIT_KILOGRAM "kg"
 #define D_UNIT_KILOOHM "kOhm"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"

sonoff/language/en-GB.h

@@ -28,7 +28,7 @@
  * Use online command StateText to translate ON, OFF, HOLD and TOGGLE.
  * Use online command Prefix to translate cmnd, stat and tele.
  *
- * Updated until v5.14.0b
+ * Updated until v6.2.1.11
 \*********************************************************************/
 
 //#define LANGUAGE_MODULE_NAME         // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English)
@@ -174,6 +174,7 @@
 #define D_UV_POWER "UV Power"
 #define D_VERSION "Version"
 #define D_VOLTAGE "Voltage"
+#define D_WEIGHT "Weight"
 #define D_WARMLIGHT "Warm"
 #define D_WEB_SERVER "Web Server"
 
@@ -496,12 +497,16 @@
 #define D_SENSOR_TM1638_CLK "TM16 CLK"
 #define D_SENSOR_TM1638_DIO "TM16 DIO"
 #define D_SENSOR_TM1638_STB "TM16 STB"
+#define D_SENSOR_HX711_SCK "HX711 SCK"
+#define D_SENSOR_HX711_DAT "HX711 DAT"
 
 // Units
 #define D_UNIT_AMPERE "A"
 #define D_UNIT_CENTIMETER "cm"
+#define D_UNIT_HERTZ "Hz"
 #define D_UNIT_HOUR "Hr"
 #define D_UNIT_INCREMENTS "inc"
+#define D_UNIT_KILOGRAM "kg"
 #define D_UNIT_KILOOHM "kOhm"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"
@@ -522,7 +527,6 @@
 #define D_UNIT_VOLT "V"
 #define D_UNIT_WATT "W"
 #define D_UNIT_WATTHOUR "Wh"
-#define D_UNIT_HERTZ "Hz"
 #define D_UNIT_WATT_METER_QUADRAT "W/m²"
 
 // Log message prefix

sonoff/language/es-AR.h

@@ -28,7 +28,7 @@
  * Use online command StateText to translate ON, OFF, HOLD and TOGGLE.
  * Use online command Prefix to translate cmnd, stat and tele.
  *
- * Updated until v6.2.0.1
+ * Updated until v6.2.1.11
 \*********************************************************************/
 
 #define LANGUAGE_MODULE_NAME         // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English)
@@ -174,6 +174,7 @@
 #define D_UV_POWER "UV Power"
 #define D_VERSION "Versión"
 #define D_VOLTAGE "Tensión"
+#define D_WEIGHT "Peso"
 #define D_WARMLIGHT "Cálida"
 #define D_WEB_SERVER "Servidor Web"
 
@@ -496,6 +497,8 @@
 #define D_SENSOR_TM1638_CLK "TM16 CLK"
 #define D_SENSOR_TM1638_DIO "TM16 DIO"
 #define D_SENSOR_TM1638_STB "TM16 STB"
+#define D_SENSOR_HX711_SCK "HX711 SCK"
+#define D_SENSOR_HX711_DAT "HX711 DAT"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -503,6 +506,7 @@
 #define D_UNIT_HERTZ "Hz"
 #define D_UNIT_HOUR "Hr"
 #define D_UNIT_INCREMENTS "inc"
+#define D_UNIT_KILOGRAM "kg"
 #define D_UNIT_KILOOHM "kOhm"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"

sonoff/language/fr-FR.h

@@ -174,6 +174,7 @@
 #define D_UV_POWER "Puissance UV"
 #define D_VERSION "Version"
 #define D_VOLTAGE "Tension"
+#define D_WEIGHT "Weight"
 #define D_WARMLIGHT "Chaud"
 #define D_WEB_SERVER "Serveur web"
 
@@ -496,6 +497,8 @@
 #define D_SENSOR_TM1638_CLK "TM16 CLK"
 #define D_SENSOR_TM1638_DIO "TM16 DIO"
 #define D_SENSOR_TM1638_STB "TM16 STB"
+#define D_SENSOR_HX711_SCK "HX711 SCK"
+#define D_SENSOR_HX711_DAT "HX711 DAT"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -503,6 +506,7 @@
 #define D_UNIT_HERTZ "Hz"
 #define D_UNIT_HOUR "h"
 #define D_UNIT_INCREMENTS "inc"
+#define D_UNIT_KILOGRAM "kg"
 #define D_UNIT_KILOOHM "kΩ"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"

sonoff/language/he-HE.h

@@ -174,6 +174,7 @@
 #define D_UV_POWER "UV Power"
 #define D_VERSION "גרסה"
 #define D_VOLTAGE "מתח"
+#define D_WEIGHT "Weight"
 #define D_WARMLIGHT "חום"
 #define D_WEB_SERVER "Web שרת"
 
@@ -496,12 +497,16 @@
 #define D_SENSOR_TM1638_CLK "TM16 CLK"
 #define D_SENSOR_TM1638_DIO "TM16 DIO"
 #define D_SENSOR_TM1638_STB "TM16 STB"
+#define D_SENSOR_HX711_SCK "HX711 SCK"
+#define D_SENSOR_HX711_DAT "HX711 DAT"
 
 // Units
 #define D_UNIT_AMPERE "A"
 #define D_UNIT_CENTIMETER "cm"
+#define D_UNIT_HERTZ "Hz"
 #define D_UNIT_HOUR "Hr"
 #define D_UNIT_INCREMENTS "inc"
+#define D_UNIT_KILOGRAM "kg"
 #define D_UNIT_KILOOHM "kOhm"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"
@@ -522,7 +527,6 @@
 #define D_UNIT_VOLT "V"
 #define D_UNIT_WATT "W"
 #define D_UNIT_WATTHOUR "Wh"
-#define D_UNIT_HERTZ "Hz"
 #define D_UNIT_WATT_METER_QUADRAT "W/m²"
 
 // Log message prefix

sonoff/language/hu-HU.h

@@ -174,6 +174,7 @@
 #define D_UV_POWER "UV Power"
 #define D_VERSION "Verzió"
 #define D_VOLTAGE "Feszültség"
+#define D_WEIGHT "Weight"
 #define D_WARMLIGHT "Meleg"
 #define D_WEB_SERVER "Web Szerver"
 
@@ -496,6 +497,8 @@
 #define D_SENSOR_TM1638_CLK "TM16 CLK"
 #define D_SENSOR_TM1638_DIO "TM16 DIO"
 #define D_SENSOR_TM1638_STB "TM16 STB"
+#define D_SENSOR_HX711_SCK "HX711 SCK"
+#define D_SENSOR_HX711_DAT "HX711 DAT"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -503,6 +506,7 @@
 #define D_UNIT_HERTZ "Hz"
 #define D_UNIT_HOUR "ó"
 #define D_UNIT_INCREMENTS "inc"
+#define D_UNIT_KILOGRAM "kg"
 #define D_UNIT_KILOOHM "kOhm"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"

sonoff/language/it-IT.h

@@ -174,6 +174,7 @@
 #define D_UV_POWER "UV Power"
 #define D_VERSION "Versione"
 #define D_VOLTAGE "Tensione"
+#define D_WEIGHT "Weight"
 #define D_WARMLIGHT "Calda"
 #define D_WEB_SERVER "Web Server"
 
@@ -496,6 +497,8 @@
 #define D_SENSOR_TM1638_CLK "TM16 CLK"
 #define D_SENSOR_TM1638_DIO "TM16 DIO"
 #define D_SENSOR_TM1638_STB "TM16 STB"
+#define D_SENSOR_HX711_SCK "HX711 SCK"
+#define D_SENSOR_HX711_DAT "HX711 DAT"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -503,6 +506,7 @@
 #define D_UNIT_HERTZ "Hz"
 #define D_UNIT_HOUR "Hr"
 #define D_UNIT_INCREMENTS "inc"
+#define D_UNIT_KILOGRAM "kg"
 #define D_UNIT_KILOOHM "kOhm"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"

sonoff/language/nl-NL.h

@@ -174,6 +174,7 @@
 #define D_UV_POWER "UV Power"
 #define D_VERSION "Versie"
 #define D_VOLTAGE "Spanning"
+#define D_WEIGHT "Gewicht"
 #define D_WARMLIGHT "Warm"
 #define D_WEB_SERVER "Webserver"
 
@@ -496,6 +497,8 @@
 #define D_SENSOR_TM1638_CLK "TM16 CLK"
 #define D_SENSOR_TM1638_DIO "TM16 DIO"
 #define D_SENSOR_TM1638_STB "TM16 STB"
+#define D_SENSOR_HX711_SCK "HX711 SCK"
+#define D_SENSOR_HX711_DAT "HX711 DAT"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -503,6 +506,7 @@
 #define D_UNIT_HERTZ "Hz"
 #define D_UNIT_HOUR "h"
 #define D_UNIT_INCREMENTS "inc"
+#define D_UNIT_KILOGRAM "kg"
 #define D_UNIT_KILOOHM "kOhm"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"

sonoff/language/pl-PL.h

@@ -174,6 +174,7 @@
 #define D_UV_POWER "UV Power"
 #define D_VERSION "Wersja"
 #define D_VOLTAGE "Napięcie"
+#define D_WEIGHT "Weight"
 #define D_WARMLIGHT "Nagrzanie"
 #define D_WEB_SERVER "Web Server"
 
@@ -496,6 +497,8 @@
 #define D_SENSOR_TM1638_CLK "TM16 CLK"
 #define D_SENSOR_TM1638_DIO "TM16 DIO"
 #define D_SENSOR_TM1638_STB "TM16 STB"
+#define D_SENSOR_HX711_SCK "HX711 SCK"
+#define D_SENSOR_HX711_DAT "HX711 DAT"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -503,6 +506,7 @@
 #define D_UNIT_HERTZ "Hz"
 #define D_UNIT_HOUR "Godz"
 #define D_UNIT_INCREMENTS "inc"
+#define D_UNIT_KILOGRAM "kg"
 #define D_UNIT_KILOOHM "kOhm"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"

sonoff/language/pt-BR.h

@@ -174,6 +174,7 @@
 #define D_UV_POWER "UV Power"
 #define D_VERSION "Versão"
 #define D_VOLTAGE "Voltagem"
+#define D_WEIGHT "Weight"
 #define D_WARMLIGHT "Luz quente"
 #define D_WEB_SERVER "Servidor WEB"
 
@@ -496,6 +497,8 @@
 #define D_SENSOR_TM1638_CLK "TM16 CLK"
 #define D_SENSOR_TM1638_DIO "TM16 DIO"
 #define D_SENSOR_TM1638_STB "TM16 STB"
+#define D_SENSOR_HX711_SCK "HX711 SCK"
+#define D_SENSOR_HX711_DAT "HX711 DAT"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -503,6 +506,7 @@
 #define D_UNIT_HERTZ "Hz"
 #define D_UNIT_HOUR "H"
 #define D_UNIT_INCREMENTS "inc"
+#define D_UNIT_KILOGRAM "kg"
 #define D_UNIT_KILOOHM "kOhm"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"

sonoff/language/pt-PT.h

@@ -174,6 +174,7 @@
 #define D_UV_POWER "UV Power"
 #define D_VERSION "Versão"
 #define D_VOLTAGE "Voltagem"
+#define D_WEIGHT "Weight"
 #define D_WARMLIGHT "Luz Quente"
 #define D_WEB_SERVER "servidor WEB"
 
@@ -496,6 +497,8 @@
 #define D_SENSOR_TM1638_CLK "TM16 CLK"
 #define D_SENSOR_TM1638_DIO "TM16 DIO"
 #define D_SENSOR_TM1638_STB "TM16 STB"
+#define D_SENSOR_HX711_SCK "HX711 SCK"
+#define D_SENSOR_HX711_DAT "HX711 DAT"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -503,6 +506,7 @@
 #define D_UNIT_HERTZ "Hz"
 #define D_UNIT_HOUR "Hr"
 #define D_UNIT_INCREMENTS "inc"
+#define D_UNIT_KILOGRAM "kg"
 #define D_UNIT_KILOOHM "kOhm"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"

sonoff/language/ru-RU.h

@@ -174,6 +174,7 @@
 #define D_UV_POWER "UV Power"
 #define D_VERSION "Версия"
 #define D_VOLTAGE "Напряжение"
+#define D_WEIGHT "Weight"
 #define D_WARMLIGHT "Тепло"
 #define D_WEB_SERVER "Web сервер"
 
@@ -496,6 +497,8 @@
 #define D_SENSOR_TM1638_CLK "TM16 CLK"
 #define D_SENSOR_TM1638_DIO "TM16 DIO"
 #define D_SENSOR_TM1638_STB "TM16 STB"
+#define D_SENSOR_HX711_SCK "HX711 SCK"
+#define D_SENSOR_HX711_DAT "HX711 DAT"
 
 // Units
 #define D_UNIT_AMPERE "А"
@@ -503,6 +506,7 @@
 #define D_UNIT_HERTZ "Hz"
 #define D_UNIT_HOUR "Ч"
 #define D_UNIT_INCREMENTS "inc"
+#define D_UNIT_KILOGRAM "kg"
 #define D_UNIT_KILOOHM "кОм"
 #define D_UNIT_KILOWATTHOUR "кВт"
 #define D_UNIT_LUX "лк"

sonoff/language/tr-TR.h

@@ -174,6 +174,7 @@
 #define D_UV_POWER "UV Power"
 #define D_VERSION "Versiyon"
 #define D_VOLTAGE "Voltaj"
+#define D_WEIGHT "Weight"
 #define D_WARMLIGHT "Sıcak"
 #define D_WEB_SERVER "Web Sunucusu"
 
@@ -497,12 +498,15 @@
 #define D_SENSOR_TM1638_CLK "TM16 CLK"
 #define D_SENSOR_TM1638_DIO "TM16 DIO"
 #define D_SENSOR_TM1638_STB "TM16 STB"
+#define D_SENSOR_HX711_SCK "HX711 SCK"
+#define D_SENSOR_HX711_DAT "HX711 DAT"
 
 // Units
 #define D_UNIT_AMPERE "A"
 #define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_HOUR "Hr"
 #define D_UNIT_INCREMENTS "inc"
+#define D_UNIT_KILOGRAM "kg"
 #define D_UNIT_KILOOHM "kOhm"
 #define D_UNIT_KILOWATTHOUR "kWh"
 #define D_UNIT_LUX "lx"

sonoff/language/uk-UK.h

@@ -174,6 +174,7 @@
 #define D_UV_POWER "UV Power"
 #define D_VERSION "Версія"
 #define D_VOLTAGE "Напруга"
+#define D_WEIGHT "Weight"
 #define D_WARMLIGHT "Тепло"
 #define D_WEB_SERVER "Web сервер"
 
@@ -483,7 +484,6 @@
 #define D_SENSOR_SPI_DC   "SPI DC"
 #define D_SENSOR_BACKLIGHT "BkLight"
 #define D_SENSOR_PMS5003  "PMS5003"
-#define D_SENSOR_SDS0X1   "SDS0X1"
 #define D_SENSOR_SDS0X1_RX "SDS0X1 Rx"
 #define D_SENSOR_SDS0X1_TX "SDS0X1 Tx"
 #define D_SENSOR_SBR_RX   "SerBr Rx"
@@ -497,6 +497,8 @@
 #define D_SENSOR_TM1638_CLK "TM16 CLK"
 #define D_SENSOR_TM1638_DIO "TM16 DIO"
 #define D_SENSOR_TM1638_STB "TM16 STB"
+#define D_SENSOR_HX711_SCK "HX711 SCK"
+#define D_SENSOR_HX711_DAT "HX711 DAT"
 
 // Units
 #define D_UNIT_AMPERE "А"
@@ -504,6 +506,7 @@
 #define D_UNIT_HERTZ "Гц"
 #define D_UNIT_HOUR "Г"
 #define D_UNIT_INCREMENTS "inc"
+#define D_UNIT_KILOGRAM "kg"
 #define D_UNIT_KILOOHM "кОм"
 #define D_UNIT_KILOWATTHOUR "кВт"
 #define D_UNIT_LUX "лк"

sonoff/language/zh-CN.h

@@ -174,6 +174,7 @@
 #define D_UV_POWER "UV Power"
 #define D_VERSION "版本"
 #define D_VOLTAGE "电压"
+#define D_WEIGHT "Weight"
 #define D_WARMLIGHT "暖"
 #define D_WEB_SERVER "Web Server"
 
@@ -496,12 +497,15 @@
 #define D_SENSOR_TM1638_CLK "TM16 CLK"
 #define D_SENSOR_TM1638_DIO "TM16 DIO"
 #define D_SENSOR_TM1638_STB "TM16 STB"
+#define D_SENSOR_HX711_SCK "HX711 SCK"
+#define D_SENSOR_HX711_DAT "HX711 DAT"
 
 // Units
 #define D_UNIT_AMPERE "安"
 #define D_UNIT_CENTIMETER "厘米"
 #define D_UNIT_HOUR "时"
 #define D_UNIT_INCREMENTS "inc"
+#define D_UNIT_KILOGRAM "kg"
 #define D_UNIT_KILOOHM "千欧"
 #define D_UNIT_KILOWATTHOUR "千瓦时"
 #define D_UNIT_LUX "勒克斯"

sonoff/language/zh-TW.h

@@ -174,6 +174,7 @@
 #define D_UV_POWER "UV Power"
 #define D_VERSION "版本"
 #define D_VOLTAGE "電壓"
+#define D_WEIGHT "Weight"
 #define D_WARMLIGHT "暖"
 #define D_WEB_SERVER "Web Server"
 
@@ -496,13 +497,16 @@
 #define D_SENSOR_TM1638_CLK "TM16 CLK"
 #define D_SENSOR_TM1638_DIO "TM16 DIO"
 #define D_SENSOR_TM1638_STB "TM16 STB"
+#define D_SENSOR_HX711_SCK "HX711 SCK"
+#define D_SENSOR_HX711_DAT "HX711 DAT"
 
 // Units
 #define D_UNIT_AMPERE "安"
 #define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_HERTZ "Hz"
-#define D_UNIT_INCREMENTS "inc"
 #define D_UNIT_HOUR "時"
+#define D_UNIT_INCREMENTS "inc"
+#define D_UNIT_KILOGRAM "kg"
 #define D_UNIT_KILOOHM "千歐"
 #define D_UNIT_KILOWATTHOUR "千瓦時"
 #define D_UNIT_LUX "勒克斯"

sonoff/xdrv_07_domoticz.ino

@@ -150,6 +150,15 @@ void DomoticzMqttSubscribe()
    "svalue1" : "0",
    "switchType" : "Dimmer",
    "unit" : 1
+}
+ * Fail on this one
+{
+   "LastUpdate" : "2018-10-02 20:39:45",
+   "Name" : "Sfeerverlichting",
+   "Status" : "Off",
+   "Timers" : "true",
+   "Type" : "Group",
+   "idx" : "2"
 }
 */
 
@@ -157,7 +166,7 @@ boolean DomoticzMqttData()
 {
   char stemp1[10];
   unsigned long idx = 0;
-  int16_t nvalue;
+  int16_t nvalue = -1;
   int16_t found = 0;
 
   domoticz_update_flag = 1;
@@ -174,7 +183,9 @@ boolean DomoticzMqttData()
 //      return 1;
 //    }
     idx = domoticz["idx"];
-    nvalue = domoticz["nvalue"];
+    if (domoticz.containsKey("nvalue")) {
+      nvalue = domoticz["nvalue"];
+    }
 
     snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_DOMOTICZ "idx %d, nvalue %d"), idx, nvalue);
     AddLog(LOG_LEVEL_DEBUG_MORE);
@@ -198,7 +209,11 @@ boolean DomoticzMqttData()
             found = 1;
           } else if ((!iscolordimmer && 2 == nvalue) || // gswitch_sSetLevel
                      (iscolordimmer && 15 == nvalue)) { // Color_SetBrightnessLevel
-            nvalue = domoticz["svalue1"];
+            if (domoticz.containsKey("svalue1")) {
+              nvalue = domoticz["svalue1"];
+            } else {
+              return 1;
+            }
             if (light_type && (Settings.light_dimmer == nvalue) && ((power >> i) &1)) {
               return 1;
             }

sonoff/xsns_27_apds9960.ino

@@ -39,7 +39,7 @@
  * I2C Address: 0x39
 \*********************************************************************************************/
 
-#if defined(USE_SHT) || defined(USE_VEML6070)
+#if defined(USE_SHT) || defined(USE_VEML6070) || defined(USE_TSL2561)
   #warning **** Turned off conflicting drivers SHT and VEML6070 ****
   #ifdef USE_SHT
   #undef USE_SHT          // SHT-Driver blocks gesture sensor
@@ -47,6 +47,9 @@
   #ifdef USE_VEML6070
   #undef USE_VEML6070     // address conflict on the I2C-bus
   #endif
+  #ifdef USE_TSL2561
+  #undef USE_TSL2561     // possible address conflict on the I2C-bus
+  #endif
 #endif
 
 #define APDS9960_I2C_ADDR         0x39
@@ -64,10 +67,11 @@
 
 uint8_t APDS9960addr;
 uint8_t APDS9960type = 0;
-char APDS9960stype[7];
+char APDS9960stype[9];
 char currentGesture[6];
 uint8_t gesture_mode = 1;
 
+
 volatile uint8_t recovery_loop_counter = 0;  //count number of stateloops to switch the sensor off, if needed
 #define APDS9960_LONG_RECOVERY           50 //long pause after sensor overload in loops
 #define APDS9960_MAX_GESTURE_CYCLES      50  //how many FIFO-reads are allowed to prevent crash
@@ -78,8 +82,7 @@ const char HTTP_APDS_9960_SNS[] PROGMEM = "%s"
   "{s}" "Red" "{m}%s{e}"
   "{s}" "Green" "{m}%s{e}"
   "{s}" "Blue" "{m}%s{e}"
-  "{s}" "Ambient" "{m}%s{e}"
+  "{s}" "Ambient" "{m}%s " D_UNIT_LUX "{e}"
-  "{s}" "Illuminance" "{m}%s " D_UNIT_LUX "{e}"
   "{s}" "CCT" "{m}%s " "K"  "{e}"  // calculated color temperature in Kelvin
   "{s}" "Proximity"  "{m}%s{e}";      // {s} = <tr><th>, {m} = </th><td>, {e} = </td></tr>
 #endif  // USE_WEBSERVER
@@ -209,7 +212,7 @@ const char HTTP_APDS_9960_SNS[] PROGMEM = "%s"
 #define GWTIME_39_2MS           7
 
 /* Default values */
-#define DEFAULT_ATIME           219     // 103ms
+#define DEFAULT_ATIME           0xdb     // 103ms = 0xdb
 #define DEFAULT_WTIME           246     // 27ms
 #define DEFAULT_PROX_PPULSE     0x87    // 16us, 8 pulses
 #define DEFAULT_GESTURE_PPULSE  0x89    // 16us, 10 pulses  ---89
@@ -218,7 +221,7 @@ const char HTTP_APDS_9960_SNS[] PROGMEM = "%s"
 #define DEFAULT_CONFIG1         0x60    // No 12x wait (WTIME) factor
 #define DEFAULT_LDRIVE          LED_DRIVE_100MA
 #define DEFAULT_PGAIN           PGAIN_4X
-#define DEFAULT_AGAIN           AGAIN_4X
+#define DEFAULT_AGAIN           AGAIN_4X  // we have to divide by the same facot at the end
 #define DEFAULT_PILT            0       // Low proximity threshold
 #define DEFAULT_PIHT            50      // High proximity threshold
 #define DEFAULT_AILT            0xFFFF  // Force interrupt for calibration
@@ -287,6 +290,7 @@ typedef struct gesture_data_type {
  } color_data_type;
 
  color_data_type color_data;
+ uint8_t APDS9960_aTime = DEFAULT_ATIME;
 
 
  /*******************************************************************************
@@ -360,7 +364,7 @@ void calculateColorTemperature()
   /* and 60W incandescent values for a wide range.   */
   /* Note: Y = Illuminance or lux                    */
   X = (-0.14282F * color_data.r) + (1.54924F * color_data.g) + (-0.95641F * color_data.b);
-  Y = (-0.32466F * color_data.r) + (1.57837F * color_data.g) + (-0.73191F * color_data.b); // this is Lux
+  Y = (-0.32466F * color_data.r) + (1.57837F * color_data.g) + (-0.73191F * color_data.b); // this is Lux ... under certain circumstances
   Z = (-0.68202F * color_data.r) + (0.77073F * color_data.g) + ( 0.56332F * color_data.b);
 
   /* 2. Calculate the chromaticity co-ordinates      */
@@ -372,7 +376,6 @@ void calculateColorTemperature()
 
   /* Calculate the final CCT */
   color_data.cct = (449.0F * powf(n, 3)) + (3525.0F * powf(n, 2)) + (6823.3F * n) + 5520.33F;
-  color_data.lux = Y; // according to Adafruit code comments this seems to be not a perfect solution
 
   return;
 }
@@ -1803,11 +1806,11 @@ void handleGesture() {
         break;
       case DIR_LEFT:
         snprintf_P(log, sizeof(log), PSTR("LEFT"));
-          snprintf_P(currentGesture, sizeof(currentGesture), PSTR("Left"));
+        snprintf_P(currentGesture, sizeof(currentGesture), PSTR("Left"));
         break;
       case DIR_RIGHT:
         snprintf_P(log, sizeof(log), PSTR("RIGHT"));
-          snprintf_P(currentGesture, sizeof(currentGesture), PSTR("Right"));
+        snprintf_P(currentGesture, sizeof(currentGesture), PSTR("Right"));
         break;
       default:
       if(APDS9960_overload)
@@ -1832,6 +1835,41 @@ void handleGesture() {
   }
 }
 
+void APDS9960_adjustATime(void)  // not really used atm 
+{
+  //readAllColorAndProximityData();
+  I2cValidRead16LE(&color_data.a, APDS9960_I2C_ADDR, APDS9960_CDATAL);
+  //disablePower();
+
+  if (color_data.a < (uint16_t)20){
+    APDS9960_aTime = 0x40;
+  }
+  else if (color_data.a < (uint16_t)40){
+    APDS9960_aTime = 0x80;
+  }
+  else if (color_data.a < (uint16_t)50){
+    APDS9960_aTime = DEFAULT_ATIME;
+  }
+  else if (color_data.a < (uint16_t)70){
+    APDS9960_aTime = 0xc0;
+  }
+  if (color_data.a < 200){
+    APDS9960_aTime = 0xe9;
+  }
+/*  if (color_data.a < 10000){
+    APDS9960_aTime = 0xF0;
+  }*/
+  else{
+    APDS9960_aTime = 0xff;
+  }
+
+  //disableLightSensor();
+  I2cWrite8(APDS9960_I2C_ADDR, APDS9960_ATIME, APDS9960_aTime);
+  enablePower();
+  enableLightSensor();
+  delay(20);
+}
+
 
 void APDS9960_loop()
 {
@@ -1910,29 +1948,30 @@ void APDS9960_show(boolean json)
     char green_chr[10];
     char blue_chr[10];
     char ambient_chr[10];
-    char illuminance_chr[10];
     char cct_chr[10];
     char prox_chr[10];
 
     readAllColorAndProximityData();
-    sprintf (ambient_chr, "%u", color_data.a);
+
+    sprintf (ambient_chr, "%u", color_data.a/4);
     sprintf (red_chr, "%u", color_data.r);
     sprintf (green_chr, "%u", color_data.g);
     sprintf (blue_chr, "%u", color_data.b );
     sprintf (prox_chr, "%u", color_data.p );
 
+  /*  disableLightSensor();
+    I2cWrite8(APDS9960_I2C_ADDR, APDS9960_ATIME, DEFAULT_ATIME); // reset to default
+    enableLightSensor();*/
+
     calculateColorTemperature();  // and calculate Lux
     sprintf (cct_chr, "%u", color_data.cct);
-    sprintf (illuminance_chr, "%u", color_data.lux);
-
-
 
     if (json) {
-      snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"%s\":{\"Red\":%s,\"Green\":%s,\"Blue\":%s,\"Ambient\":%s,\"Illuminance\":%s,\"CCT\":%s,\"Proximity\":%s}"),
+      snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"%s\":{\"Red\":%s,\"Green\":%s,\"Blue\":%s,\"Ambient\":%s,\"CCT\":%s,\"Proximity\":%s}"),
-        mqtt_data, APDS9960stype, red_chr, green_chr, blue_chr, ambient_chr, illuminance_chr, cct_chr, prox_chr);
+        mqtt_data, APDS9960stype, red_chr, green_chr, blue_chr, ambient_chr, cct_chr, prox_chr);
 #ifdef USE_WEBSERVER
     } else {
-      snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_APDS_9960_SNS, mqtt_data, red_chr, green_chr, blue_chr, ambient_chr, illuminance_chr, cct_chr, prox_chr );
+      snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_APDS_9960_SNS, mqtt_data, red_chr, green_chr, blue_chr, ambient_chr, cct_chr, prox_chr );
 #endif  // USE_WEBSERVER
     }
   }
@@ -1952,6 +1991,7 @@ void APDS9960_show(boolean json)
  * Sensor27 |         | Show current gesture mode
  * Sensor27 | 0 / Off | Disable gesture mode
  * Sensor27 | 1 / On  | Enable gesture mode
+ * Sensor27 | 2 / On  | Enable gesture mode with half gain
 \*********************************************************************************************/
 
 bool APDS9960CommandSensor()
@@ -1973,7 +2013,8 @@ bool APDS9960CommandSensor()
         enableGestureSensor();
         gesture_mode = 1;
       }
-    case 2:
+      break;
+    case 2:  // gain of 2x , needed for some models
       if (APDS9960type) {
         setGestureGain(GGAIN_2X);
         setProximityGain(PGAIN_2X);
@@ -1981,6 +2022,16 @@ bool APDS9960CommandSensor()
         enableGestureSensor();
         gesture_mode = 1;
       }
+      break;
+    default:
+      int temp_aTime = (uint8_t)XdrvMailbox.payload;
+      if (temp_aTime > 2 && temp_aTime < 256){
+        disablePower();
+        I2cWrite8(APDS9960_I2C_ADDR, APDS9960_ATIME, temp_aTime);
+        enablePower();
+        enableLightSensor();
+      }
+    break;
   }
   snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_SENSOR_INDEX_SVALUE, XSNS_27, GetStateText(gesture_mode));