Skip to content

Commit

Permalink
Add transaction to Go-Echarger
Browse files Browse the repository at this point in the history
Signed-off-by: Sascha Kloß <sascha.kloss@gmx.de>

Update goecharger.properties

Signed-off-by: Sascha Kloß <sascha.kloss@gmx.de>

Update GoEChargerBindingConstants.java

Signed-off-by: Sascha Kloß <sascha.kloss@gmx.de>

Update GoEStatusResponseV2DTO.java

Signed-off-by: Sascha Kloß <sascha.kloss@gmx.de>

Update GoEChargerV2Handler.java

Signed-off-by: Sascha Kloß <sascha.kloss@gmx.de>

Update README.md

Signed-off-by: Sascha Kloß <sascha.kloss@gmx.de>

Fix format and datatype issue

Signed-off-by: Sascha Kloß <sascha.kloss@gmx.de>

Fix format again

Signed-off-by: Sascha Kloß <sascha.kloss@gmx.de>

Fix type

Signed-off-by: Sascha Kloß <sascha.kloss@gmx.de>

Fix keyname

Signed-off-by: Sascha Kloß <sascha.kloss@gmx.de>
  • Loading branch information
cribskip committed Aug 8, 2022
1 parent 53b7439 commit a739c78
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 0 deletions.
1 change: 1 addition & 0 deletions bundles/org.openhab.binding.goecharger/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ Currently available channels are
| sessionChargeEnergyLimit | Number:Energy | Wallbox stops charging after defined value, disable with 0 | 1 (r/w), 2 (r/w) |
| sessionChargedEnergy | Number:Energy | Amount of energy that has been charged in this session | 1 (r), 2 (r) |
| totalChargedEnergy | Number:Energy | Amount of energy that has been charged since installation | 1 (r), 2 (r) |
| transaction | Number | 0 if no card, otherwise card ID | 2 (r/w) |
| allowCharging | Switch | If `ON` charging is allowed | 1 (r/w), 2 (r) |
| cableCurrent | Number:ElectricCurrent | Specifies the max current that can be charged with that cable | 1 (r), 2 (r) |
| temperature | Number:Temperature | Temperature of the curciuit board of the Go-eCharger | 1 (r), 2 (r) |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ public class GoEChargerBindingConstants {
public static final String POWER_L2 = "powerL2";
public static final String POWER_L3 = "powerL3";
public static final String POWER_ALL = "powerAll";
public static final String TRANSACTION = "transaction";
public static final String ALLOW_CHARGING = "allowCharging";
public static final String CABLE_ENCODING = "cableCurrent";
public static final String PHASES = "phases";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ public class GoEStatusResponseV2DTO extends GoEStatusResponseBaseDTO {
@SerializedName("psm")
public Integer phases;

@SerializedName("trx")
public Integer transaction;

@SerializedName("alw")
public Boolean allowCharging;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,11 @@ protected State getValue(String channelId, GoEStatusResponseBaseDTO goeResponseB
default:
}
return new StringType(error);
case TRANSACTION:
if (goeResponse.transaction == null) {
return UnDefType.UNDEF;
}
return new DecimalType(goeResponse.transaction);
case ALLOW_CHARGING:
return goeResponse.allowCharging == true ? OnOffType.ON : OnOffType.OFF;
case TEMPERATURE_TYPE2_PORT:
Expand Down Expand Up @@ -269,6 +274,11 @@ public void handleCommand(ChannelUID channelUID, Command command) {
if (command instanceof DecimalType) {
value = String.valueOf(((DecimalType) command).intValue());
}
case TRANSACTION:
key = "trx";
if (command instanceof DecimalType) {
value = String.valueOf(((DecimalType) command).intValue());
}
}

if (key != null && value != null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ thing-type.config.goecharger.goe.refreshInterval.description = Refresh interval

# channel types

channel-type.goecharger.trx.label = Transaction
channel-type.goecharger.trx.description = 0 for no card, otherwise card ID
channel-type.goecharger.alw.label = Allow Charging
channel-type.goecharger.alw.description = If true charging is allowed
channel-type.goecharger.ast.label = Access Configuration
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<channel id="powerL2" typeId="pl2"/>
<channel id="powerL3" typeId="pl3"/>
<channel id="powerAll" typeId="pAll"/>
<channel id="transaction" typeId="trx"/>
<channel id="allowCharging" typeId="alw"/>
<channel id="cableCurrent" typeId="cbl"/>
<channel id="firmware" typeId="fmw"/>
Expand Down Expand Up @@ -195,6 +196,12 @@
<description>Amount of energy that has been charged since installation</description>
<state pattern="%.1f %unit%" readOnly="true"/>
</channel-type>
<channel-type id="trx">
<item-type>Number</item-type>
<label>Transaction</label>
<description>0 for no card, otherwise card ID</description>
<state readOnly="false"/>
</channel-type>
<channel-type id="alw">
<item-type>Switch</item-type>
<label>Allow Charging</label>
Expand Down

0 comments on commit a739c78

Please sign in to comment.