diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 04329ad25577..5e74de8e6e50 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -9,8 +9,9 @@ * Add Portuguese in Brazil language file * Add rule state test for On/Off in addition to 0/1 (#2613) * Add hardware serial option to MHZ-19 sensor (#2659) + * Add Eastron SDM120 energy meter (#2694) * Updated Italian language file (#2618) - * Update TasmotaSerial to 2.0.0 allowing Hardware Serial Fallback when correct connection are configured + * Update TasmotaSerial to 2.0.0 allowing Hardware Serial Fallback when correct connections are configured * Optimize command handling * * 5.13.1 20180501 diff --git a/sonoff/i18n.h b/sonoff/i18n.h index e1d27221be83..5e34007f3861 100644 --- a/sonoff/i18n.h +++ b/sonoff/i18n.h @@ -60,6 +60,7 @@ #define D_JSON_FLASHMODE "FlashMode" #define D_JSON_FLASHSIZE "FlashSize" #define D_JSON_FREEMEMORY "Free" +#define D_JSON_FREQUENCY "Frequency" #define D_JSON_FROM "from" #define D_JSON_GAS "Gas" #define D_JSON_GATEWAY "Gateway" diff --git a/sonoff/language/bg-BG.h b/sonoff/language/bg-BG.h index 7f30252ec769..b3aa97528c1e 100644 --- a/sonoff/language/bg-BG.h +++ b/sonoff/language/bg-BG.h @@ -91,6 +91,7 @@ #define D_FALSE "Невярно" #define D_FILE "Файл" #define D_FREE_MEMORY "Свободна памет" +#define D_FREQUENCY "Frequency" #define D_GAS "Газ" #define D_GATEWAY "Шлюз" #define D_GROUP "Група" @@ -453,10 +454,13 @@ #define D_SENSOR_SBR_TX "SerBr Tx" #define D_SENSOR_SR04_TRIG "SR04 Tri" #define D_SENSOR_SR04_ECHO "SR04 Ech" +#define D_SENSOR_SDM120_TX "SDM120 Tx" +#define D_SENSOR_SDM120_RX "SDM120 Rx" // Units #define D_UNIT_AMPERE "А" #define D_UNIT_CENTIMETER "см" +#define D_UNIT_HERTZ "Hz" #define D_UNIT_HOUR "ч" #define D_UNIT_KILOOHM "кОм" #define D_UNIT_KILOWATTHOUR "кВт/ч" diff --git a/sonoff/language/cs-CZ.h b/sonoff/language/cs-CZ.h index a52f319014e7..6c07717c9698 100644 --- a/sonoff/language/cs-CZ.h +++ b/sonoff/language/cs-CZ.h @@ -91,6 +91,7 @@ #define D_FALSE "Nepravda" #define D_FILE "Soubor" #define D_FREE_MEMORY "Volná paměť" +#define D_FREQUENCY "Frequency" #define D_GAS "Plyn" #define D_GATEWAY "Výchozí brána" #define D_GROUP "Skupina" @@ -453,10 +454,13 @@ #define D_SENSOR_SBR_TX "SerBr Tx" #define D_SENSOR_SR04_TRIG "SR04 Tri" #define D_SENSOR_SR04_ECHO "SR04 Ech" +#define D_SENSOR_SDM120_TX "SDM120 Tx" +#define D_SENSOR_SDM120_RX "SDM120 Rx" // Units #define D_UNIT_AMPERE "A" #define D_UNIT_CENTIMETER "cm" +#define D_UNIT_HERTZ "Hz" #define D_UNIT_HOUR "hod" #define D_UNIT_KILOOHM "kOhm" #define D_UNIT_KILOWATTHOUR "kWh" diff --git a/sonoff/language/de-DE.h b/sonoff/language/de-DE.h index b2ade5e2bd4b..d2808dd9c515 100644 --- a/sonoff/language/de-DE.h +++ b/sonoff/language/de-DE.h @@ -91,6 +91,7 @@ #define D_FALSE "falsch" #define D_FILE "Datei" #define D_FREE_MEMORY "Freier Arbeitsspeicher" +#define D_FREQUENCY "Frequency" #define D_GAS "Gas" #define D_GATEWAY "Gateway" #define D_GROUP "Gruppe" @@ -453,10 +454,13 @@ #define D_SENSOR_SBR_TX "SerBr Tx" #define D_SENSOR_SR04_TRIG "SR04 Tri" #define D_SENSOR_SR04_ECHO "SR04 Ech" +#define D_SENSOR_SDM120_TX "SDM120 Tx" +#define D_SENSOR_SDM120_RX "SDM120 Rx" // Units #define D_UNIT_AMPERE "A" #define D_UNIT_CENTIMETER "cm" +#define D_UNIT_HERTZ "Hz" #define D_UNIT_HOUR "h" #define D_UNIT_KILOOHM "kOhm" #define D_UNIT_KILOWATTHOUR "kWh" diff --git a/sonoff/language/el-GR.h b/sonoff/language/el-GR.h index e4280b0924fd..595281610300 100644 --- a/sonoff/language/el-GR.h +++ b/sonoff/language/el-GR.h @@ -91,6 +91,7 @@ #define D_FALSE "Λάθος" #define D_FILE "Αρχείο" #define D_FREE_MEMORY "Ελεύθερη Μνήμη" +#define D_FREQUENCY "Frequency" #define D_GAS "Γκάζι" #define D_GATEWAY "Πύλη" #define D_GROUP "Ομάδα" @@ -453,10 +454,13 @@ #define D_SENSOR_SBR_TX "SerBr Tx" #define D_SENSOR_SR04_TRIG "SR04 Tri" #define D_SENSOR_SR04_ECHO "SR04 Ech" +#define D_SENSOR_SDM120_TX "SDM120 Tx" +#define D_SENSOR_SDM120_RX "SDM120 Rx" // Units #define D_UNIT_AMPERE "A" #define D_UNIT_CENTIMETER "cm" +#define D_UNIT_HERTZ "Hz" #define D_UNIT_HOUR "Hr" #define D_UNIT_KILOOHM "kOhm" #define D_UNIT_KILOWATTHOUR "kWh" diff --git a/sonoff/language/en-GB.h b/sonoff/language/en-GB.h index ade787b9ebc7..32ca90460d37 100644 --- a/sonoff/language/en-GB.h +++ b/sonoff/language/en-GB.h @@ -91,6 +91,7 @@ #define D_FALSE "False" #define D_FILE "File" #define D_FREE_MEMORY "Free Memory" +#define D_FREQUENCY "Frequency" #define D_GAS "Gas" #define D_GATEWAY "Gateway" #define D_GROUP "Group" @@ -453,6 +454,8 @@ #define D_SENSOR_SBR_TX "SerBr Tx" #define D_SENSOR_SR04_TRIG "SR04 Tri" #define D_SENSOR_SR04_ECHO "SR04 Ech" +#define D_SENSOR_SDM120_TX "SDM120 Tx" +#define D_SENSOR_SDM120_RX "SDM120 Rx" // Units #define D_UNIT_AMPERE "A" @@ -476,6 +479,7 @@ #define D_UNIT_VOLT "V" #define D_UNIT_WATT "W" #define D_UNIT_WATTHOUR "Wh" +#define D_UNIT_HERTZ "Hz" // Log message prefix #define D_LOG_APPLICATION "APP: " // Application diff --git a/sonoff/language/es-AR.h b/sonoff/language/es-AR.h index ded21e8e7e9c..200af4e1ab5d 100644 --- a/sonoff/language/es-AR.h +++ b/sonoff/language/es-AR.h @@ -91,6 +91,7 @@ #define D_FALSE "Falso" #define D_FILE "Archivo" #define D_FREE_MEMORY "Memoria Libre" +#define D_FREQUENCY "Frequency" #define D_GAS "Gas" #define D_GATEWAY "Gateway" #define D_GROUP "Grupo" @@ -453,10 +454,13 @@ #define D_SENSOR_SBR_TX "SerBr Tx" #define D_SENSOR_SR04_TRIG "SR04 Tri" #define D_SENSOR_SR04_ECHO "SR04 Ech" +#define D_SENSOR_SDM120_TX "SDM120 Tx" +#define D_SENSOR_SDM120_RX "SDM120 Rx" // Units #define D_UNIT_AMPERE "A" #define D_UNIT_CENTIMETER "cm" +#define D_UNIT_HERTZ "Hz" #define D_UNIT_HOUR "Hr" #define D_UNIT_KILOOHM "kOhm" #define D_UNIT_KILOWATTHOUR "kWh" diff --git a/sonoff/language/fr-FR.h b/sonoff/language/fr-FR.h index a9211dab1852..b13e22418ee4 100644 --- a/sonoff/language/fr-FR.h +++ b/sonoff/language/fr-FR.h @@ -91,6 +91,7 @@ #define D_FALSE "Faux" #define D_FILE "Fichier" #define D_FREE_MEMORY "Mémoire libre" +#define D_FREQUENCY "Frequency" #define D_GAS "Gaz" #define D_GATEWAY "Passerelle" #define D_GROUP "Groupe" @@ -453,10 +454,13 @@ #define D_SENSOR_SBR_TX "SerBr Tx" #define D_SENSOR_SR04_TRIG "SR04 Tri" #define D_SENSOR_SR04_ECHO "SR04 Ech" +#define D_SENSOR_SDM120_TX "SDM120 Tx" +#define D_SENSOR_SDM120_RX "SDM120 Rx" // Units #define D_UNIT_AMPERE "A" #define D_UNIT_CENTIMETER "cm" +#define D_UNIT_HERTZ "Hz" #define D_UNIT_HOUR "h" #define D_UNIT_KILOOHM "kΩ" #define D_UNIT_KILOWATTHOUR "kWh" diff --git a/sonoff/language/hu-HU.h b/sonoff/language/hu-HU.h index 51d9e146fbdc..0a5c9a79cdb5 100644 --- a/sonoff/language/hu-HU.h +++ b/sonoff/language/hu-HU.h @@ -91,6 +91,7 @@ #define D_FALSE "Hamis" #define D_FILE "File" #define D_FREE_MEMORY "Szabad Memória" +#define D_FREQUENCY "Frequency" #define D_GAS "Gáz" #define D_GATEWAY "Gateway" #define D_GROUP "Csoport" @@ -453,10 +454,13 @@ #define D_SENSOR_SBR_TX "SerBr Tx" #define D_SENSOR_SR04_TRIG "SR04 Tri" #define D_SENSOR_SR04_ECHO "SR04 Ech" +#define D_SENSOR_SDM120_TX "SDM120 Tx" +#define D_SENSOR_SDM120_RX "SDM120 Rx" // Units #define D_UNIT_AMPERE "A" #define D_UNIT_CENTIMETER "cm" +#define D_UNIT_HERTZ "Hz" #define D_UNIT_HOUR "ó" #define D_UNIT_KILOOHM "kOhm" #define D_UNIT_KILOWATTHOUR "kWh" diff --git a/sonoff/language/it-IT.h b/sonoff/language/it-IT.h index e114c817684a..85f91a0a206c 100644 --- a/sonoff/language/it-IT.h +++ b/sonoff/language/it-IT.h @@ -91,6 +91,7 @@ #define D_FALSE "Falso" #define D_FILE "File" #define D_FREE_MEMORY "Memoria Libera" +#define D_FREQUENCY "Frequenza" #define D_GAS "Gas" #define D_GATEWAY "Gateway" #define D_GROUP "Gruppo" @@ -453,10 +454,13 @@ #define D_SENSOR_SBR_TX "SerBr Tx" #define D_SENSOR_SR04_TRIG "SR04 Tri" #define D_SENSOR_SR04_ECHO "SR04 Ech" +#define D_SENSOR_SDM120_TX "SDM120 Tx" +#define D_SENSOR_SDM120_RX "SDM120 Rx" // Units #define D_UNIT_AMPERE "A" #define D_UNIT_CENTIMETER "cm" +#define D_UNIT_HERTZ "Hz" #define D_UNIT_HOUR "Hr" #define D_UNIT_KILOOHM "kOhm" #define D_UNIT_KILOWATTHOUR "kWh" diff --git a/sonoff/language/nl-NL.h b/sonoff/language/nl-NL.h index 5d3bcb9598a8..081a957e3935 100644 --- a/sonoff/language/nl-NL.h +++ b/sonoff/language/nl-NL.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.12.0l + * Updated until v5.13.1a \*********************************************************************/ //#define LANGUAGE_MODULE_NAME // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English) @@ -91,6 +91,7 @@ #define D_FALSE "Onwaar" #define D_FILE "Bestand" #define D_FREE_MEMORY "Vrij geheugen" +#define D_FREQUENCY "Frequentie" #define D_GAS "Gas" #define D_GATEWAY "Gateway" #define D_GROUP "Groep" @@ -376,24 +377,24 @@ #define D_TIMER_ACTION "Actie" // xdrv_10_knx.ino -#define D_CONFIGURE_KNX "Configure KNX" +#define D_CONFIGURE_KNX "Configureer KNX" #define D_KNX_PARAMETERS "KNX Parameters" -#define D_KNX_GENERAL_CONFIG "General" -#define D_KNX_PHYSICAL_ADDRESS "Physical Address" -#define D_KNX_PHYSICAL_ADDRESS_NOTE "( Must be unique on the KNX network )" -#define D_KNX_ENABLE "Enable KNX" -#define D_KNX_GROUP_ADDRESS_TO_WRITE "Data to Send to Group Addresses" -#define D_ADD "Add" -#define D_DELETE "Delete" -#define D_REPLY "Reply" -#define D_KNX_GROUP_ADDRESS_TO_READ "Group Addresses to Receive Data from" +#define D_KNX_GENERAL_CONFIG "Algemeen" +#define D_KNX_PHYSICAL_ADDRESS "Eigen adres" +#define D_KNX_PHYSICAL_ADDRESS_NOTE "(Moet uniek zijn op het KNX netwerk)" +#define D_KNX_ENABLE "KNX inschakelen" +#define D_KNX_GROUP_ADDRESS_TO_WRITE "Stuur gegevens naar groep adressen" +#define D_ADD "Toevoegen" +#define D_DELETE "Verwijder" +#define D_REPLY "Antwoord" +#define D_KNX_GROUP_ADDRESS_TO_READ "Ontvang gegevens van groep adressen" #define D_LOG_KNX "KNX: " -#define D_RECEIVED_FROM "Received from" -#define D_KNX_COMMAND_WRITE "Write" -#define D_KNX_COMMAND_READ "Read" -#define D_KNX_COMMAND_OTHER "Other" -#define D_SENT_TO "sent to" -#define D_KNX_WARNING "The group address ( 0 / 0 / 0 ) is reserved and can not be used." +#define D_RECEIVED_FROM "Ontvangen van" +#define D_KNX_COMMAND_WRITE "Schrijven" +#define D_KNX_COMMAND_READ "Lezen" +#define D_KNX_COMMAND_OTHER "Overige" +#define D_SENT_TO "verzend naar" +#define D_KNX_WARNING "Groep adres (0/0/0) is gereserveerd en mag niet worden gebruikt." // xdrv_03_energy.ino #define D_ENERGY_TODAY "Verbruik vandaag" @@ -453,10 +454,13 @@ #define D_SENSOR_SBR_TX "SerBr Tx" #define D_SENSOR_SR04_TRIG "SR04 Tri" #define D_SENSOR_SR04_ECHO "SR04 Ech" +#define D_SENSOR_SDM120_TX "SDM120 Tx" +#define D_SENSOR_SDM120_RX "SDM120 Rx" // Units #define D_UNIT_AMPERE "A" #define D_UNIT_CENTIMETER "cm" +#define D_UNIT_HERTZ "Hz" #define D_UNIT_HOUR "h" #define D_UNIT_KILOOHM "kOhm" #define D_UNIT_KILOWATTHOUR "kWh" diff --git a/sonoff/language/pl-PL.h b/sonoff/language/pl-PL.h index 19a27ebeb5f0..e1b1a5878707 100644 --- a/sonoff/language/pl-PL.h +++ b/sonoff/language/pl-PL.h @@ -91,6 +91,7 @@ #define D_FALSE "Fałsz" #define D_FILE "Plik" #define D_FREE_MEMORY "Wolna pamięć" +#define D_FREQUENCY "Frequency" #define D_GAS "Gas" #define D_GATEWAY "Brama" #define D_GROUP "Grupa" @@ -453,10 +454,13 @@ #define D_SENSOR_SBR_TX "SerBr Tx" #define D_SENSOR_SR04_TRIG "SR04 Tri" #define D_SENSOR_SR04_ECHO "SR04 Ech" +#define D_SENSOR_SDM120_TX "SDM120 Tx" +#define D_SENSOR_SDM120_RX "SDM120 Rx" // Units #define D_UNIT_AMPERE "A" #define D_UNIT_CENTIMETER "cm" +#define D_UNIT_HERTZ "Hz" #define D_UNIT_HOUR "Godz" #define D_UNIT_KILOOHM "kOhm" #define D_UNIT_KILOWATTHOUR "kWh" diff --git a/sonoff/language/pt-BR.h b/sonoff/language/pt-BR.h index a279782ebc57..83f53a165beb 100644 --- a/sonoff/language/pt-BR.h +++ b/sonoff/language/pt-BR.h @@ -91,6 +91,7 @@ #define D_FALSE "Falso" #define D_FILE "Arquivo" #define D_FREE_MEMORY "Memória Livre" +#define D_FREQUENCY "Frequency" #define D_GAS "Gás" #define D_GATEWAY "Gateway" #define D_GROUP "Grupo" @@ -453,10 +454,13 @@ #define D_SENSOR_SBR_TX "SerBr Tx" #define D_SENSOR_SR04_TRIG "SR04 Tri" #define D_SENSOR_SR04_ECHO "SR04 Ech" +#define D_SENSOR_SDM120_TX "SDM120 Tx" +#define D_SENSOR_SDM120_RX "SDM120 Rx" // Units #define D_UNIT_AMPERE "A" #define D_UNIT_CENTIMETER "cm" +#define D_UNIT_HERTZ "Hz" #define D_UNIT_HOUR "H" #define D_UNIT_KILOOHM "kOhm" #define D_UNIT_KILOWATTHOUR "kWh" diff --git a/sonoff/language/pt-PT.h b/sonoff/language/pt-PT.h index 149aeec31197..9765830bd023 100644 --- a/sonoff/language/pt-PT.h +++ b/sonoff/language/pt-PT.h @@ -91,6 +91,7 @@ #define D_FALSE "Falso" #define D_FILE "Ficheiro" #define D_FREE_MEMORY "Memoria Livre" +#define D_FREQUENCY "Frequency" #define D_GAS "Gás" #define D_GATEWAY "Gateway" #define D_GROUP "Grupo" @@ -453,10 +454,13 @@ #define D_SENSOR_SBR_TX "SerBr Tx" #define D_SENSOR_SR04_TRIG "SR04 Tri" #define D_SENSOR_SR04_ECHO "SR04 Ech" +#define D_SENSOR_SDM120_TX "SDM120 Tx" +#define D_SENSOR_SDM120_RX "SDM120 Rx" // Units #define D_UNIT_AMPERE "A" #define D_UNIT_CENTIMETER "cm" +#define D_UNIT_HERTZ "Hz" #define D_UNIT_HOUR "Hr" #define D_UNIT_KILOOHM "kOhm" #define D_UNIT_KILOWATTHOUR "kWh" diff --git a/sonoff/language/ru-RU.h b/sonoff/language/ru-RU.h index 96ad631ab9f0..c19eccbf1484 100644 --- a/sonoff/language/ru-RU.h +++ b/sonoff/language/ru-RU.h @@ -91,6 +91,7 @@ #define D_FALSE "Ложно" #define D_FILE "Файл" #define D_FREE_MEMORY "Свободная память" +#define D_FREQUENCY "Frequency" #define D_GAS "Газ" #define D_GATEWAY "Шлюз" #define D_GROUP "Группа" @@ -453,10 +454,13 @@ #define D_SENSOR_SBR_TX "SerBr Tx" #define D_SENSOR_SR04_TRIG "SR04 Tri" #define D_SENSOR_SR04_ECHO "SR04 Ech" +#define D_SENSOR_SDM120_TX "SDM120 Tx" +#define D_SENSOR_SDM120_RX "SDM120 Rx" // Units #define D_UNIT_AMPERE "А" #define D_UNIT_CENTIMETER "cm" +#define D_UNIT_HERTZ "Hz" #define D_UNIT_HOUR "Ч" #define D_UNIT_KILOOHM "кОм" #define D_UNIT_KILOWATTHOUR "кВт" diff --git a/sonoff/language/zh-CN.h b/sonoff/language/zh-CN.h index b90ab7b1d833..c10cbdc16506 100644 --- a/sonoff/language/zh-CN.h +++ b/sonoff/language/zh-CN.h @@ -91,6 +91,7 @@ #define D_FALSE "False" #define D_FILE "文件:" #define D_FREE_MEMORY "空闲内存" +#define D_FREQUENCY "Frequency" #define D_GAS "气体" #define D_GATEWAY "网关" #define D_GROUP "组:" @@ -453,10 +454,13 @@ #define D_SENSOR_SBR_TX "SerBr Tx" #define D_SENSOR_SR04_TRIG "SR04 Tri" #define D_SENSOR_SR04_ECHO "SR04 Ech" +#define D_SENSOR_SDM120_TX "SDM120 Tx" +#define D_SENSOR_SDM120_RX "SDM120 Rx" // Units #define D_UNIT_AMPERE "安" #define D_UNIT_CENTIMETER "cm" +#define D_UNIT_HERTZ "Hz" #define D_UNIT_HOUR "时" #define D_UNIT_KILOOHM "千欧" #define D_UNIT_KILOWATTHOUR "千瓦时" diff --git a/sonoff/language/zh-TW.h b/sonoff/language/zh-TW.h index b13f0ba04dad..e2c5b91931ac 100644 --- a/sonoff/language/zh-TW.h +++ b/sonoff/language/zh-TW.h @@ -91,6 +91,7 @@ #define D_FALSE "False" #define D_FILE "文件:" #define D_FREE_MEMORY "可用記憶體" +#define D_FREQUENCY "Frequency" #define D_GAS "氣體" #define D_GATEWAY "網關" #define D_GROUP "組:" @@ -453,10 +454,13 @@ #define D_SENSOR_SBR_TX "SerBr Tx" #define D_SENSOR_SR04_TRIG "SR04 Tri" #define D_SENSOR_SR04_ECHO "SR04 Ech" +#define D_SENSOR_SDM120_TX "SDM120 Tx" +#define D_SENSOR_SDM120_RX "SDM120 Rx" // Units #define D_UNIT_AMPERE "安" #define D_UNIT_CENTIMETER "cm" +#define D_UNIT_HERTZ "Hz" #define D_UNIT_HOUR "時" #define D_UNIT_KILOOHM "千歐" #define D_UNIT_KILOWATTHOUR "千瓦時" diff --git a/sonoff/sonoff_template.h b/sonoff/sonoff_template.h index dc0746ec768d..7eb4ce2252e2 100644 --- a/sonoff/sonoff_template.h +++ b/sonoff/sonoff_template.h @@ -93,6 +93,8 @@ enum UserSelectablePins { GPIO_SBR_RX, // Serial Bridge Serial interface GPIO_SR04_TRIG, // SR04 Trigger pin GPIO_SR04_ECHO, // SR04 Echo pin + GPIO_SDM120_TX, // SDM120 Serial interface + GPIO_SDM120_RX, // SDM120 Serial interface GPIO_SENSOR_END }; // Programmer selectable GPIO functionality offset by user selectable GPIOs @@ -136,7 +138,8 @@ const char kSensorNames[] PROGMEM = D_SENSOR_SPI_CS "|" D_SENSOR_SPI_DC "|" D_SENSOR_BACKLIGHT "|" D_SENSOR_PMS5003 "|" D_SENSOR_SDS0X1 "|" D_SENSOR_SBR_TX "|" D_SENSOR_SBR_RX "|" - D_SENSOR_SR04_TRIG "|" D_SENSOR_SR04_ECHO; + D_SENSOR_SR04_TRIG "|" D_SENSOR_SR04_ECHO "|" + D_SENSOR_SDM120_TX "|" D_SENSOR_SDM120_RX; /********************************************************************************************/ diff --git a/sonoff/user_config.h b/sonoff/user_config.h index c8f4f4dbbe4f..5c57d447811f 100644 --- a/sonoff/user_config.h +++ b/sonoff/user_config.h @@ -280,6 +280,7 @@ #define USE_NOVA_SDS // Add support for SDS011 and SDS021 particle concentration sensor (+0k7 code) #define USE_PZEM004T // Add support for PZEM004T Energy monitor (+2k code) #define USE_SERIAL_BRIDGE // Add support for software Serial Bridge (+0k8 code) +#define USE_SDM120 // Add support for Eastron SDM120-Modbus energy meter (+1k2 code) // -- Low level interface devices ----------------- #define USE_IR_REMOTE // Send IR remote commands using library IRremoteESP8266 and ArduinoJson (+4k code, 0k3 mem, 48 iram) diff --git a/sonoff/webserver.ino b/sonoff/webserver.ino index 0439ae509409..7fe81701cd75 100644 --- a/sonoff/webserver.ino +++ b/sonoff/webserver.ino @@ -740,7 +740,7 @@ void HandleModuleConfiguration() for (byte i = 0; i < MAX_GPIO_PIN; i++) { if (GPIO_USER == cmodule.gp.io[i]) { snprintf_P(stemp, 3, PINS_WEMOS +i*2); - snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("