From 59202e85bccb35ab8fc48b48cfc1ea3186ef8c56 Mon Sep 17 00:00:00 2001
From: Jacob Laursen <jacob-github@vindvejr.dk>
Date: Thu, 30 Nov 2023 22:58:35 +0100
Subject: [PATCH] Use auto update policy 'veto' for light channels

Resolves #15983

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
---
 .../main/resources/OH-INF/i18n/hue.properties |  6 ++--
 .../resources/OH-INF/thing/Clip2Thing.xml     | 32 +++++++++++--------
 .../main/resources/OH-INF/thing/channels.xml  |  6 ++++
 .../resources/OH-INF/update/instructions.xml  | 18 +++++++++++
 4 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/i18n/hue.properties b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/i18n/hue.properties
index 3fa66d65d9a03..b6d1dbb42159a 100644
--- a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/i18n/hue.properties
+++ b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/i18n/hue.properties
@@ -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.
@@ -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
@@ -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.
diff --git a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/Clip2Thing.xml b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/Clip2Thing.xml
index 33f5d935c5608..ae1a34aeba55e 100644
--- a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/Clip2Thing.xml
+++ b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/Clip2Thing.xml
@@ -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>
@@ -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>
diff --git a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/channels.xml b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/channels.xml
index c1f82b5516ac7..d4ba6e9b70f2e 100644
--- a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/channels.xml
+++ b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/thing/channels.xml
@@ -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">
diff --git a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/update/instructions.xml b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/update/instructions.xml
index 4e851e97e4e7c..935e61b44de81 100644
--- a/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/update/instructions.xml
+++ b/bundles/org.openhab.binding.hue/src/main/resources/OH-INF/update/instructions.xml
@@ -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>