[goecharger] Add powerAll to thing-types (#12742)

* [goecharger] Add powerAll to thing-types

Signed-off-by: Reinhard Plaim <reinhardplaim@gmail.com>

diff --git a/bundles/org.openhab.binding.goecharger/README.md b/bundles/org.openhab.binding.goecharger/README.md
index 27c3abd8ca097c9307b60322848405f5431e9c0b..98e4f809dd3478506fc958ff637699bc27f537d5 100644 (file)
--- a/bundles/org.openhab.binding.goecharger/README.md
+++ b/bundles/org.openhab.binding.goecharger/README.md
@@ -11,7 +11,7 @@ The Go-eCharger HOMEfix with 11kW and 22kW is supported too.
 
 ## Thing Configuration
 
-The thing has two configuration parameters:
+The thing has three configuration parameters:
 
 | Parameter       | Description                                   | Required |
 |-----------------|-----------------------------------------------|----------|

diff --git a/bundles/org.openhab.binding.goecharger/src/main/resources/OH-INF/i18n/goecharger.properties b/bundles/org.openhab.binding.goecharger/src/main/resources/OH-INF/i18n/goecharger.properties
index a5cca35cff7fdcefd352a4bf714578834066eab8..063d5bf66bb90efd99b00c2369f950d8ae478a7c 100644 (file)
--- a/bundles/org.openhab.binding.goecharger/src/main/resources/OH-INF/i18n/goecharger.properties
+++ b/bundles/org.openhab.binding.goecharger/src/main/resources/OH-INF/i18n/goecharger.properties
@@ -10,23 +10,15 @@ thing-type.goecharger.goe.description = Go-eCharger thing that represents the wa
 
 # thing types config
 
-thing-type.config.goecharger.goe.ip.label = IP Address
-thing-type.config.goecharger.goe.ip.description = The IP address of the Go-eCharger
 thing-type.config.goecharger.goe.apiVersion.label = API version
 thing-type.config.goecharger.goe.apiVersion.description = The API version of the Go-eCharger
+thing-type.config.goecharger.goe.ip.label = IP Address
+thing-type.config.goecharger.goe.ip.description = The IP address of the Go-eCharger
 thing-type.config.goecharger.goe.refreshInterval.label = Refresh Interval
 thing-type.config.goecharger.goe.refreshInterval.description = Refresh interval for acquiring data from Go-eCharger in seconds
 
 # channel types
 
-channel-type.goecharger.current.label = Maximum Current
-channel-type.goecharger.current.description = Maximum current per phase allowed to use for charging
-channel-type.goecharger.maxCurrTmp.label = Maximum Current Temporary
-channel-type.goecharger.maxCurrTmp.description = Maximum current temporary (not written to EEPROM)
-channel-type.goecharger.phs.label = Phases
-channel-type.goecharger.phs.description = Amount of phases currently used for charging
-channel-type.goecharger.fs.label = Force State
-channel-type.goecharger.fs.description = Force state (Neutral=0, Off=1, On=2)
 channel-type.goecharger.alw.label = Allow Charging
 channel-type.goecharger.alw.description = If true charging is allowed
 channel-type.goecharger.ast.label = Access Configuration
@@ -43,16 +35,26 @@ channel-type.goecharger.cl2.label = Current L2
 channel-type.goecharger.cl2.description = Current on L2
 channel-type.goecharger.cl3.label = Current L3
 channel-type.goecharger.cl3.description = Current on L3
+channel-type.goecharger.current.label = Maximum Current
+channel-type.goecharger.current.description = Maximum current per phase allowed to use for charging
 channel-type.goecharger.err.label = Error Code
 channel-type.goecharger.err.description = Error code of Go-eCharger
+channel-type.goecharger.err.state.option.NONE = None
+channel-type.goecharger.err.state.option.RCCB = RCCB
+channel-type.goecharger.err.state.option.NO_GROUND = No ground
+channel-type.goecharger.err.state.option.INTERNAL = Internal
 channel-type.goecharger.eto.label = Total Charged Energy
 channel-type.goecharger.eto.description = Amount of energy that has been charged since installation
 channel-type.goecharger.fmw.label = Firmware
 channel-type.goecharger.fmw.description = Firmware Version
-channel-type.goecharger.scl.label = Current Session Charge Energy Limit
-channel-type.goecharger.scl.description = Wallbox stops charging after defined value, deactivate with value 0
-channel-type.goecharger.scs.label = Current Session Charged Energy
-channel-type.goecharger.scs.description = Amount of energy that has been charged in this session
+channel-type.goecharger.fs.label = Force state
+channel-type.goecharger.fs.description = Force state (Neutral=0, Off=1, On=2)
+channel-type.goecharger.maxCurrTmp.label = Maximum Current Temporary
+channel-type.goecharger.maxCurrTmp.description = Maximum current temporary (not written to EEPROM)
+channel-type.goecharger.pAll.label = Power All
+channel-type.goecharger.pAll.description = Power All
+channel-type.goecharger.pha.label = Phases
+channel-type.goecharger.pha.description = Amount of phases currently used for charging
 channel-type.goecharger.pl1.label = Power L1
 channel-type.goecharger.pl1.description = Power on L1
 channel-type.goecharger.pl2.label = Power L2
@@ -61,10 +63,18 @@ channel-type.goecharger.pl3.label = Power L3
 channel-type.goecharger.pl3.description = Power on L3
 channel-type.goecharger.pwm.label = PWM signal status
 channel-type.goecharger.pwm.description = Pulse-width modulation signal status
-channel-type.goecharger.tmpT2p.label = Temperature type 2 port
-channel-type.goecharger.tmpT2p.description = Temperature on the type 2 port of the Go-eCharger
+channel-type.goecharger.pwm.state.option.READY_NO_CAR = Ready (no car)
+channel-type.goecharger.pwm.state.option.CHARGING = Charging
+channel-type.goecharger.pwm.state.option.WAITING_FOR_CAR = Waiting for car
+channel-type.goecharger.pwm.state.option.CHARGING_DONE_CAR_CONNECTED = Charging done (car connected)
+channel-type.goecharger.scl.label = Current Session Charge Energy Limit
+channel-type.goecharger.scl.description = Wallbox stops charging after defined value, deactivate with value 0
+channel-type.goecharger.scs.label = Current Session Charged Energy
+channel-type.goecharger.scs.description = Amount of energy that has been charged in this session
 channel-type.goecharger.tmp.label = Temperature circuit board
-channel-type.goecharger.tmp.description = Temperature on the circuit board of the Go-eCharger
+channel-type.goecharger.tmp.description = Temperature of the Go-eCharger on circuit board
+channel-type.goecharger.tmpT2p.label = Temperature type 2 port
+channel-type.goecharger.tmpT2p.description = Temperature of the Go-eCharger on the type 2 port
 channel-type.goecharger.vl1.label = Voltage L1
 channel-type.goecharger.vl1.description = Voltage on L1
 channel-type.goecharger.vl2.label = Voltage L2
@@ -72,5 +82,6 @@ channel-type.goecharger.vl2.description = Voltage on L2
 channel-type.goecharger.vl3.label = Voltage L3
 channel-type.goecharger.vl3.description = Voltage on L3
 
-# Others
-unsuccessful.communication-error=Request response was unsuccessful
+# others
+
+unsuccessful.communication-error = Request response was unsuccessful

diff --git a/bundles/org.openhab.binding.goecharger/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.goecharger/src/main/resources/OH-INF/thing/thing-types.xml
index c92c33ecd2a775409cd2c8885bbb998d495b211a..42e7ef79ec2d9090677d283fef2a8204c003aac7 100644 (file)
--- a/bundles/org.openhab.binding.goecharger/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.goecharger/src/main/resources/OH-INF/thing/thing-types.xml
@@ -22,6 +22,7 @@
                        <channel id="powerL1" typeId="pl1"/>
                        <channel id="powerL2" typeId="pl2"/>
                        <channel id="powerL3" typeId="pl3"/>
+                       <channel id="powerAll" typeId="pAll"/>
                        <channel id="allowCharging" typeId="alw"/>
                        <channel id="cableCurrent" typeId="cbl"/>
                        <channel id="firmware" typeId="fmw"/>
@@ -158,6 +159,12 @@
                <description>Power on L3</description>
                <state pattern="%.1f %unit%" readOnly="true"/>
        </channel-type>
+       <channel-type id="pAll">
+               <item-type>Number:Power</item-type>
+               <label>Power All</label>
+               <description>Power All</description>
+               <state pattern="%.1f %unit%" readOnly="true"/>
+       </channel-type>
        <channel-type id="pha">
                <item-type>Number</item-type>
                <label>Phases</label>