Merge pull request #221 from git-kick/Issue#217

Issue#217

README.md

@@ -154,7 +154,7 @@ The RSCP protocol groups *Tags* (i.e. states or values) into *Namespaces* (i.e.
   <tr>
     <td>PM</td>
     <td>Power Meter</td>
-    <td>not supported (yet)</td>
+    <td>partially supported (REQ tags ok, SET tags not implemented yet)</td>
   </tr>
   <tr>
     <td>DB</td>
@@ -462,6 +462,13 @@ Here is a sample script for charge limit control - it is not meant for as-is usa
 <a name="log"></a>
 
 ## Changelog
+### 1.3.0
+
+MODIFIED ADAPTER SETTINGS - do not re-use settings stored in json-file!
+
+(git-kick)
+* Fixed [Issue #217](https://github.com/git-kick/ioBroker.e3dc-rscp/issues/217) - added PM (power meter) namespace. **Only reading values, no SET tags.**
+
 ### 1.2.6
 
 (git-kick)

admin/i18n/de/translations.json

@@ -1,5 +1,6 @@
 {
     "A35_SERIAL_NUMBER": "A35 Seriennummer",
+    "ACTIVE_PHASES": "Aktive Phasen",
     "AC_APPARENTPOWER": "AC Scheinleistung",
     "AC_CURRENT": "AC Wechselstrom",
     "AC_ENERGY_ALL": "AC Energie gesamt",
@@ -117,6 +118,9 @@
     "END_HOUR": "Ende Stunde",
     "END_MINUTE": "Ende Minute",
     "ENERGY_ALL": "Energie gesamt",
+    "ENERGY_L1": "Energie an L1",
+    "ENERGY_L2": "Energie an L2",
+    "ENERGY_L3": "Energie an L3",
     "ENERGY_SOLAR": "Energie solar",
     "EOD_VOLTAGE": "Entladeschlussspannung",
     "EP": "Notstrom",
@@ -136,6 +140,7 @@
     "EXT_SRC_AVAILABLE": "Externe Quelle verfügbar",
     "E_MAIL": "E-Mail-Adresse",
     "FCC": "Gesamtkapazität",
+    "FIRMWARE_VERSION": "Firmware Version",
     "FLASH_VERSION": "Flash-Version",
     "FON": "Telefonnummer",
     "FREQUENCY_OVER": "Frequenz oberhalb [Hz]",
@@ -146,6 +151,7 @@
     "FS_USE_PERCENT": "Filesystem Anteil belegt",
     "GATEWAY": "Gateway IP-Adresse",
     "GENERAL_ERROR": "Allgemeiner Fehler",
+    "GET_PHASE_ELIMINATION": "Phaseneliminierung",
     "GRAPH_INDEX": "Relative Position im Graph",
     "GRID_POWER_IN": "Netzeinspeisung",
     "GRID_POWER_OUT": "Netzbezug",
@@ -191,7 +197,7 @@
     "MAX_TEMPERATURE": "Maximale Temperatur",
     "MIN_DCB_CELL_TEMPERATURE": "Minimale DCB-Zelltemperatur",
     "MIN_TEMPERATURE": "Mindesttemperatur",
-    "MODE": "Lademodus (empfangen)",
+    "MODE": "Modus (empfangen)",
     "MODULE": "Modul",
     "MODULE_VOLTAGE": "Modulspannung",
     "NAME": "Name",
@@ -207,6 +213,7 @@
     "PARAM_TIME_LAST_EMPTY": "Batterie zuletzt leer",
     "PARAM_TIME_LAST_FULL": "Batterie zuletzt voll",
     "PARAM_TIME_TO_RETRY": "Zeit bis zur Wiederholung",
+    "PM": "Leistungsmesser",
     "PM_0_POWER": "PM0 Energie",
     "PM_1_POWER": "PM1 Energie",
     "PM_ACTIVE_PHASES": "PM aktive Phasen",
@@ -215,7 +222,7 @@
     "PM_DEVICE_STATE_CONNECTED": "PM gerät zustand verbunden",
     "PM_DEVICE_STATE_IN_SERVICE": "PM Gerätestatus in Betrieb",
     "PM_DEVICE_STATE_WORKING": "PM-Gerät Zustand arbeiten",
-    "PM_ENERGY_L1": "PM-Energie L1",
+    "PM_ENERGY_L1": "PM Energie L1",
     "PM_ENERGY_L2": "PM Energie L2",
     "PM_ENERGY_L3": "PM Energie L3",
     "PM_ERROR_CODE": "PM Fehlercode",
@@ -231,6 +238,9 @@
     "POWER_BAT": "Leistung an Batterie",
     "POWER_GRID": "Leistung vom Netz",
     "POWER_HOME": "Leistung an Haus",
+    "POWER_L1": "Leistung an L1",
+    "POWER_L2": "Leistung an L2",
+    "POWER_L3": "Leistung an L3",
     "POWER_LIMITS_USED": "Leistungs-Limits aktiviert",
     "POWER_MODE": "Power-Modus",
     "POWER_PV": "Leistung von PV",
@@ -304,6 +314,9 @@
     "VERSION": "Version",
     "VERSION_MAIN": "Hauptversion",
     "VERSION_PIC": "PIC-version",
+    "VOLTAGE_L1": "Spannung an L1",
+    "VOLTAGE_L2": "Spannung an L2",
+    "VOLTAGE_L3": "Spannung an L3",
     "VOLTAGE_MONITORING_SLOPE_DOWN": "Spannungsüberwachung abfallend",
     "VOLTAGE_MONITORING_SLOPE_UP": "Spannungsüberwachung ansteigend",
     "VOLTAGE_MONITORING_THRESHOLD_BOTTOM": "Spannungsüberwachung untere Schwelle",
@@ -344,6 +357,7 @@
     "query_ems": "EMS (Energiemanagementsystem)",
     "query_ep": "EP (Notstrom)",
     "query_info": "INFO (Information)",
+    "query_pm": "PM (Leistungsmesser)",
     "query_pvi": "PVI (Wechselrichter)",
     "query_sys": "SYS (System)",
     "query_wb": "WB (Wallbox)",

admin/i18n/en/translations.json

@@ -1,5 +1,6 @@
 {
     "A35_SERIAL_NUMBER": "A35 serial number",
+    "ACTIVE_PHASES": "Active phases",
     "AC_APPARENTPOWER": "AC apparent power",
     "AC_CURRENT": "AC current",
     "AC_ENERGY_ALL": "AC energy all",
@@ -117,6 +118,9 @@
     "END_HOUR": "End hour",
     "END_MINUTE": "End minute",
     "ENERGY_ALL": "Energy all",
+    "ENERGY_L1": "Energy at L1",
+    "ENERGY_L2": "Energy at L2",
+    "ENERGY_L3": "Energy at L3",
     "ENERGY_SOLAR": "Energy solar",
     "EOD_VOLTAGE": "End of discharge voltage",
     "EP": "Emergency power",
@@ -136,6 +140,7 @@
     "EXT_SRC_AVAILABLE": "External source available",
     "E_MAIL": "E-mail",
     "FCC": "Full charge capacity",
+    "FIRMWARE_VERSION": "Firmware version",
     "FLASH_VERSION": "Flash version",
     "FON": "Phone number",
     "FREQUENCY_OVER": "Frequency over",
@@ -146,6 +151,7 @@
     "FS_USE_PERCENT": "File system percentage used",
     "GATEWAY": "Gateway IP address",
     "GENERAL_ERROR": "General error",
+    "GET_PHASE_ELIMINATION": "Get phase elimination",
     "GRAPH_INDEX": "Relative position in graph",
     "GRID_POWER_IN": "Energy to grid",
     "GRID_POWER_OUT": "Energy from grid",
@@ -207,6 +213,7 @@
     "PARAM_TIME_LAST_EMPTY": "Latest battery empty timestamp",
     "PARAM_TIME_LAST_FULL": "Latest battery full timestamp",
     "PARAM_TIME_TO_RETRY": "Time to retry",
+    "PM": "Power meter",
     "PM_0_POWER": "PM0 energy",
     "PM_1_POWER": "PM1 energy",
     "PM_ACTIVE_PHASES": "PM active phases",
@@ -231,6 +238,9 @@
     "POWER_BAT": "Power to battery",
     "POWER_GRID": "Power from grid",
     "POWER_HOME": "Power to home",
+    "POWER_L1": "Power at L1",
+    "POWER_L2": "Power at L2",
+    "POWER_L3": "Power at L3",
     "POWER_LIMITS_USED": "Power limits used",
     "POWER_MODE": "Power mode",
     "POWER_PV": "Power from PV",
@@ -304,6 +314,9 @@
     "VERSION": "Version",
     "VERSION_MAIN": "Main version",
     "VERSION_PIC": "PIC version",
+    "VOLTAGE_L1": "Voltage at L1",
+    "VOLTAGE_L2": "Voltage at L2",
+    "VOLTAGE_L3": "Voltage at L3",
     "VOLTAGE_MONITORING_SLOPE_DOWN": "Voltage monitoring slope down",
     "VOLTAGE_MONITORING_SLOPE_UP": "Voltage monitoring slope up",
     "VOLTAGE_MONITORING_THRESHOLD_BOTTOM": "Voltage monitoring threshold bottom",
@@ -344,6 +357,7 @@
     "query_ems": "EMS (energy management system)",
     "query_ep": "EP (emergency power)",
     "query_info": "INFO (information)",
+    "query_pm": "PM (power meter)",
     "query_pvi": "PVI (photovoltaic inverter)",
     "query_sys": "SYS (system)",
     "query_wb": "WB (wallbox)",

admin/i18n/es/translations.json

@@ -1,5 +1,6 @@
 {
     "A35_SERIAL_NUMBER": "Número de serie A35",
+    "ACTIVE_PHASES": "Fases activas",
     "AC_APPARENTPOWER": "Potencia aparente de CA [VA]",
     "AC_CURRENT": "Corriente alterna [A]",
     "AC_ENERGY_ALL": "Energía de CA todos [kWh]",
@@ -117,6 +118,9 @@
     "END_HOUR": "Hora final",
     "END_MINUTE": "Final minuto",
     "ENERGY_ALL": "La energía",
+    "ENERGY_L1": "Energía en L1",
+    "ENERGY_L2": "Energía en L2",
+    "ENERGY_L3": "Energía en L3",
     "ENERGY_SOLAR": "Energía solar",
     "EOD_VOLTAGE": "Tensión final de descarga [V]",
     "EP": "Energía de emergencia",
@@ -136,6 +140,7 @@
     "EXT_SRC_AVAILABLE": "Fuente externa disponible",
     "E_MAIL": "Correo electrónico",
     "FCC": "FCC",
+    "FIRMWARE_VERSION": "Versión de firmware",
     "FLASH_VERSION": "Versión Flash",
     "FON": "Número de teléfono",
     "FREQUENCY_OVER": "Frecuencia sobre",
@@ -146,6 +151,7 @@
     "FS_USE_PERCENT": "Porcentaje de sistema de archivos utilizado",
     "GATEWAY": "Dirección IP de la puerta de enlace",
     "GENERAL_ERROR": "Error general",
+    "GET_PHASE_ELIMINATION": "Obtener eliminación de fase",
     "GRAPH_INDEX": "Posición relativa en el gráfico",
     "GRID_POWER_IN": "Energía de la red",
     "GRID_POWER_OUT": "Energía a la red",
@@ -207,6 +213,7 @@
     "PARAM_TIME_LAST_EMPTY": "Última marca de tiempo vacía de la batería",
     "PARAM_TIME_LAST_FULL": "Última marca de tiempo completa de la batería",
     "PARAM_TIME_TO_RETRY": "Es hora de volver a intentarlo",
+    "PM": "Contador de potencia",
     "PM_0_POWER": "Potencia PM0",
     "PM_1_POWER": "Potencia PM1",
     "PM_ACTIVE_PHASES": "PM fases activas",
@@ -231,6 +238,9 @@
     "POWER_BAT": "Energía a la batería [W]",
     "POWER_GRID": "Energía de la red [W]",
     "POWER_HOME": "Energía para el hogar [W]",
+    "POWER_L1": "Potencia en L1",
+    "POWER_L2": "Potencia en L2",
+    "POWER_L3": "Potencia en L3",
     "POWER_LIMITS_USED": "Límites de potencia utilizados",
     "POWER_MODE": "Modo de alimentación",
     "POWER_PV": "Energía de PV [W]",
@@ -304,6 +314,9 @@
     "VERSION": "Versión",
     "VERSION_MAIN": "Versión principal",
     "VERSION_PIC": "Versión PIC",
+    "VOLTAGE_L1": "Tensión en L1",
+    "VOLTAGE_L2": "Tensión en L2",
+    "VOLTAGE_L3": "Tensión en L3",
     "VOLTAGE_MONITORING_SLOPE_DOWN": "Monitoreo de voltaje pendiente hacia abajo",
     "VOLTAGE_MONITORING_SLOPE_UP": "Monitoreo de voltaje pendiente hacia arriba",
     "VOLTAGE_MONITORING_THRESHOLD_BOTTOM": "Umbral de monitoreo de voltaje inferior",
@@ -344,6 +357,7 @@
     "query_ems": "EMS (sistema de gestión de energía)",
     "query_ep": "EMS (sistema de gestión de energía)",
     "query_info": "INFO (información)",
+    "query_pm": "PM (medidor de potencia)",
     "query_pvi": "EMS (sistema de gestión de energía)",
     "query_sys": "SYS (sistema)",
     "query_wb": "WB (wallbox)",

admin/i18n/fr/translations.json

@@ -1,5 +1,6 @@
 {
     "A35_SERIAL_NUMBER": "Numéro de série A35",
+    "ACTIVE_PHASES": "Phases actives",
     "AC_APPARENTPOWER": "Puissance apparente CA [VA]",
     "AC_CURRENT": "Courant alternatif [A]",
     "AC_ENERGY_ALL": "Énergie CA tout [kWh]",
@@ -117,6 +118,9 @@
     "END_HOUR": "Heure de fin",
     "END_MINUTE": "Fin de la minute",
     "ENERGY_ALL": "Énergie tout",
+    "ENERGY_L1": "Énergie en L1",
+    "ENERGY_L2": "Énergie en L2",
+    "ENERGY_L3": "Énergie en L3",
     "ENERGY_SOLAR": "Énergie solaire",
     "EOD_VOLTAGE": "Tension de fin de décharge [V]",
     "EP": "Alimentation de secours",
@@ -136,6 +140,7 @@
     "EXT_SRC_AVAILABLE": "Source externe disponible",
     "E_MAIL": "Courriel",
     "FCC": "FCC",
+    "FIRMWARE_VERSION": "Version du firmware",
     "FLASH_VERSION": "Version flash",
     "FON": "Numéro de téléphone",
     "FREQUENCY_OVER": "Fréquence supérieure",
@@ -146,6 +151,7 @@
     "FS_USE_PERCENT": "Pourcentage du système de fichiers utilisé",
     "GATEWAY": "Adresse IP de la passerelle",
     "GENERAL_ERROR": "Erreur générale",
+    "GET_PHASE_ELIMINATION": "Obtenez l'élimination de phase",
     "GRAPH_INDEX": "Position relative dans le graphique",
     "GRID_POWER_IN": "Puissance du réseau",
     "GRID_POWER_OUT": "Alimentation au réseau",
@@ -207,6 +213,7 @@
     "PARAM_TIME_LAST_EMPTY": "Dernier horodatage vide de la batterie",
     "PARAM_TIME_LAST_FULL": "Dernière batterie horodatage complet",
     "PARAM_TIME_TO_RETRY": "Il est temps de réessayer",
+    "PM": "Wattmètre",
     "PM_0_POWER": "Puissance PM0",
     "PM_1_POWER": "Puissance PM1",
     "PM_ACTIVE_PHASES": "Phases actives PM",
@@ -231,6 +238,9 @@
     "POWER_BAT": "Alimentation de la batterie [W]",
     "POWER_GRID": "Puissance du réseau [W]",
     "POWER_HOME": "Puissance à la maison [W]",
+    "POWER_L1": "Puissance à L1",
+    "POWER_L2": "Puissance à L2",
+    "POWER_L3": "Puissance à L3",
     "POWER_LIMITS_USED": "Limites de puissance utilisées",
     "POWER_MODE": "Mode d'alimentation",
     "POWER_PV": "Puissance de PV [W]",
@@ -304,6 +314,9 @@
     "VERSION": "Version",
     "VERSION_MAIN": "Version principale",
     "VERSION_PIC": "Version PIC",
+    "VOLTAGE_L1": "Tension à L1",
+    "VOLTAGE_L2": "Tension à L2",
+    "VOLTAGE_L3": "Tension à L3",
     "VOLTAGE_MONITORING_SLOPE_DOWN": "Pente de surveillance de tension vers le bas",
     "VOLTAGE_MONITORING_SLOPE_UP": "Pente de surveillance de tension vers le haut",
     "VOLTAGE_MONITORING_THRESHOLD_BOTTOM": "Seuil de surveillance de la tension bas",
@@ -344,6 +357,7 @@
     "query_ems": "EMS (système de gestion de l'énergie)",
     "query_ep": "EMS (système de gestion de l'énergie)",
     "query_info": "INFO (informations)",
+    "query_pm": "PM (wattmètre)",
     "query_pvi": "EMS (système de gestion de l'énergie)",
     "query_sys": "SYS (système)",
     "query_wb": "WB (boîte murale)",

admin/i18n/it/translations.json

@@ -1,5 +1,6 @@
 {
     "A35_SERIAL_NUMBER": "Numero di serie A35",
+    "ACTIVE_PHASES": "Fasi attive",
     "AC_APPARENTPOWER": "Potenza apparente AC [VA]",
     "AC_CURRENT": "Corrente alternata [A]",
     "AC_ENERGY_ALL": "Energia CA tutti [kWh]",
@@ -117,6 +118,9 @@
     "END_HOUR": "Fine ora",
     "END_MINUTE": "Fine minuto",
     "ENERGY_ALL": "Energia tutti",
+    "ENERGY_L1": "Energia in L1",
+    "ENERGY_L2": "Energia in L2",
+    "ENERGY_L3": "Energia in L3",
     "ENERGY_SOLAR": "Energia solare",
     "EOD_VOLTAGE": "Fine della tensione di scarica [V]",
     "EP": "Alimentazione di emergenza",
@@ -136,6 +140,7 @@
     "EXT_SRC_AVAILABLE": "Fonte esterna disponibile",
     "E_MAIL": "E-mail",
     "FCC": "FCC",
+    "FIRMWARE_VERSION": "Versione del firmware",
     "FLASH_VERSION": "Versione flash",
     "FON": "Numero di telefono",
     "FREQUENCY_OVER": "Frequenza sopra",
@@ -146,6 +151,7 @@
     "FS_USE_PERCENT": "Percentuale di file system utilizzata",
     "GATEWAY": "Indirizzo IP del gateway",
     "GENERAL_ERROR": "Errore generale",
+    "GET_PHASE_ELIMINATION": "Ottieni l'eliminazione della fase",
     "GRAPH_INDEX": "Posizione relativa nel grafico",
     "GRID_POWER_IN": "Potere dalla griglia",
     "GRID_POWER_OUT": "Potenza alla rete",
@@ -207,6 +213,7 @@
     "PARAM_TIME_LAST_EMPTY": "Ultima batteria vuota timestamp",
     "PARAM_TIME_LAST_FULL": "Ultima batteria timestamp completo",
     "PARAM_TIME_TO_RETRY": "È ora di riprovare",
+    "PM": "Misuratore di potenza",
     "PM_0_POWER": "Potenza PM0",
     "PM_1_POWER": "Potenza PM1",
     "PM_ACTIVE_PHASES": "PM fasi attive",
@@ -231,6 +238,9 @@
     "POWER_BAT": "Potenza alla batteria [W]",
     "POWER_GRID": "Potenza dalla rete [W]",
     "POWER_HOME": "Potenza a casa [W]",
+    "POWER_L1": "Potenza su L1",
+    "POWER_L2": "Potenza in L2",
+    "POWER_L3": "Potenza su L3",
     "POWER_LIMITS_USED": "Limiti di potenza utilizzati",
     "POWER_MODE": "Modalità di alimentazione",
     "POWER_PV": "Potenza da PV [W]",
@@ -304,6 +314,9 @@
     "VERSION": "Versione",
     "VERSION_MAIN": "Versione principale",
     "VERSION_PIC": "Versione PIC",
+    "VOLTAGE_L1": "Tensione su L1",
+    "VOLTAGE_L2": "Tensione su L2",
+    "VOLTAGE_L3": "Tensione su L3",
     "VOLTAGE_MONITORING_SLOPE_DOWN": "Monitoraggio della tensione pendenza verso il basso",
     "VOLTAGE_MONITORING_SLOPE_UP": "Monitoraggio della tensione pendenza up",
     "VOLTAGE_MONITORING_THRESHOLD_BOTTOM": "Monitoraggio della tensione soglia inferiore",
@@ -344,6 +357,7 @@
     "query_ems": "EMS (sistema di gestione dell'energia)",
     "query_ep": "EMS (sistema di gestione dell'energia)",
     "query_info": "INFO (informazioni)",
+    "query_pm": "PM (misuratore di potenza)",
     "query_pvi": "EMS (sistema di gestione dell'energia)",
     "query_sys": "SYS (sistema)",
     "query_wb": "WB (scatola da muro)",