Skip to content

Commit

Permalink
Use auto update policy 'veto' for light channels
Browse files Browse the repository at this point in the history 
Resolves #15983

Signed-off-by: Jacob Laursen <[email protected]>
  • Loading branch information
@jlaur
jlaur committed Dec 4, 2023
1 parent a850df1 commit 6ff09d1
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 17 deletions.
6 changes: 3 additions & 3 deletions bundles/org.openhab.binding.hue/src/main/resources/OH-INF/i18n/hue.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ thing-type.hue.device.description = A Hue API v2 device with channels depending
thing-type.hue.device.channel.alert.description = Activate the alert for the light.
thing-type.hue.device.channel.button-last-updated.label = Button Last Updated
thing-type.hue.device.channel.button-last-updated.description = The date and time when a button was last pressed.
thing-type.hue.device.channel.color-xy-only.description = Set the color xy parameter of the light without changing other state parameters.
thing-type.hue.device.channel.dimming-only.description = Set the dimming parameter of the light without changing other state parameters.
thing-type.hue.device.channel.effect.description = Activate the effect for the light.
thing-type.hue.device.channel.light-level.description = Current light level.
thing-type.hue.device.channel.light-level-enabled.description = Light level sensor enabled.
Expand All @@ -52,7 +50,6 @@ thing-type.hue.device.channel.light-level-last-updated.description = The date an
thing-type.hue.device.channel.motion-enabled.description = Motion sensor enabled.
thing-type.hue.device.channel.motion-last-updated.label = Motion Last Updated
thing-type.hue.device.channel.motion-last-updated.description = The date and time when the motion value was last updated.
thing-type.hue.device.channel.on-off-only.description = Set the on/off parameter of the light without changing other state parameters.
thing-type.hue.device.channel.rotary-steps-last-updated.label = Rotary Steps Last Updated
thing-type.hue.device.channel.rotary-steps-last-updated.description = The date and time when the rotary steps were last updated.
thing-type.hue.device.channel.security-contact.label = Security Contact
Expand Down Expand Up @@ -136,8 +133,11 @@ thing-type.config.hue.zone.resourceId.description = Unique Resource ID of the zo
# channel types

channel-type.hue.advanced-brightness.label = Dimming Only
channel-type.hue.advanced-brightness.description = Set the dimming parameter of the light without changing other state parameters.
channel-type.hue.advanced-color.label = Color XY Only
channel-type.hue.advanced-color.description = Set the color xy parameter of the light without changing other state parameters.
channel-type.hue.advanced-power.label = On/Off Only
channel-type.hue.advanced-power.description = Set the on/off parameter of the light without changing other state parameters.
channel-type.hue.alert-v2.label = Alert
channel-type.hue.alert.label = Alert
channel-type.hue.alert.description = The alert channel allows a temporary change to the bulb’s state.
Expand Down
32 changes: 18 additions & 14 deletions bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/Clip2Thing.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,18 @@
<description>A Hue API v2 device with channels depending on its actual capabilities.</description>

<channels>
<channel id="color" typeId="system.color"/>
<channel id="color-temperature" typeId="system.color-temperature"/>
<channel id="brightness" typeId="system.brightness"/>
<channel id="switch" typeId="system.power"/>
<channel id="color" typeId="system.color">
<autoUpdatePolicy>veto</autoUpdatePolicy>
</channel>
<channel id="color-temperature" typeId="system.color-temperature">
<autoUpdatePolicy>veto</autoUpdatePolicy>
</channel>
<channel id="brightness" typeId="system.brightness">
<autoUpdatePolicy>veto</autoUpdatePolicy>
</channel>
<channel id="switch" typeId="system.power">
<autoUpdatePolicy>veto</autoUpdatePolicy>
</channel>
<channel id="alert" typeId="alert-v2">
<description>Activate the alert for the light.</description>
</channel>
Expand Down Expand Up @@ -85,20 +93,16 @@
<channel id="battery-low" typeId="system.low-battery"/>
<channel id="last-updated" typeId="last-updated-v2"/>
<channel id="dynamics" typeId="dynamics"/>
<channel id="color-temperature-abs" typeId="system.color-temperature-abs"/>
<channel id="color-xy-only" typeId="advanced-color">
<description>Set the color xy parameter of the light without changing other state parameters.</description>
</channel>
<channel id="dimming-only" typeId="advanced-brightness">
<description>Set the dimming parameter of the light without changing other state parameters.</description>
</channel>
<channel id="on-off-only" typeId="advanced-power">
<description>Set the on/off parameter of the light without changing other state parameters.</description>
<channel id="color-temperature-abs" typeId="system.color-temperature-abs">
<autoUpdatePolicy>veto</autoUpdatePolicy>
</channel>
<channel id="color-xy-only" typeId="advanced-color"/>
<channel id="dimming-only" typeId="advanced-brightness"/>
<channel id="on-off-only" typeId="advanced-power"/>
</channels>

<properties>
<property name="thingTypeVersion">1</property>
<property name="thingTypeVersion">2</property>
</properties>

<representation-property>resourceId</representation-property>
Expand Down
6 changes: 6 additions & 0 deletions bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/channels.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,20 +240,26 @@
<channel-type id="advanced-color" advanced="true">
<item-type>Color</item-type>
<label>Color XY Only</label>
<description>Set the color xy parameter of the light without changing other state parameters.</description>
<category>ColorLight</category>
<autoUpdatePolicy>veto</autoUpdatePolicy>
</channel-type>

<channel-type id="advanced-brightness" advanced="true">
<item-type>Dimmer</item-type>
<label>Dimming Only</label>
<description>Set the dimming parameter of the light without changing other state parameters.</description>
<category>Light</category>
<state pattern="%.1f %%"/>
<autoUpdatePolicy>veto</autoUpdatePolicy>
</channel-type>

<channel-type id="advanced-power" advanced="true">
<item-type>Switch</item-type>
<label>On/Off Only</label>
<description>Set the on/off parameter of the light without changing other state parameters.</description>
<category>Switch</category>
<autoUpdatePolicy>veto</autoUpdatePolicy>
</channel-type>

<channel-type id="security-contact">
Expand Down
18 changes: 18 additions & 0 deletions bundles/org.openhab.binding.hue/src/main/resources/OH-INF/update/instructions.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,24 @@
</add-channel>
</instruction-set>

<instruction-set targetVersion="2">
<update-channel id="brightness">
<type>system:brightness</type>
</update-channel>
<update-channel id="color">
<type>system:color</type>
</update-channel>
<update-channel id="color-temperature">
<type>system:color-temperature</type>
</update-channel>
<update-channel id="color-temperature-abs">
<type>system:color-temperature-abs</type>
</update-channel>
<update-channel id="switch">
<type>system:power</type>
</update-channel>
</instruction-set>

</thing-type>

</update:update-descriptions>

0 comments on commit 6ff09d1

Please sign in to comment.