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

[ecovacs] Add support for DEEBOT X2 Omni (#16487)

Browse Source 
Fixes #16117

* [ecovacs] Interpret empty error code list as 'no error'

Newer devices don't explicitly report 'no error' anymore, but instead
send an empty list.

Signed-off-by: Danny Baumann <dannybaumann@web.de>
This commit is contained in:
maniac103 2024-03-12 14:52:59 +01:00 committed by GitHub
parent 7dfebd66ce
commit 2edacebf3f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 57 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bundles/org.openhab.binding.ecovacs/src/main/java/org/openhab/binding/ecovacs/internal/api/commands/GetErrorCommand.java
View File

@ -44,10 +44,8 @@ public class GetErrorCommand extends IotDeviceCommand<Optional<Integer>> {
Gson gson) throws DataParsingException {
if (response instanceof PortalIotCommandJsonResponse jsonResponse) {
ErrorReport resp = jsonResponse.getResponsePayloadAs(gson, ErrorReport.class);
if (resp.errorCodes.isEmpty()) {
return Optional.empty();
}
return Optional.of(resp.errorCodes.get(0));
int responseCode = resp.errorCodes.isEmpty() ? 0 : resp.errorCodes.get(0);
return Optional.of(responseCode);
} else {
String payload = ((PortalIotCommandXmlResponse) response).getResponsePayloadXml();
return DeviceInfo.parseErrorInfo(payload);

10
bundles/org.openhab.binding.ecovacs/src/main/java/org/openhab/binding/ecovacs/internal/api/commands/SpotAreaCleaningCommand.java
View File

@ -21,7 +21,13 @@ import org.eclipse.jdt.annotation.NonNullByDefault;
*/
@NonNullByDefault
public class SpotAreaCleaningCommand extends AbstractAreaCleaningCommand {
public SpotAreaCleaningCommand(List<String> roomIds, int cleanPasses) {
super("spotArea", String.join(",", roomIds), cleanPasses);
public SpotAreaCleaningCommand(List<String> roomIds, int cleanPasses, boolean usesFreeClean) {
super(usesFreeClean ? "freeClean" : "spotArea", prepareRoomIds(roomIds, usesFreeClean), cleanPasses);
}
private static String prepareRoomIds(List<String> roomIds, boolean usesFreeClean) {
String prefix = usesFreeClean ? "1," : "";
String separator = usesFreeClean ? ";" : ",";
return prefix + String.join(separator, roomIds);
}
}

8
bundles/org.openhab.binding.ecovacs/src/main/java/org/openhab/binding/ecovacs/internal/api/impl/JsonReportParser.java
View File

@ -109,8 +109,12 @@ class JsonReportParser implements ReportParser {
}
case "error": {
ErrorReport report = payloadAs(response, ErrorReport.class);
for (Integer code : report.errorCodes) {
listener.onErrorReported(device, code);
if (report.errorCodes.isEmpty()) {
listener.onErrorReported(device, 0);
} else {
for (Integer code : report.errorCodes) {
listener.onErrorReported(device, code);
}
}
}
case "stats": {

2
bundles/org.openhab.binding.ecovacs/src/main/java/org/openhab/binding/ecovacs/internal/api/model/CleanMode.java
View File

@ -27,7 +27,7 @@ public enum CleanMode {
EDGE,
@SerializedName("spot")
SPOT,
@SerializedName(value = "SpotArea", alternate = { "spotArea" })
@SerializedName(value = "SpotArea", alternate = { "spotArea", "freeClean" })
SPOT_AREA,
@SerializedName(value = "CustomArea", alternate = { "customArea" })
CUSTOM_AREA,

2
bundles/org.openhab.binding.ecovacs/src/main/java/org/openhab/binding/ecovacs/internal/api/model/DeviceCapability.java
View File

@ -29,6 +29,8 @@ public enum DeviceCapability {
VOICE_REPORTING,
@SerializedName("spot_area_cleaning")
SPOT_AREA_CLEANING,
@SerializedName("free_clean_command")
FREE_CLEAN_FOR_SPOT_AREA,
@SerializedName("custom_area_cleaning")
CUSTOM_AREA_CLEANING,
@SerializedName("single_room_cleaning")

3
bundles/org.openhab.binding.ecovacs/src/main/java/org/openhab/binding/ecovacs/internal/handler/EcovacsVacuumHandler.java
View File

@ -761,7 +761,8 @@ public class EcovacsVacuumHandler extends BaseThingHandler implements EcovacsDev
}
}
if (!roomIds.isEmpty()) {
return new SpotAreaCleaningCommand(roomIds, passes);
return new SpotAreaCleaningCommand(roomIds, passes,
device.hasCapability(DeviceCapability.FREE_CLEAN_FOR_SPOT_AREA));
}
} else {
logger.info("{}: spotArea command needs to have the form spotArea:<room1>[;<room2>][;<...roomX>][:x2]",

36
bundles/org.openhab.binding.ecovacs/src/main/resources/devices/supported_device_list.json
View File

@ -557,5 +557,41 @@
"modelName": "DEEBOT U2 SE",
"deviceClass": "zjna8m",
"deviceClassLink": "ipzjy0"
},
{
"modelName": "DEEBOT X2",
"deviceClass": "e6ofmn",
"protoVersion": "json_v2",
"usesMqtt": true,
"capabilities": [
"mopping_system",
"main_brush",
"spot_area_cleaning",
"free_clean_command",
"custom_area_cleaning",
"clean_speed_control",
"voice_reporting",
"read_network_info",
"unit_care_lifespan",
"true_detect_3d",
"mapping",
"auto_empty_station"
]
},
{
"modelName": "DEEBOT X2 OMNI",
"deviceClass": "lf3bn4",
"deviceClassLink": "e6ofmn"
},
{
"modelName": "DEEBOT X2 COMBO",
"deviceClass": "e6rcnf",
"deviceClassLink": "e6ofmn"
},
{
"modelName": "DEEBOT X2 PRO OMNI",
"deviceClass": "ip3mmy",
"deviceClassLink": "e6ofmn"
}
]