public
/
openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[kostalinverter] Fix for the Kostal inverter binding to work with different firmware releases regarded to PIKO 10-20 V. 221004 (#13490) 

* [kostalinverter] Fix for the Kostal inverter binding to work with
different firmware releases regarded to PIKO 10-20 Version 221004

This is the next version regarded to Closed PR #13464

* [kostalinverter] Changes done 20221019
Regarded to Thread.....

* Proper handling of InterruptedException

Also removbe a useless call to return

Signed-off-by: Örjan Backsell <orjan.backsell@gmail.com>
Co-authored-by: Laurent Garnier <lg.hc@free.fr>
This commit is contained in:
basse04 2022-11-05 13:50:49 +01:00 committed by GitHub
parent a5823d8df0
commit f184e4e88f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 138 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bundles/org.openhab.binding.kostalinverter/README.md
View File

@ -291,7 +291,7 @@ String SolarStatus "Solar status [%s]" <energy> { channel="kostalinverter:kostal
demo.items: demo.items:
``` ```
Number:Power GridOutputPower "PV Output Power" <energy> { channel="kostalinverter:piko1020:mypiko1020:gridOutputPower" } Number:Power GridOutputPower "Grid Output Power" <energy> { channel="kostalinverter:piko1020:mypiko1020:gridOutputPower" }
Number:Energy YieldDaySecondGen "PV Output Power Day" <energy> { channel="kostalinverter:piko1020:mypiko1020:yieldDaySecondGen" } Number:Energy YieldDaySecondGen "PV Output Power Day" <energy> { channel="kostalinverter:piko1020:mypiko1020:yieldDaySecondGen" }
Number:Energy YieldTotalSecondGen "PV Output Power Total" <energy> { channel="kostalinverter:piko1020:mypiko1020:yieldTotalSecondgen" } Number:Energy YieldTotalSecondGen "PV Output Power Total" <energy> { channel="kostalinverter:piko1020:mypiko1020:yieldTotalSecondgen" }
Number:Dimensionless OperatingStatus "Operating Status" <energy> { channel="kostalinverter:piko1020:mypiko1020:operatingStatus" } Number:Dimensionless OperatingStatus "Operating Status" <energy> { channel="kostalinverter:piko1020:mypiko1020:operatingStatus" }

273
bundles/org.openhab.binding.kostalinverter/src/main/java/org/openhab/binding/kostalinverter/internal/secondgeneration/SecondGenerationHandler.java
View File

@ -187,147 +187,142 @@ public class SecondGenerationHandler extends BaseThingHandler {
} }
private void refresh() { private void refresh() {
try { // Build posts for dxsEntries part
// Build posts for dxsEntries part String dxsEntriesCall = inverterConfig.url + "/api/dxs.json?dxsEntries=" + channelConfigs.get(0).dxsEntries;
String dxsEntriesCall = inverterConfig.url + "/api/dxs.json?dxsEntries=" + channelConfigs.get(0).dxsEntries; for (int i = 1; i < channelConfigs.size(); i++) {
for (int i = 1; i < channelConfigs.size(); i++) { dxsEntriesCall += ("&dxsEntries=" + channelConfigs.get(i).dxsEntries);
dxsEntriesCall += ("&dxsEntries=" + channelConfigs.get(i).dxsEntries); }
} String jsonDxsEntriesResponse = callURL(dxsEntriesCall, httpClient);
String jsonDxsEntriesResponse = callURL(dxsEntriesCall, httpClient); SecondGenerationDxsEntriesContainerDTO dxsEntriesContainer = gson.fromJson(jsonDxsEntriesResponse,
SecondGenerationDxsEntriesContainerDTO dxsEntriesContainer = gson.fromJson(jsonDxsEntriesResponse, SecondGenerationDxsEntriesContainerDTO.class);
SecondGenerationDxsEntriesContainerDTO.class);
String[] channelPosts = new String[23]; String[] channelPosts = new String[23];
int channelPostsCounter = 0; int channelPostsCounter = 0;
for (SecondGenerationDxsEntries dxsentries : dxsEntriesContainer.dxsEntries) { for (SecondGenerationDxsEntries dxsentries : dxsEntriesContainer.dxsEntries) {
channelPosts[channelPostsCounter] = dxsentries.getName(); channelPosts[channelPostsCounter] = dxsentries.getName();
channelPostsCounter++; channelPostsCounter++;
} }
channelPostsTemp = List.of(channelPosts); channelPostsTemp = List.of(channelPosts);
// Build posts for dxsEntriesExt part // Build posts for dxsEntriesExt part
String dxsEntriesCallExt = inverterConfig.url + "/api/dxs.json?dxsEntries=" String dxsEntriesCallExt = inverterConfig.url + "/api/dxs.json?dxsEntries="
+ channelConfigsExt.get(0).dxsEntries; + channelConfigsExt.get(0).dxsEntries;
for (int i = 1; i < channelConfigs.size(); i++) { for (int i = 1; i < channelConfigs.size(); i++) {
dxsEntriesCallExt += ("&dxsEntries=" + channelConfigsExt.get(i).dxsEntries); dxsEntriesCallExt += ("&dxsEntries=" + channelConfigsExt.get(i).dxsEntries);
} }
String jsonDxsEntriesResponseExt = callURL(dxsEntriesCallExt, httpClient); String jsonDxsEntriesResponseExt = callURL(dxsEntriesCallExt, httpClient);
SecondGenerationDxsEntriesContainerDTO dxsEntriesContainerExt = gson.fromJson(jsonDxsEntriesResponseExt, SecondGenerationDxsEntriesContainerDTO dxsEntriesContainerExt = gson.fromJson(jsonDxsEntriesResponseExt,
SecondGenerationDxsEntriesContainerDTO.class); SecondGenerationDxsEntriesContainerDTO.class);
String[] channelPostsExt = new String[23]; String[] channelPostsExt = new String[23];
int channelPostsCounterExt = 0; int channelPostsCounterExt = 0;
for (SecondGenerationDxsEntries dxsentriesExt : dxsEntriesContainerExt.dxsEntries) { for (SecondGenerationDxsEntries dxsentriesExt : dxsEntriesContainerExt.dxsEntries) {
channelPostsExt[channelPostsCounterExt] = dxsentriesExt.getName(); channelPostsExt[channelPostsCounterExt] = dxsentriesExt.getName();
channelPostsCounterExt++; channelPostsCounterExt++;
} }
channelPostsTempExt = List.of(channelPostsExt); channelPostsTempExt = List.of(channelPostsExt);
// Build posts for dxsEntriesExtExt part // Build posts for dxsEntriesExtExt part
String dxsEntriesCallExtExt = inverterConfig.url + "/api/dxs.json?dxsEntries=" String dxsEntriesCallExtExt = inverterConfig.url + "/api/dxs.json?dxsEntries="
+ channelConfigsExtExt.get(0).dxsEntries; + channelConfigsExtExt.get(0).dxsEntries;
for (int i = 1; i < channelConfigsExtExt.size(); i++) { for (int i = 1; i < channelConfigsExtExt.size(); i++) {
dxsEntriesCallExtExt += ("&dxsEntries=" + channelConfigsExtExt.get(i).dxsEntries); dxsEntriesCallExtExt += ("&dxsEntries=" + channelConfigsExtExt.get(i).dxsEntries);
} }
String jsonDxsEntriesResponseExtExt = callURL(dxsEntriesCallExtExt, httpClient); String jsonDxsEntriesResponseExtExt = callURL(dxsEntriesCallExtExt, httpClient);
SecondGenerationDxsEntriesContainerDTO dxsEntriesContainerExtExt = gson SecondGenerationDxsEntriesContainerDTO dxsEntriesContainerExtExt = gson.fromJson(jsonDxsEntriesResponseExtExt,
.fromJson(jsonDxsEntriesResponseExtExt, SecondGenerationDxsEntriesContainerDTO.class); SecondGenerationDxsEntriesContainerDTO.class);
String[] channelPostsExtExt = new String[3]; String[] channelPostsExtExt = new String[3];
int channelPostsCounterExtExt = 0; int channelPostsCounterExtExt = 0;
for (SecondGenerationDxsEntries dxsentriesExtExt : dxsEntriesContainerExtExt.dxsEntries) { for (SecondGenerationDxsEntries dxsentriesExtExt : dxsEntriesContainerExtExt.dxsEntries) {
channelPostsExtExt[channelPostsCounterExtExt] = dxsentriesExtExt.getName(); channelPostsExtExt[channelPostsCounterExtExt] = dxsentriesExtExt.getName();
channelPostsCounterExtExt++; channelPostsCounterExtExt++;
} }
channelPostsTempExtExt = List.of(channelPostsExtExt); channelPostsTempExtExt = List.of(channelPostsExtExt);
// Concatenate posts for all parts except configurable channels // Concatenate posts for all parts except configurable channels
channelPostsTempAll = combinePostsLists(channelPostsTemp, channelPostsTempExt, channelPostsTempExtExt); channelPostsTempAll = combinePostsLists(channelPostsTemp, channelPostsTempExt, channelPostsTempExtExt);
String[] channelPostsTempAll1 = channelPostsTempAll.toArray(new String[0]); String[] channelPostsTempAll1 = channelPostsTempAll.toArray(new String[0]);
// Build posts for dxsEntriesConfigureable part // Build posts for dxsEntriesConfigureable part
String[] channelPostsConfigurable = new String[5]; String[] channelPostsConfigurable = new String[5];
if (inverterConfig.hasBattery) { if (inverterConfig.hasBattery) {
String dxsEntriesCallConfigurable = inverterConfig.url + "/api/dxs.json?dxsEntries=" String dxsEntriesCallConfigurable = inverterConfig.url + "/api/dxs.json?dxsEntries="
+ channelConfigsConfigurable.get(0).dxsEntries; + channelConfigsConfigurable.get(0).dxsEntries;
for (int i = 1; i < channelConfigsConfigurable.size(); i++) { for (int i = 1; i < channelConfigsConfigurable.size(); i++) {
dxsEntriesCallConfigurable += ("&dxsEntries=" + channelConfigsConfigurable.get(i).dxsEntries); dxsEntriesCallConfigurable += ("&dxsEntries=" + channelConfigsConfigurable.get(i).dxsEntries);
}
String jsonDxsEntriesResponseConfigurable = callURL(dxsEntriesCallConfigurable, httpClient);
SecondGenerationDxsEntriesContainerDTO dxsEntriesContainerConfigurable = gson
.fromJson(jsonDxsEntriesResponseConfigurable, SecondGenerationDxsEntriesContainerDTO.class);
int channelPostsCounterConfigurable = 0;
for (SecondGenerationDxsEntries dxsentriesConfigurable : dxsEntriesContainerConfigurable.dxsEntries) {
channelPostsConfigurable[channelPostsCounterConfigurable] = dxsentriesConfigurable.getName();
channelPostsCounterConfigurable++;
}
}
// Create and update actual values for non-configurable channels
if (!inverterConfig.hasBattery) {
channelConfigsAll = combineChannelConfigLists(channelConfigs, channelConfigsExt, channelConfigsExtExt);
int channelValuesCounterAll = 0;
for (SecondGenerationChannelConfiguration cConfig : channelConfigsAll) {
String channel = cConfig.id;
updateState(channel, getState(channelPostsTempAll1[channelValuesCounterAll], cConfig.unit));
channelValuesCounterAll++;
}
}
// Create and update actual values for all channels
if (inverterConfig.hasBattery) {
// Part for updating non-configurable channels
channelConfigsAll = combineChannelConfigLists(channelConfigs, channelConfigsExt, channelConfigsExtExt);
// Update the non-configurable channels
int channelValuesCounterAll = 0;
for (SecondGenerationChannelConfiguration cConfig : channelConfigsAll) {
String channel = cConfig.id;
updateState(channel, getState(channelPostsTempAll1[channelValuesCounterAll], cConfig.unit));
channelValuesCounterAll++;
}
// Part for updating configurable channels
int channelValuesCounterConfigurable = 0;
for (SecondGenerationChannelConfiguration cConfig : channelConfigsConfigurable) {
String channel = cConfig.id;
String value = channelPostsConfigurable[channelValuesCounterConfigurable];
int dxsEntriesCheckCounter = 3;
if (cConfig.dxsEntries.equals("33556484")) {
dxsEntriesCheckCounter = 1;
} }
String jsonDxsEntriesResponseConfigurable = callURL(dxsEntriesCallConfigurable, httpClient); if (cConfig.dxsEntries.equals("33556482")) {
SecondGenerationDxsEntriesContainerDTO dxsEntriesContainerConfigurable = gson dxsEntriesCheckCounter = 2;
.fromJson(jsonDxsEntriesResponseConfigurable, SecondGenerationDxsEntriesContainerDTO.class); }
int channelPostsCounterConfigurable = 0; switch (dxsEntriesCheckCounter) {
for (SecondGenerationDxsEntries dxsentriesConfigurable : dxsEntriesContainerConfigurable.dxsEntries) { case 1:
channelPostsConfigurable[channelPostsCounterConfigurable] = dxsentriesConfigurable.getName(); if ("false".equals(value)) {
channelPostsCounterConfigurable++; updateState(channel, OnOffType.OFF);
}
if ("true".equals(value)) {
updateState(channel, OnOffType.ON);
}
channelValuesCounterConfigurable++;
break;
case 2:
if ("false".equals(value)) {
State stateFalse = new StringType("0");
updateState(channel, stateFalse);
}
if ("true".equals(value)) {
State stateTrue = new StringType("1");
updateState(channel, stateTrue);
}
channelValuesCounterConfigurable++;
break;
case 3:
State stateOther = getState(channelPostsConfigurable[channelValuesCounterConfigurable],
cConfig.unit);
updateState(channel, stateOther);
channelValuesCounterConfigurable++;
break;
} }
} }
// Create and update actual values for non-configurable channels
if (!inverterConfig.hasBattery) {
channelConfigsAll = combineChannelConfigLists(channelConfigs, channelConfigsExt, channelConfigsExtExt);
int channelValuesCounterAll = 0;
for (SecondGenerationChannelConfiguration cConfig : channelConfigsAll) {
String channel = cConfig.id;
updateState(channel, getState(channelPostsTempAll1[channelValuesCounterAll], cConfig.unit));
channelValuesCounterAll++;
}
}
// Create and update actual values for all channels
if (inverterConfig.hasBattery) {
// Part for updating non-configurable channels
channelConfigsAll = combineChannelConfigLists(channelConfigs, channelConfigsExt, channelConfigsExtExt);
// Update the non-configurable channels
int channelValuesCounterAll = 0;
for (SecondGenerationChannelConfiguration cConfig : channelConfigsAll) {
String channel = cConfig.id;
updateState(channel, getState(channelPostsTempAll1[channelValuesCounterAll], cConfig.unit));
channelValuesCounterAll++;
}
// Part for updating configurable channels
int channelValuesCounterConfigurable = 0;
for (SecondGenerationChannelConfiguration cConfig : channelConfigsConfigurable) {
String channel = cConfig.id;
String value = channelPostsConfigurable[channelValuesCounterConfigurable];
int dxsEntriesCheckCounter = 3;
if (cConfig.dxsEntries.equals("33556484")) {
dxsEntriesCheckCounter = 1;
}
if (cConfig.dxsEntries.equals("33556482")) {
dxsEntriesCheckCounter = 2;
}
switch (dxsEntriesCheckCounter) {
case 1:
if ("false".equals(value)) {
updateState(channel, OnOffType.OFF);
}
if ("true".equals(value)) {
updateState(channel, OnOffType.ON);
}
channelValuesCounterConfigurable++;
break;
case 2:
if ("false".equals(value)) {
State stateFalse = new StringType("0");
updateState(channel, stateFalse);
}
if ("true".equals(value)) {
State stateTrue = new StringType("1");
updateState(channel, stateTrue);
}
channelValuesCounterConfigurable++;
break;
case 3:
State stateOther = getState(channelPostsConfigurable[channelValuesCounterConfigurable],
cConfig.unit);
updateState(channel, stateOther);
channelValuesCounterConfigurable++;
break;
}
}
}
} catch (final RuntimeException e) {
logger.debug("Updating inverter status failed: ", e);
updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR, e.getMessage());
} }
} }
@ -338,7 +333,10 @@ public class SecondGenerationHandler extends BaseThingHandler {
try { try {
SecondGenerationConfigurationHandler.executeConfigurationChanges(httpClientHandleCommand, url, username, SecondGenerationConfigurationHandler.executeConfigurationChanges(httpClientHandleCommand, url, username,
password, dxsEntriesConf, valueConfiguration); password, dxsEntriesConf, valueConfiguration);
} catch (InterruptedException | ExecutionException | TimeoutException | NoSuchAlgorithmException e) { } catch (InterruptedException e) {
Thread.currentThread().interrupt();
logger.debug("Connection to inverter interrupted during configuration");
} catch (ExecutionException | TimeoutException | NoSuchAlgorithmException e) {
logger.debug("Connection to inverter disturbed during configuration"); logger.debug("Connection to inverter disturbed during configuration");
} }
} }
@ -347,8 +345,11 @@ public class SecondGenerationHandler extends BaseThingHandler {
private final String callURL(String dxsEntriesCall, HttpClient httpClient) { private final String callURL(String dxsEntriesCall, HttpClient httpClient) {
String jsonDxsResponse = ""; String jsonDxsResponse = "";
try { try {
jsonDxsResponse = httpClient.GET(dxsEntriesCall).getContentAsString(); jsonDxsResponse = httpClient.GET(dxsEntriesCall).getContentAsString().replace("null", "0.000000");
} catch (InterruptedException | ExecutionException | TimeoutException e2) { } catch (InterruptedException e2) {
Thread.currentThread().interrupt();
logger.debug("Connection to inverter interrupted during scrape");
} catch (ExecutionException | TimeoutException e2) {
logger.debug("Connection to inverter disturbed during scrape"); logger.debug("Connection to inverter disturbed during scrape");
} }
return jsonDxsResponse; return jsonDxsResponse;