Skip to content

Commit 80ad5c7

Browse files
arendstarendst
authored
Merge pull request arendst#3610 from Dees7/development
SDM220 Support
2 parents c96e1a9 + d1186f6 commit 80ad5c7

22 files changed

+315
-47
lines changed

‎sonoff/i18n.h

+6
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,12 @@
4949
#define D_JSON_COUNT "Count"
5050
#define D_JSON_COUNTER "Counter"
5151
#define D_JSON_CURRENT "Current" // As in Voltage and Current
52+
#define D_JSON_PHASE_ANGLE "Phase angle"
53+
#define D_JSON_IMPORT_ACTIVE "Import Active Power"
54+
#define D_JSON_EXPORT_ACTIVE "Export Active Power"
55+
#define D_JSON_IMPORT_REACTIVE "Import Reactive Power"
56+
#define D_JSON_EXPORT_REACTIVE "Export Reactive Power"
57+
#define D_JSON_TOTAL_REACTIVE "Total Reactive Power"
5258
#define D_JSON_DATA "Data"
5359
#define D_JSON_DISTANCE "Distance"
5460
#define D_JSON_DNSSERVER "DNSServer"

‎sonoff/language/bg-BG.h

+12-2
Original file line numberDiff line numberDiff line change
@@ -515,8 +515,8 @@
515515
#define D_SENSOR_SBR_TX "SerBr Tx"
516516
#define D_SENSOR_SR04_TRIG "SR04 Tri"
517517
#define D_SENSOR_SR04_ECHO "SR04 Ech"
518-
#define D_SENSOR_SDM120_TX "SDM120 Tx"
519-
#define D_SENSOR_SDM120_RX "SDM120 Rx"
518+
#define D_SENSOR_SDM120_TX "SDM120/220 Tx"
519+
#define D_SENSOR_SDM120_RX "SDM120/220 Rx"
520520
#define D_SENSOR_SDM630_TX "SDM630 Tx"
521521
#define D_SENSOR_SDM630_RX "SDM630 Rx"
522522
#define D_SENSOR_TM1638_CLK "TM16 CLK"
@@ -593,4 +593,14 @@
593593
#define D_LOG_UPNP "UPP: " // UPnP
594594
#define D_LOG_WIFI "WIF: " // Wifi
595595

596+
//SDM220
597+
#define D_PHASE_ANGLE "Phase Angle"
598+
#define D_IMPORT_ACTIVE "Import Active"
599+
#define D_EXPORT_ACTIVE "Export Active"
600+
#define D_IMPORT_REACTIVE "Import Reactive"
601+
#define D_EXPORT_REACTIVE "Export Reactive"
602+
#define D_TOTAL_REACTIVE "Total Reactive"
603+
#define D_UNIT_KWARH "kVArh"
604+
#define D_UNIT_ANGLE "Deg"
605+
596606
#endif // _LANGUAGE_BG_BG_H_

‎sonoff/language/cs-CZ.h

+12-2
Original file line numberDiff line numberDiff line change
@@ -515,8 +515,8 @@
515515
#define D_SENSOR_SBR_TX "SerBr Tx"
516516
#define D_SENSOR_SR04_TRIG "SR04 Tri"
517517
#define D_SENSOR_SR04_ECHO "SR04 Ech"
518-
#define D_SENSOR_SDM120_TX "SDM120 Tx"
519-
#define D_SENSOR_SDM120_RX "SDM120 Rx"
518+
#define D_SENSOR_SDM120_TX "SDM120/220 Tx"
519+
#define D_SENSOR_SDM120_RX "SDM120/220 Rx"
520520
#define D_SENSOR_SDM630_TX "SDM630 Tx"
521521
#define D_SENSOR_SDM630_RX "SDM630 Rx"
522522
#define D_SENSOR_TM1638_CLK "TM16 CLK"
@@ -593,4 +593,14 @@
593593
#define D_LOG_UPNP "UPP: " // UPnP
594594
#define D_LOG_WIFI "WIF: " // Wifi
595595

596+
//SDM220
597+
#define D_PHASE_ANGLE "Phase Angle"
598+
#define D_IMPORT_ACTIVE "Import Active"
599+
#define D_EXPORT_ACTIVE "Export Active"
600+
#define D_IMPORT_REACTIVE "Import Reactive"
601+
#define D_EXPORT_REACTIVE "Export Reactive"
602+
#define D_TOTAL_REACTIVE "Total Reactive"
603+
#define D_UNIT_KWARH "kVArh"
604+
#define D_UNIT_ANGLE "Deg"
605+
596606
#endif // _LANGUAGE_CS_CZ_H_

‎sonoff/language/de-DE.h

+12-2
Original file line numberDiff line numberDiff line change
@@ -515,8 +515,8 @@
515515
#define D_SENSOR_SBR_TX "SerBr Tx"
516516
#define D_SENSOR_SR04_TRIG "SR04 Tri"
517517
#define D_SENSOR_SR04_ECHO "SR04 Ech"
518-
#define D_SENSOR_SDM120_TX "SDM120 Tx"
519-
#define D_SENSOR_SDM120_RX "SDM120 Rx"
518+
#define D_SENSOR_SDM120_TX "SDM120/220 Tx"
519+
#define D_SENSOR_SDM120_RX "SDM120/220 Rx"
520520
#define D_SENSOR_SDM630_TX "SDM630 Tx"
521521
#define D_SENSOR_SDM630_RX "SDM630 Rx"
522522
#define D_SENSOR_TM1638_CLK "TM16 CLK"
@@ -593,4 +593,14 @@
593593
#define D_LOG_UPNP "UPP: " // UPnP
594594
#define D_LOG_WIFI "WIF: " // Wifi
595595

596+
//SDM220
597+
#define D_PHASE_ANGLE "Phase Angle"
598+
#define D_IMPORT_ACTIVE "Import Active"
599+
#define D_EXPORT_ACTIVE "Export Active"
600+
#define D_IMPORT_REACTIVE "Import Reactive"
601+
#define D_EXPORT_REACTIVE "Export Reactive"
602+
#define D_TOTAL_REACTIVE "Total Reactive"
603+
#define D_UNIT_KWARH "kVArh"
604+
#define D_UNIT_ANGLE "Deg"
605+
596606
#endif // _LANGUAGE_DE_DE_H_

‎sonoff/language/el-GR.h

+12-2
Original file line numberDiff line numberDiff line change
@@ -515,8 +515,8 @@
515515
#define D_SENSOR_SBR_TX "SerBr Tx"
516516
#define D_SENSOR_SR04_TRIG "SR04 Tri"
517517
#define D_SENSOR_SR04_ECHO "SR04 Ech"
518-
#define D_SENSOR_SDM120_TX "SDM120 Tx"
519-
#define D_SENSOR_SDM120_RX "SDM120 Rx"
518+
#define D_SENSOR_SDM120_TX "SDM120/220 Tx"
519+
#define D_SENSOR_SDM120_RX "SDM120/220 Rx"
520520
#define D_SENSOR_SDM630_TX "SDM630 Tx"
521521
#define D_SENSOR_SDM630_RX "SDM630 Rx"
522522
#define D_SENSOR_TM1638_CLK "TM16 CLK"
@@ -593,4 +593,14 @@
593593
#define D_LOG_UPNP "UPP: " // UPnP
594594
#define D_LOG_WIFI "WIF: " // Wifi
595595

596+
//SDM220
597+
#define D_PHASE_ANGLE "Phase Angle"
598+
#define D_IMPORT_ACTIVE "Import Active"
599+
#define D_EXPORT_ACTIVE "Export Active"
600+
#define D_IMPORT_REACTIVE "Import Reactive"
601+
#define D_EXPORT_REACTIVE "Export Reactive"
602+
#define D_TOTAL_REACTIVE "Total Reactive"
603+
#define D_UNIT_KWARH "kVArh"
604+
#define D_UNIT_ANGLE "Deg"
605+
596606
#endif // _LANGUAGE_EL_GR_H_

‎sonoff/language/en-GB.h

+11-2
Original file line numberDiff line numberDiff line change
@@ -515,8 +515,8 @@
515515
#define D_SENSOR_SBR_TX "SerBr Tx"
516516
#define D_SENSOR_SR04_TRIG "SR04 Tri"
517517
#define D_SENSOR_SR04_ECHO "SR04 Ech"
518-
#define D_SENSOR_SDM120_TX "SDM120 Tx"
519-
#define D_SENSOR_SDM120_RX "SDM120 Rx"
518+
#define D_SENSOR_SDM120_TX "SDM120/220 Tx"
519+
#define D_SENSOR_SDM120_RX "SDM120/220 Rx"
520520
#define D_SENSOR_SDM630_TX "SDM630 Tx"
521521
#define D_SENSOR_SDM630_RX "SDM630 Rx"
522522
#define D_SENSOR_TM1638_CLK "TM16 CLK"
@@ -594,4 +594,13 @@
594594
#define D_LOG_UPNP "UPP: " // UPnP
595595
#define D_LOG_WIFI "WIF: " // Wifi
596596

597+
#define D_PHASE_ANGLE "Phase Angle"
598+
#define D_IMPORT_ACTIVE "Import Active"
599+
#define D_EXPORT_ACTIVE "Export Active"
600+
#define D_IMPORT_REACTIVE "Import Reactive"
601+
#define D_EXPORT_REACTIVE "Export Reactive"
602+
#define D_TOTAL_REACTIVE "Total Reactive"
603+
#define D_UNIT_KWARH "kVArh"
604+
#define D_UNIT_ANGLE "Deg"
605+
597606
#endif // _LANGUAGE_EN_GB_H_

‎sonoff/language/es-AR.h

+12-2
Original file line numberDiff line numberDiff line change
@@ -515,8 +515,8 @@
515515
#define D_SENSOR_SBR_TX "SerBr Tx"
516516
#define D_SENSOR_SR04_TRIG "SR04 Tri"
517517
#define D_SENSOR_SR04_ECHO "SR04 Ech"
518-
#define D_SENSOR_SDM120_TX "SDM120 Tx"
519-
#define D_SENSOR_SDM120_RX "SDM120 Rx"
518+
#define D_SENSOR_SDM120_TX "SDM120/220 Tx"
519+
#define D_SENSOR_SDM120_RX "SDM120/220 Rx"
520520
#define D_SENSOR_SDM630_TX "SDM630 Tx"
521521
#define D_SENSOR_SDM630_RX "SDM630 Rx"
522522
#define D_SENSOR_TM1638_CLK "TM16 CLK"
@@ -593,4 +593,14 @@
593593
#define D_LOG_UPNP "UPP: " // UPnP
594594
#define D_LOG_WIFI "WIF: " // Wifi
595595

596+
//SDM220
597+
#define D_PHASE_ANGLE "Phase Angle"
598+
#define D_IMPORT_ACTIVE "Import Active"
599+
#define D_EXPORT_ACTIVE "Export Active"
600+
#define D_IMPORT_REACTIVE "Import Reactive"
601+
#define D_EXPORT_REACTIVE "Export Reactive"
602+
#define D_TOTAL_REACTIVE "Total Reactive"
603+
#define D_UNIT_KWARH "kVArh"
604+
#define D_UNIT_ANGLE "Deg"
605+
596606
#endif // _LANGUAGE_ES_AR_H_

‎sonoff/language/fr-FR.h

+12-2
Original file line numberDiff line numberDiff line change
@@ -515,8 +515,8 @@
515515
#define D_SENSOR_SBR_TX "SerBr Tx"
516516
#define D_SENSOR_SR04_TRIG "SR04 Tri"
517517
#define D_SENSOR_SR04_ECHO "SR04 Ech"
518-
#define D_SENSOR_SDM120_TX "SDM120 Tx"
519-
#define D_SENSOR_SDM120_RX "SDM120 Rx"
518+
#define D_SENSOR_SDM120_TX "SDM120/220 Tx"
519+
#define D_SENSOR_SDM120_RX "SDM120/220 Rx"
520520
#define D_SENSOR_SDM630_TX "SDM630 Tx"
521521
#define D_SENSOR_SDM630_RX "SDM630 Rx"
522522
#define D_SENSOR_TM1638_CLK "TM16 CLK"
@@ -593,4 +593,14 @@
593593
#define D_LOG_UPNP "UPP: " // UPnP
594594
#define D_LOG_WIFI "WIF: " // Wifi
595595

596+
//SDM220
597+
#define D_PHASE_ANGLE "Phase Angle"
598+
#define D_IMPORT_ACTIVE "Import Active"
599+
#define D_EXPORT_ACTIVE "Export Active"
600+
#define D_IMPORT_REACTIVE "Import Reactive"
601+
#define D_EXPORT_REACTIVE "Export Reactive"
602+
#define D_TOTAL_REACTIVE "Total Reactive"
603+
#define D_UNIT_KWARH "kVArh"
604+
#define D_UNIT_ANGLE "Deg"
605+
596606
#endif // _LANGUAGE_FR_FR_H_

‎sonoff/language/he-HE.h

+12-2
Original file line numberDiff line numberDiff line change
@@ -515,8 +515,8 @@
515515
#define D_SENSOR_SBR_TX "SerBr Tx"
516516
#define D_SENSOR_SR04_TRIG "SR04 Tri"
517517
#define D_SENSOR_SR04_ECHO "SR04 Ech"
518-
#define D_SENSOR_SDM120_TX "SDM120 Tx"
519-
#define D_SENSOR_SDM120_RX "SDM120 Rx"
518+
#define D_SENSOR_SDM120_TX "SDM120/220 Tx"
519+
#define D_SENSOR_SDM120_RX "SDM120/220 Rx"
520520
#define D_SENSOR_SDM630_TX "SDM630 Tx"
521521
#define D_SENSOR_SDM630_RX "SDM630 Rx"
522522
#define D_SENSOR_TM1638_CLK "TM16 CLK"
@@ -593,4 +593,14 @@
593593
#define D_LOG_UPNP "UPP: " // UPnP
594594
#define D_LOG_WIFI "WIF: " // Wifi
595595

596+
//SDM220
597+
#define D_PHASE_ANGLE "Phase Angle"
598+
#define D_IMPORT_ACTIVE "Import Active"
599+
#define D_EXPORT_ACTIVE "Export Active"
600+
#define D_IMPORT_REACTIVE "Import Reactive"
601+
#define D_EXPORT_REACTIVE "Export Reactive"
602+
#define D_TOTAL_REACTIVE "Total Reactive"
603+
#define D_UNIT_KWARH "kVArh"
604+
#define D_UNIT_ANGLE "Deg"
605+
596606
#endif // _LANGUAGE_HE_HE_H_

‎sonoff/language/hu-HU.h

+12-2
Original file line numberDiff line numberDiff line change
@@ -515,8 +515,8 @@
515515
#define D_SENSOR_SBR_TX "SerBr Tx"
516516
#define D_SENSOR_SR04_TRIG "SR04 Tri"
517517
#define D_SENSOR_SR04_ECHO "SR04 Ech"
518-
#define D_SENSOR_SDM120_TX "SDM120 Tx"
519-
#define D_SENSOR_SDM120_RX "SDM120 Rx"
518+
#define D_SENSOR_SDM120_TX "SDM120/220 Tx"
519+
#define D_SENSOR_SDM120_RX "SDM120/220 Rx"
520520
#define D_SENSOR_SDM630_TX "SDM630 Tx"
521521
#define D_SENSOR_SDM630_RX "SDM630 Rx"
522522
#define D_SENSOR_TM1638_CLK "TM16 CLK"
@@ -593,4 +593,14 @@
593593
#define D_LOG_UPNP "UPP: " // UPnP
594594
#define D_LOG_WIFI "WIF: " // Wifi
595595

596+
//SDM220
597+
#define D_PHASE_ANGLE "Phase Angle"
598+
#define D_IMPORT_ACTIVE "Import Active"
599+
#define D_EXPORT_ACTIVE "Export Active"
600+
#define D_IMPORT_REACTIVE "Import Reactive"
601+
#define D_EXPORT_REACTIVE "Export Reactive"
602+
#define D_TOTAL_REACTIVE "Total Reactive"
603+
#define D_UNIT_KWARH "kVArh"
604+
#define D_UNIT_ANGLE "Deg"
605+
596606
#endif // _LANGUAGE_HU_HU_H_

‎sonoff/language/it-IT.h

+12-2
Original file line numberDiff line numberDiff line change
@@ -515,8 +515,8 @@
515515
#define D_SENSOR_SBR_TX "SerBr Tx"
516516
#define D_SENSOR_SR04_TRIG "SR04 Tri"
517517
#define D_SENSOR_SR04_ECHO "SR04 Ech"
518-
#define D_SENSOR_SDM120_TX "SDM120 Tx"
519-
#define D_SENSOR_SDM120_RX "SDM120 Rx"
518+
#define D_SENSOR_SDM120_TX "SDM120/220 Tx"
519+
#define D_SENSOR_SDM120_RX "SDM120/220 Rx"
520520
#define D_SENSOR_SDM630_TX "SDM630 Tx"
521521
#define D_SENSOR_SDM630_RX "SDM630 Rx"
522522
#define D_SENSOR_TM1638_CLK "TM16 CLK"
@@ -593,4 +593,14 @@
593593
#define D_LOG_UPNP "UPP: " // UPnP
594594
#define D_LOG_WIFI "WIF: " // Wifi
595595

596+
//SDM220
597+
#define D_PHASE_ANGLE "Phase Angle"
598+
#define D_IMPORT_ACTIVE "Import Active"
599+
#define D_EXPORT_ACTIVE "Export Active"
600+
#define D_IMPORT_REACTIVE "Import Reactive"
601+
#define D_EXPORT_REACTIVE "Export Reactive"
602+
#define D_TOTAL_REACTIVE "Total Reactive"
603+
#define D_UNIT_KWARH "kVArh"
604+
#define D_UNIT_ANGLE "Deg"
605+
596606
#endif // _LANGUAGE_IT_IT_H_

‎sonoff/language/nl-NL.h

+12-2
Original file line numberDiff line numberDiff line change
@@ -515,8 +515,8 @@
515515
#define D_SENSOR_SBR_TX "SerBr Tx"
516516
#define D_SENSOR_SR04_TRIG "SR04 Tri"
517517
#define D_SENSOR_SR04_ECHO "SR04 Ech"
518-
#define D_SENSOR_SDM120_TX "SDM120 Tx"
519-
#define D_SENSOR_SDM120_RX "SDM120 Rx"
518+
#define D_SENSOR_SDM120_TX "SDM120/220 Tx"
519+
#define D_SENSOR_SDM120_RX "SDM120/220 Rx"
520520
#define D_SENSOR_SDM630_TX "SDM630 Tx"
521521
#define D_SENSOR_SDM630_RX "SDM630 Rx"
522522
#define D_SENSOR_TM1638_CLK "TM16 CLK"
@@ -593,4 +593,14 @@
593593
#define D_LOG_UPNP "UPP: " // UPnP
594594
#define D_LOG_WIFI "WIF: " // Wifi
595595

596+
//SDM220
597+
#define D_PHASE_ANGLE "Phase Angle"
598+
#define D_IMPORT_ACTIVE "Import Active"
599+
#define D_EXPORT_ACTIVE "Export Active"
600+
#define D_IMPORT_REACTIVE "Import Reactive"
601+
#define D_EXPORT_REACTIVE "Export Reactive"
602+
#define D_TOTAL_REACTIVE "Total Reactive"
603+
#define D_UNIT_KWARH "kVArh"
604+
#define D_UNIT_ANGLE "Deg"
605+
596606
#endif // _LANGUAGE_NL_NL_H_

‎sonoff/language/pl-PL.h

+12-2
Original file line numberDiff line numberDiff line change
@@ -515,8 +515,8 @@
515515
#define D_SENSOR_SBR_TX "SerBr Tx"
516516
#define D_SENSOR_SR04_TRIG "SR04 Tri"
517517
#define D_SENSOR_SR04_ECHO "SR04 Ech"
518-
#define D_SENSOR_SDM120_TX "SDM120 Tx"
519-
#define D_SENSOR_SDM120_RX "SDM120 Rx"
518+
#define D_SENSOR_SDM120_TX "SDM120/220 Tx"
519+
#define D_SENSOR_SDM120_RX "SDM120/220 Rx"
520520
#define D_SENSOR_SDM630_TX "SDM630 Tx"
521521
#define D_SENSOR_SDM630_RX "SDM630 Rx"
522522
#define D_SENSOR_TM1638_CLK "TM16 CLK"
@@ -593,4 +593,14 @@
593593
#define D_LOG_UPNP "UPP: " // UPnP
594594
#define D_LOG_WIFI "WIF: " // Wifi
595595

596+
//SDM220
597+
#define D_PHASE_ANGLE "Phase Angle"
598+
#define D_IMPORT_ACTIVE "Import Active"
599+
#define D_EXPORT_ACTIVE "Export Active"
600+
#define D_IMPORT_REACTIVE "Import Reactive"
601+
#define D_EXPORT_REACTIVE "Export Reactive"
602+
#define D_TOTAL_REACTIVE "Total Reactive"
603+
#define D_UNIT_KWARH "kVArh"
604+
#define D_UNIT_ANGLE "Deg"
605+
596606
#endif // _LANGUAGE_PL_PL_D_H_

‎sonoff/language/pt-BR.h

+12-2
Original file line numberDiff line numberDiff line change
@@ -515,8 +515,8 @@
515515
#define D_SENSOR_SBR_TX "SerBr Tx"
516516
#define D_SENSOR_SR04_TRIG "SR04 Tri"
517517
#define D_SENSOR_SR04_ECHO "SR04 Ech"
518-
#define D_SENSOR_SDM120_TX "SDM120 Tx"
519-
#define D_SENSOR_SDM120_RX "SDM120 Rx"
518+
#define D_SENSOR_SDM120_TX "SDM120/220 Tx"
519+
#define D_SENSOR_SDM120_RX "SDM120/220 Rx"
520520
#define D_SENSOR_SDM630_TX "SDM630 Tx"
521521
#define D_SENSOR_SDM630_RX "SDM630 Rx"
522522
#define D_SENSOR_TM1638_CLK "TM16 CLK"
@@ -593,4 +593,14 @@
593593
#define D_LOG_UPNP "UPP: " // UPnP
594594
#define D_LOG_WIFI "WIF: " // Wifi
595595

596+
//SDM220
597+
#define D_PHASE_ANGLE "Phase Angle"
598+
#define D_IMPORT_ACTIVE "Import Active"
599+
#define D_EXPORT_ACTIVE "Export Active"
600+
#define D_IMPORT_REACTIVE "Import Reactive"
601+
#define D_EXPORT_REACTIVE "Export Reactive"
602+
#define D_TOTAL_REACTIVE "Total Reactive"
603+
#define D_UNIT_KWARH "kVArh"
604+
#define D_UNIT_ANGLE "Deg"
605+
596606
#endif // _LANGUAGE_PT_BR_H_

‎sonoff/language/pt-PT.h

+12-2
Original file line numberDiff line numberDiff line change
@@ -515,8 +515,8 @@
515515
#define D_SENSOR_SBR_TX "SerBr Tx"
516516
#define D_SENSOR_SR04_TRIG "SR04 Tri"
517517
#define D_SENSOR_SR04_ECHO "SR04 Ech"
518-
#define D_SENSOR_SDM120_TX "SDM120 Tx"
519-
#define D_SENSOR_SDM120_RX "SDM120 Rx"
518+
#define D_SENSOR_SDM120_TX "SDM120/220 Tx"
519+
#define D_SENSOR_SDM120_RX "SDM120/220 Rx"
520520
#define D_SENSOR_SDM630_TX "SDM630 Tx"
521521
#define D_SENSOR_SDM630_RX "SDM630 Rx"
522522
#define D_SENSOR_TM1638_CLK "TM16 CLK"
@@ -594,4 +594,14 @@
594594
#define D_LOG_UPNP "UPP: " // UPnP
595595
#define D_LOG_WIFI "WIF: " // Wifi
596596

597+
//SDM220
598+
#define D_PHASE_ANGLE "Phase Angle"
599+
#define D_IMPORT_ACTIVE "Import Active"
600+
#define D_EXPORT_ACTIVE "Export Active"
601+
#define D_IMPORT_REACTIVE "Import Reactive"
602+
#define D_EXPORT_REACTIVE "Export Reactive"
603+
#define D_TOTAL_REACTIVE "Total Reactive"
604+
#define D_UNIT_KWARH "kVArh"
605+
#define D_UNIT_ANGLE "Deg"
606+
597607
#endif // _LANGUAGE_PT_PT_H_

0 commit comments

Comments
 (0)