demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-10 15:11:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

[daikin] Support BRP069A81 adapter (#15456)

Browse Source 
* [daikin] Support BRP069A81 adapter auto mode=1
* [daikin] Support Auto mode=7

Signed-off-by: Jimmy Tanagra <jcode@tanagra.id.au>
This commit is contained in:
jimtng 2023-08-30 02:37:01 +10:00 committed by GitHub
parent 67c0039cfd
commit 5e1f24c54f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 43 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bundles/org.openhab.binding.daikin/README.md
View File

@ -1,12 +1,16 @@
# Daikin Binding
The Daikin binding allows you to control your Daikin air conditioning units with openHAB.
In order to do so, your Daikin air conditioning unit must have a BRP072A42, BRP072C42 or BRP15B61 WiFi adapter installed.
In order to do so, your Daikin air conditioning unit must have a supported Wi-Fi adapter installed.
This may work with the older KRP series of wired adapters, but has not been tested with them.
## Supported Things
Daikin air conditioning units with a BRP069B41, BRP072A42, BRP072C42 or BRP15B61 installed.
This may work with the older KRP series of wired adapters, but has not been tested with them.
| Thing | Daikin Wi-Fi Adapter Model |
| ----------------- | ------------------------------------------ |
| `ac_unit` | BRP069A81, BRP069B41, BRP072A42, BRP072C42 |
| `airbase_ac_unit` | BRP15B61 |
## Discovery

8
bundles/org.openhab.binding.daikin/src/main/java/org/openhab/binding/daikin/internal/DaikinWebTargets.java
View File

@ -15,6 +15,7 @@ package org.openhab.binding.daikin.internal;
import java.io.EOFException;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
@ -31,6 +32,7 @@ import org.openhab.binding.daikin.internal.api.ControlInfo;
import org.openhab.binding.daikin.internal.api.EnergyInfoDayAndWeek;
import org.openhab.binding.daikin.internal.api.EnergyInfoYear;
import org.openhab.binding.daikin.internal.api.Enums.SpecialMode;
import org.openhab.binding.daikin.internal.api.InfoParser;
import org.openhab.binding.daikin.internal.api.SensorInfo;
import org.openhab.binding.daikin.internal.api.airbase.AirbaseBasicInfo;
import org.openhab.binding.daikin.internal.api.airbase.AirbaseControlInfo;
@ -110,9 +112,11 @@ public class DaikinWebTargets {
return ControlInfo.parse(response);
}
public void setControlInfo(ControlInfo info) throws DaikinCommunicationException {
public boolean setControlInfo(ControlInfo info) throws DaikinCommunicationException {
Map<String, String> queryParams = info.getParamString();
invoke(setControlInfoUri, queryParams);
String result = invoke(setControlInfoUri, queryParams);
Map<String, String> responseMap = InfoParser.parse(result);
return Optional.ofNullable(responseMap.get("ret")).orElse("").equals("OK");
}
public SensorInfo getSensorInfo() throws DaikinCommunicationException {

13
bundles/org.openhab.binding.daikin/src/main/java/org/openhab/binding/daikin/internal/api/ControlInfo.java
View File

@ -38,12 +38,14 @@ public class ControlInfo {
public String ret = "";
public boolean power = false;
// Store the accepted auto mode for later use.
public int autoModeValue = Mode.AUTO.getValue();
public Mode mode = Mode.AUTO;
/** Degrees in Celsius. */
// Degrees in Celsius.
public Optional<Double> temp = Optional.empty();
public FanSpeed fanSpeed = FanSpeed.AUTO;
public FanMovement fanMovement = FanMovement.STOPPED;
/* Not supported by all units. Sets the target humidity for dehumidifying. */
// Not supported by all units. Sets the target humidity for dehumidifying.
public Optional<Integer> targetHumidity = Optional.empty();
public AdvancedMode advancedMode = AdvancedMode.UNKNOWN;
public boolean separatedDirectionParams = false;
@ -61,6 +63,11 @@ public class ControlInfo {
info.power = "1".equals(responseMap.get("pow"));
info.mode = Optional.ofNullable(responseMap.get("mode")).flatMap(value -> InfoParser.parseInt(value))
.map(value -> Mode.fromValue(value)).orElse(Mode.AUTO);
// Normalize AUTO1 and AUTO7 to AUTO
if (info.mode == Mode.AUTO1 || info.mode == Mode.AUTO7) {
info.autoModeValue = info.mode.getValue();
info.mode = Mode.AUTO;
}
info.temp = Optional.ofNullable(responseMap.get("stemp")).flatMap(value -> InfoParser.parseDouble(value));
info.fanSpeed = Optional.ofNullable(responseMap.get("f_rate")).map(value -> FanSpeed.fromValue(value))
.orElse(FanSpeed.AUTO);
@ -90,7 +97,7 @@ public class ControlInfo {
public Map<String, String> getParamString() {
Map<String, String> params = new HashMap<>();
params.put("pow", power ? "1" : "0");
params.put("mode", Integer.toString(mode.getValue()));
params.put("mode", Integer.toString(mode == Mode.AUTO ? autoModeValue : mode.getValue()));
params.put("f_rate", fanSpeed.getValue());
if (separatedDirectionParams) {
params.put("f_dir_lr",

2
bundles/org.openhab.binding.daikin/src/main/java/org/openhab/binding/daikin/internal/api/Enums.java
View File

@ -28,6 +28,8 @@ public class Enums {
public enum Mode {
UNKNOWN(-1),
AUTO(0),
AUTO1(1), // BRP069A81 only accepts mode=1 for AUTO mode. 0 and 7 are rejected.
AUTO7(7), // Some adapters may return 7 as auto (heating)
DEHUMIDIFIER(2),
COLD(3),
HEAT(4),

19
bundles/org.openhab.binding.daikin/src/main/java/org/openhab/binding/daikin/internal/handler/DaikinAcUnitHandler.java
View File

@ -57,6 +57,8 @@ import org.slf4j.LoggerFactory;
public class DaikinAcUnitHandler extends DaikinBaseHandler {
private final Logger logger = LoggerFactory.getLogger(DaikinAcUnitHandler.class);
private Optional<Integer> autoModeValue = Optional.empty();
public DaikinAcUnitHandler(Thing thing, DaikinDynamicStateDescriptionProvider stateDescriptionProvider,
@Nullable HttpClient httpClient) {
super(thing, stateDescriptionProvider, httpClient);
@ -68,6 +70,7 @@ public class DaikinAcUnitHandler extends DaikinBaseHandler {
if (!"OK".equals(controlInfo.ret)) {
throw new DaikinCommunicationException("Invalid response from host");
}
updateState(DaikinBindingConstants.CHANNEL_AC_POWER, OnOffType.from(controlInfo.power));
updateTemperatureChannel(DaikinBindingConstants.CHANNEL_AC_TEMP, controlInfo.temp);
@ -202,7 +205,21 @@ public class DaikinAcUnitHandler extends DaikinBaseHandler {
}
ControlInfo info = webTargets.getControlInfo();
info.mode = newMode;
webTargets.setControlInfo(info);
if (autoModeValue.isPresent()) {
info.autoModeValue = autoModeValue.get();
}
boolean accepted = webTargets.setControlInfo(info);
// If mode=0 is not accepted try AUTO1 (mode=1)
if (!accepted && newMode == Mode.AUTO && autoModeValue.isEmpty()) {
info.autoModeValue = Mode.AUTO1.getValue();
if (webTargets.setControlInfo(info)) {
autoModeValue = Optional.of(info.autoModeValue);
logger.debug("AUTO uses mode={}", info.autoModeValue);
} else {
logger.warn("AUTO mode not accepted with mode=0 or mode=1");
}
}
}
@Override