From e11cfe110f667665777ca333de313c876cfccea3 Mon Sep 17 00:00:00 2001 From: Leo Siepel Date: Sat, 25 Oct 2025 22:26:38 +0200 Subject: [PATCH 1/2] Fix itemtype Signed-off-by: Leo Siepel --- .../README.md | 22 +++++++++---------- .../OH-INF/i18n/ojelectronics.properties | 2 ++ .../resources/OH-INF/thing/thing-types.xml | 7 ++++-- .../resources/OH-INF/update/thing-update.xml | 17 ++++++++++++++ 4 files changed, 35 insertions(+), 13 deletions(-) create mode 100644 bundles/org.openhab.binding.ojelectronics/src/main/resources/OH-INF/update/thing-update.xml diff --git a/bundles/org.openhab.binding.ojelectronics/README.md b/bundles/org.openhab.binding.ojelectronics/README.md index 76124c9821d3d..087b2f8471daf 100644 --- a/bundles/org.openhab.binding.ojelectronics/README.md +++ b/bundles/org.openhab.binding.ojelectronics/README.md @@ -37,25 +37,25 @@ After the ojcloud bridge is successfully initialized all thermostats will be dis | Channel | Type | Description | |--------------------|--------------------|------------------------------------------------------------------------------------| | floorTemperature | Number:Temperature | Floor temperature | -| groupName | Text | Group name | +| groupName | String | Group name | | groupId | Number | Group Id | | online | Contact | Online | | heating | Contact | Heating | | roomTemperature | Number:Temperature | Room temperature | -| thermostatName | Text | Thermostat name | -| regulationMode | Text | Regulation mode | -| serialNumber | Text | Serial number | +| thermostatName | String | Thermostat name | +| regulationMode | String | Regulation mode | +| serialNumber | String | Serial number | | comfortSetpoint | Number:Temperature | Target comfort temperature | -| comfortEndTime | Date time | Date and time when the thermostat switchs back from comfort mode to automatic mode | -| boostEndTime | Date time | Date and time when the thermostat switchs back from boost mode to automatic mode | -| manualModeSetpoint | Number:Temperature | Target temperature of the manual mode | -| vacationEnabled | Contact | Vacation is enabled | -| vacationBeginDay | Date time | Vacation start date | -| vacationEndDay | Date time | Vacation end date | +| comfortEndTime | DateTime | Date and time when the thermostat switches back from comfort mode to automatic mode | +| boostEndTime | DateTime | Date and time when the thermostat switches back from boost mode to automatic mode | +| manualSetpoint | Number:Temperature | Target temperature of the manual mode | +| vacationEnabled | Switch | Vacation is enabled | +| vacationBeginDay | DateTime | Vacation start date | +| vacationEndDay | DateTime | Vacation end date | ## Example -This example shows how to configure the OJElecttronics binding. +This example shows how to configure the OJElectronics binding. ### `demo.things` Example diff --git a/bundles/org.openhab.binding.ojelectronics/src/main/resources/OH-INF/i18n/ojelectronics.properties b/bundles/org.openhab.binding.ojelectronics/src/main/resources/OH-INF/i18n/ojelectronics.properties index 177912d5a8658..2c7e52d19b9dd 100644 --- a/bundles/org.openhab.binding.ojelectronics/src/main/resources/OH-INF/i18n/ojelectronics.properties +++ b/bundles/org.openhab.binding.ojelectronics/src/main/resources/OH-INF/i18n/ojelectronics.properties @@ -49,5 +49,7 @@ channel-type.ojelectronics.regulationMode.state.option.eco = Eco channel-type.ojelectronics.roomTemperature.label = Room Temperature channel-type.ojelectronics.thermostatName.label = Thermostat Name channel-type.ojelectronics.vacationBeginDay.label = Vacation Begin Day +channel-type.ojelectronics.vacationBeginDay.description = Vacation start date channel-type.ojelectronics.vacationEnabled.label = Vacation Mode Enabled channel-type.ojelectronics.vacationEndDay.label = Vacation End Day +channel-type.ojelectronics.vacationEndDay.description = Vacation end date diff --git a/bundles/org.openhab.binding.ojelectronics/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.ojelectronics/src/main/resources/OH-INF/thing/thing-types.xml index 660ba6b667afc..db0f711e8ba0b 100644 --- a/bundles/org.openhab.binding.ojelectronics/src/main/resources/OH-INF/thing/thing-types.xml +++ b/bundles/org.openhab.binding.ojelectronics/src/main/resources/OH-INF/thing/thing-types.xml @@ -68,6 +68,7 @@ OJ Electronics + 1 serialNumber @@ -183,11 +184,13 @@ - Switch + DateTime + Vacation start date - Switch + DateTime + Vacation end date diff --git a/bundles/org.openhab.binding.ojelectronics/src/main/resources/OH-INF/update/thing-update.xml b/bundles/org.openhab.binding.ojelectronics/src/main/resources/OH-INF/update/thing-update.xml new file mode 100644 index 0000000000000..a3e494007b473 --- /dev/null +++ b/bundles/org.openhab.binding.ojelectronics/src/main/resources/OH-INF/update/thing-update.xml @@ -0,0 +1,17 @@ + + + + + + + ojelectronics:vacationBeginDay + + + ojelectronics:vacationEndDay + + + + + From e0b1f0211e18b5b6ef38863e392c50f49298df35 Mon Sep 17 00:00:00 2001 From: Leo Siepel Date: Sat, 25 Oct 2025 22:30:59 +0200 Subject: [PATCH 2/2] Spotless Signed-off-by: Leo Siepel --- .../src/main/resources/OH-INF/thing/thing-types.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.openhab.binding.ojelectronics/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.ojelectronics/src/main/resources/OH-INF/thing/thing-types.xml index db0f711e8ba0b..f01bf7a513878 100644 --- a/bundles/org.openhab.binding.ojelectronics/src/main/resources/OH-INF/thing/thing-types.xml +++ b/bundles/org.openhab.binding.ojelectronics/src/main/resources/OH-INF/thing/thing-types.xml @@ -68,7 +68,7 @@ OJ Electronics - 1 + 1 serialNumber