diff --git a/bundles/org.openhab.binding.miele/README.md b/bundles/org.openhab.binding.miele/README.md index 532702d11bc..4dabad47232 100644 --- a/bundles/org.openhab.binding.miele/README.md +++ b/bundles/org.openhab.binding.miele/README.md @@ -45,18 +45,18 @@ discovery.miele:removalGracePeriod=30 ### Thing Configuration for Miele XGW3000 -| Configuration Parameter | Description | -|-------------------------|---------------| -| ipAddress | Network address of the Miele@home gateway | +| Configuration Parameter | Description | +|-------------------------|----------------------------------------------------------------------------------------------------------------------------------| +| ipAddress | Network address of the Miele@home gateway | | interface | Network address of openHAB host interface where the binding will listen for multicast events coming from the Miele@home gateway. | -| userName | Name of a registered Miele@home user. | -| password | Password for the registered Miele@home user. | -| language | Language for state, program and phase texts. Leave blank for system language. | +| userName | Name of a registered Miele@home user. | +| password | Password for the registered Miele@home user. | +| language | Language for state, program and phase texts. Leave blank for system language. | ### Thing Configuration for appliance -| Configuration Parameter | Description | -|-------------------------|---------------| +| Configuration Parameter | Description | +|-------------------------|----------------------------------------------------------| | uid | Unique identifier for specific appliance on the gateway. | Each appliance needs the device UID as a configuration parameter. @@ -112,6 +112,8 @@ Channels available for each appliance type are listed below. | phase | String | Read | Current phase of the program running on the appliance | | rawPhase | Number | Read | Current phase of the program running on the appliance as raw number | | door | Contact | Read | Current state of the door of the appliance | +| info | Switch | Read | Signals information, check appliance for details | +| failure | Switch | Read | Signals failure, check appliance for details | | switch | Switch | Write | Switch the appliance on or off | #### Dishwasher @@ -130,6 +132,8 @@ Channels available for each appliance type are listed below. | elapsed | Number:Time | Read | Time elapsed in the program running on the appliance | | finish | Number:Time | Read | Time to finish the program running on the appliance | | door | Contact | Read | Current state of the door of the appliance | +| info | Switch | Read | Signals information, check appliance for details | +| failure | Switch | Read | Signals failure, check appliance for details | | switch | Switch | Write | Switch the appliance on or off | | energyConsumption | Number:Energy | Read | Energy consumption by the currently running program on the appliance | | waterConsumption | Number:Volume | Read | Water consumption by the currently running program on the appliance | @@ -172,6 +176,8 @@ Channels available for each appliance type are listed below. | current | Number:Temperature | Read | Current temperature in the fridge | | target | Number:Temperature | Read | Target temperature to be reached by the fridge | | door | Contact | Read | Current state of the door of the appliance | +| info | Switch | Read | Signals information, check appliance for details | +| failure | Switch | Read | Signals failure, check appliance for details | | switch | Switch | Write | Switch the appliance on or off | #### Fridge/Freezer combination @@ -189,6 +195,8 @@ Channels available for each appliance type are listed below. | fridgecurrent | Number:Temperature | Read | Current temperature in the fridge compartment | | fridgetarget | Number:Temperature | Read | Target temperature to be reached by the fridge compartment | | door | Contact | Read | Current state of the door of the appliance | +| info | Switch | Read | Signals information, check appliance for details | +| failure | Switch | Read | Signals failure, check appliance for details | | start | Switch | Write | Switch the appliance on or off | #### Hob @@ -247,6 +255,8 @@ Channels available for each appliance type are listed below. | temp1 | Number:Temperature | Read | Program temperature in the oven 1 | | temp2 | Number:Temperature | Read | Program temperature in the oven 2 | | door | Contact | Read | Current state of the door of the appliance | +| info | Switch | Read | Signals information, check appliance for details | +| failure | Switch | Read | Signals failure, check appliance for details | | switch | Switch | Write | Switch the appliance on or off | | stop | Switch | Write | Stop the appliance | @@ -286,6 +296,8 @@ See oven. | elapsed | Number:Time | Read | Time elapsed in the program running on the appliance | | finish | Number:Time | Read | Time to finish the program running on the appliance | | door | Contact | Read | Current state of the door of the appliance | +| info | Switch | Read | Signals information, check appliance for details | +| failure | Switch | Read | Signals failure, check appliance for details | | switch | Switch | Write | Switch the appliance on or off | | step | Number | Read | Current step in the program running on the appliance | @@ -351,6 +363,8 @@ See oven. | elapsed | Number:Time | Read | Time elapsed in the program running on the appliance | | finish | Number:Time | Read | Time to finish the program running on the appliance | | door | Contact | Read | Current state of the door of the appliance | +| info | Switch | Read | Signals information, check appliance for details | +| failure | Switch | Read | Signals failure, check appliance for details | | switch | Switch | Write | Switch the appliance on or off | | target | Number:Temperature | Read | Temperature of the selected program (10 °C = cold) | | spinningspeed | String | Read | Spinning speed in the program running on the appliance | diff --git a/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/CoffeeMachineChannelSelector.java b/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/CoffeeMachineChannelSelector.java index 2f9e0dcbc5d..12d8e15609e 100644 --- a/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/CoffeeMachineChannelSelector.java +++ b/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/CoffeeMachineChannelSelector.java @@ -67,7 +67,7 @@ public enum CoffeeMachineChannelSelector implements ApplianceChannelSelector { } }, PROGRAM_PHASE(RAW_PHASE_PROPERTY_NAME, PHASE_CHANNEL_ID, DecimalType.class, false), - // lightingStatus signalFailure signalInfo + // lightingStatus DOOR("signalDoor", "door", OpenClosedType.class, false) { @Override public State getState(String s, @Nullable DeviceMetaData dmd, MieleTranslationProvider translationProvider) { @@ -82,6 +82,18 @@ public enum CoffeeMachineChannelSelector implements ApplianceChannelSelector { return UnDefType.UNDEF; } }, + INFO("signalInfo", "info", OnOffType.class, false) { + @Override + public State getState(String s, @Nullable DeviceMetaData dmd, MieleTranslationProvider translationProvider) { + return OnOffType.from("true".equals(s)); + } + }, + FAILURE("signalFailure", "failure", OnOffType.class, false) { + @Override + public State getState(String s, @Nullable DeviceMetaData dmd, MieleTranslationProvider translationProvider) { + return OnOffType.from("true".equals(s)); + } + }, SWITCH("", "switch", OnOffType.class, false); private final Logger logger = LoggerFactory.getLogger(CoffeeMachineChannelSelector.class); diff --git a/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/DishwasherChannelSelector.java b/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/DishwasherChannelSelector.java index 6c6c6387ba7..3ebc8c9decd 100644 --- a/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/DishwasherChannelSelector.java +++ b/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/DishwasherChannelSelector.java @@ -108,6 +108,18 @@ public enum DishwasherChannelSelector implements ApplianceChannelSelector { return UnDefType.UNDEF; } }, + INFO("signalInfo", "info", OnOffType.class, false, false) { + @Override + public State getState(String s, @Nullable DeviceMetaData dmd, MieleTranslationProvider translationProvider) { + return OnOffType.from("true".equals(s)); + } + }, + FAILURE("signalFailure", "failure", OnOffType.class, false, false) { + @Override + public State getState(String s, @Nullable DeviceMetaData dmd, MieleTranslationProvider translationProvider) { + return OnOffType.from("true".equals(s)); + } + }, SWITCH("", "switch", OnOffType.class, false, false), ENERGY_CONSUMPTION(EXTENDED_DEVICE_STATE_PROPERTY_NAME, ENERGY_CONSUMPTION_CHANNEL_ID, QuantityType.class, false, true), diff --git a/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/FridgeChannelSelector.java b/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/FridgeChannelSelector.java index 2a3b7cb84a0..75875540e5d 100644 --- a/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/FridgeChannelSelector.java +++ b/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/FridgeChannelSelector.java @@ -78,6 +78,18 @@ public enum FridgeChannelSelector implements ApplianceChannelSelector { return UnDefType.UNDEF; } }, + INFO("signalInfo", "info", OnOffType.class, false) { + @Override + public State getState(String s, @Nullable DeviceMetaData dmd, MieleTranslationProvider translationProvider) { + return OnOffType.from("true".equals(s)); + } + }, + FAILURE("signalFailure", "failure", OnOffType.class, false) { + @Override + public State getState(String s, @Nullable DeviceMetaData dmd, MieleTranslationProvider translationProvider) { + return OnOffType.from("true".equals(s)); + } + }, START("", "start", OnOffType.class, false); private final Logger logger = LoggerFactory.getLogger(FridgeChannelSelector.class); diff --git a/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/FridgeFreezerChannelSelector.java b/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/FridgeFreezerChannelSelector.java index 47889f3a9b0..258858832a2 100644 --- a/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/FridgeFreezerChannelSelector.java +++ b/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/FridgeFreezerChannelSelector.java @@ -93,6 +93,18 @@ public enum FridgeFreezerChannelSelector implements ApplianceChannelSelector { return UnDefType.UNDEF; } }, + INFO("signalInfo", "info", OnOffType.class, false) { + @Override + public State getState(String s, @Nullable DeviceMetaData dmd, MieleTranslationProvider translationProvider) { + return OnOffType.from("true".equals(s)); + } + }, + FAILURE("signalFailure", "failure", OnOffType.class, false) { + @Override + public State getState(String s, @Nullable DeviceMetaData dmd, MieleTranslationProvider translationProvider) { + return OnOffType.from("true".equals(s)); + } + }, START("", "start", OnOffType.class, false); private final Logger logger = LoggerFactory.getLogger(FridgeFreezerChannelSelector.class); diff --git a/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/OvenChannelSelector.java b/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/OvenChannelSelector.java index 6d3a973fd4e..2fd9d133720 100644 --- a/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/OvenChannelSelector.java +++ b/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/OvenChannelSelector.java @@ -127,6 +127,18 @@ public enum OvenChannelSelector implements ApplianceChannelSelector { return UnDefType.UNDEF; } }, + INFO("signalInfo", "info", OnOffType.class, false) { + @Override + public State getState(String s, @Nullable DeviceMetaData dmd, MieleTranslationProvider translationProvider) { + return OnOffType.from("true".equals(s)); + } + }, + FAILURE("signalFailure", "failure", OnOffType.class, false) { + @Override + public State getState(String s, @Nullable DeviceMetaData dmd, MieleTranslationProvider translationProvider) { + return OnOffType.from("true".equals(s)); + } + }, STOP("", "stop", OnOffType.class, false), SWITCH("", "switch", OnOffType.class, false); diff --git a/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/TumbleDryerChannelSelector.java b/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/TumbleDryerChannelSelector.java index 09893a7e054..d869f54cd93 100644 --- a/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/TumbleDryerChannelSelector.java +++ b/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/TumbleDryerChannelSelector.java @@ -116,6 +116,18 @@ public enum TumbleDryerChannelSelector implements ApplianceChannelSelector { return UnDefType.UNDEF; } }, + INFO("signalInfo", "info", OnOffType.class, false) { + @Override + public State getState(String s, @Nullable DeviceMetaData dmd, MieleTranslationProvider translationProvider) { + return OnOffType.from("true".equals(s)); + } + }, + FAILURE("signalFailure", "failure", OnOffType.class, false) { + @Override + public State getState(String s, @Nullable DeviceMetaData dmd, MieleTranslationProvider translationProvider) { + return OnOffType.from("true".equals(s)); + } + }, SWITCH("", "switch", OnOffType.class, false); private final Logger logger = LoggerFactory.getLogger(TumbleDryerChannelSelector.class); diff --git a/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/WashingMachineChannelSelector.java b/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/WashingMachineChannelSelector.java index d6ac06c4be2..b590e790fc5 100644 --- a/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/WashingMachineChannelSelector.java +++ b/bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/WashingMachineChannelSelector.java @@ -127,6 +127,18 @@ public enum WashingMachineChannelSelector implements ApplianceChannelSelector { return UnDefType.UNDEF; } }, + INFO("signalInfo", "info", OnOffType.class, false, false) { + @Override + public State getState(String s, @Nullable DeviceMetaData dmd, MieleTranslationProvider translationProvider) { + return OnOffType.from("true".equals(s)); + } + }, + FAILURE("signalFailure", "failure", OnOffType.class, false, false) { + @Override + public State getState(String s, @Nullable DeviceMetaData dmd, MieleTranslationProvider translationProvider) { + return OnOffType.from("true".equals(s)); + } + }, SWITCH("", "switch", OnOffType.class, false, false), ENERGY_CONSUMPTION(EXTENDED_DEVICE_STATE_PROPERTY_NAME, ENERGY_CONSUMPTION_CHANNEL_ID, QuantityType.class, false, true), diff --git a/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/i18n/miele.properties b/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/i18n/miele.properties index 96c1c92037e..bf5106ca868 100644 --- a/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/i18n/miele.properties +++ b/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/i18n/miele.properties @@ -72,6 +72,8 @@ channel-type.miele.end.label = End Time channel-type.miele.end.description = End time of the program (programmed or running) channel-type.miele.energy-consumption.label = Energy Consumption channel-type.miele.energy-consumption.description = Energy consumption by the currently running program on the appliance +channel-type.miele.failure.label = Signal Failure +channel-type.miele.failure.description = Signals failure, check appliance for details channel-type.miele.finish.label = Finish Time channel-type.miele.finish.description = Time to finish the program running on the appliance channel-type.miele.finish.state.pattern = %1$tR @@ -81,6 +83,8 @@ channel-type.miele.fridgestate.label = Status channel-type.miele.fridgestate.description = Current status of the fridge compartment channel-type.miele.heat.label = Remaining Heat channel-type.miele.heat.description = Remaining heat level of the heating zone/plate +channel-type.miele.info.label = Signal Information +channel-type.miele.info.description = Signals information, check appliance for details channel-type.miele.phase.label = Phase channel-type.miele.phase.description = Current phase of the program running on the appliance channel-type.miele.plates.label = Plates diff --git a/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/channeltypes.xml b/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/channeltypes.xml index 20bfc8b67ae..5bfc1e0b02a 100644 --- a/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/channeltypes.xml +++ b/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/channeltypes.xml @@ -100,6 +100,21 @@ + + Switch + + Signals information, check appliance for details + + + + + Switch + + Signals failure, check appliance for details + Error + + + Switch diff --git a/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/coffeemachine.xml b/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/coffeemachine.xml index 92d7a9c3cdd..3edc78cb771 100644 --- a/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/coffeemachine.xml +++ b/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/coffeemachine.xml @@ -22,9 +22,15 @@ + + + + 1 + + uid diff --git a/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/dishwasher.xml b/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/dishwasher.xml index eb2b1f52423..ba93b6e9305 100644 --- a/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/dishwasher.xml +++ b/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/dishwasher.xml @@ -26,13 +26,15 @@ + + - 1 + 2 uid diff --git a/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/fridge.xml b/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/fridge.xml index 4685f0cfad6..272cb405517 100644 --- a/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/fridge.xml +++ b/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/fridge.xml @@ -24,9 +24,15 @@ Target temperature to be reached by the fridge + + + + 1 + + uid diff --git a/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/fridgefreezer.xml b/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/fridgefreezer.xml index 23fe18099da..5ccbca2e618 100644 --- a/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/fridgefreezer.xml +++ b/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/fridgefreezer.xml @@ -33,9 +33,15 @@ Target temperature to be reached by the fridge compartment + + + + 1 + + uid diff --git a/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/oven.xml b/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/oven.xml index f73629332b2..1db6b9140bc 100644 --- a/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/oven.xml +++ b/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/oven.xml @@ -42,10 +42,16 @@ Program temperature in the oven + + + + 1 + + uid diff --git a/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/tumbledryer.xml b/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/tumbledryer.xml index 17421f6df47..45d4b780479 100644 --- a/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/tumbledryer.xml +++ b/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/tumbledryer.xml @@ -27,10 +27,16 @@ + + + + 1 + + uid diff --git a/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/washingmachine.xml b/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/washingmachine.xml index 9f7c14fb8bb..18644917017 100644 --- a/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/washingmachine.xml +++ b/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/thing/washingmachine.xml @@ -27,6 +27,8 @@ + + @@ -38,7 +40,7 @@ - 1 + 2 uid diff --git a/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/update/instructions.xml b/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/update/instructions.xml index bde4ddefba5..fdcf1676355 100644 --- a/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/update/instructions.xml +++ b/bundles/org.openhab.binding.miele/src/main/resources/OH-INF/update/instructions.xml @@ -3,6 +3,17 @@ xmlns:update="https://openhab.org/schemas/update-description/v1.0.0" xsi:schemaLocation="https://openhab.org/schemas/update-description/v1.0.0 https://openhab.org/schemas/update-description-1.0.0.xsd"> + + + + miele:info + + + miele:failure + + + + @@ -13,6 +24,58 @@ + + + miele:info + + + miele:failure + + + + + + + + miele:info + + + miele:failure + + + + + + + + miele:info + + + miele:failure + + + + + + + + miele:info + + + miele:failure + + + + + + + + miele:info + + + miele:failure + + @@ -25,6 +88,14 @@ + + + miele:info + + + miele:failure + +