From 5a46c100bfec3c6d9807081d15072bb968f2abe5 Mon Sep 17 00:00:00 2001
From: Clive <git@strudwick.co.uk>
Date: Sun, 14 Jun 2026 00:07:21 +0100
Subject: [PATCH 1/2] Remove redundant native-state declarations from sensor
 device types
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The 11 type="sensor" device definitions that enable a native display state
via their creation props (SupportsSensorValue or SupportsOnState True) still
declared that same state in Devices.xml, so the Indigo client logs a
"native state keys cannot be overriden (ignoring)" error per device at
startup — the same issue already handled on the relay base type.

Removed sensorValue from Temperature/Humidity/Illuminance/Pressure/Flow/CO2/
PM25/TVOC and onOffState from Motion/Contact/SmokeCO. matterAirQualitySensor
is deliberately left untouched — it sets both Supports* props False, so there
sensorValue is a legal XML-declared custom state (issue #56), not the native
key.

Full test suite green (773 passed).
---
 .../Contents/Server Plugin/Devices.xml        | 63 -------------------
 1 file changed, 63 deletions(-)

diff --git a/indigo-matter.indigoPlugin/Contents/Server Plugin/Devices.xml b/indigo-matter.indigoPlugin/Contents/Server Plugin/Devices.xml
index 4ade3b1..2581a04 100644
--- a/indigo-matter.indigoPlugin/Contents/Server Plugin/Devices.xml	
+++ b/indigo-matter.indigoPlugin/Contents/Server Plugin/Devices.xml	
@@ -123,12 +123,6 @@
             </Field>
         </ConfigUI>
         <States>
-            <State id="sensorValue">
-                <ValueType>Number</ValueType>
-                <TriggerLabel>Temperature</TriggerLabel>
-                <TriggerLabelPrefix>Temperature is</TriggerLabelPrefix>
-                <ControlPageLabel>Temperature</ControlPageLabel>
-            </State>
             <State id="batteryLevel">
                 <ValueType>Integer</ValueType>
                 <TriggerLabel>Battery Level</TriggerLabel>
@@ -155,12 +149,6 @@
             </Field>
         </ConfigUI>
         <States>
-            <State id="sensorValue">
-                <ValueType>Number</ValueType>
-                <TriggerLabel>Humidity</TriggerLabel>
-                <TriggerLabelPrefix>Humidity is</TriggerLabelPrefix>
-                <ControlPageLabel>Humidity</ControlPageLabel>
-            </State>
             <State id="batteryLevel">
                 <ValueType>Integer</ValueType>
                 <TriggerLabel>Battery Level</TriggerLabel>
@@ -187,11 +175,6 @@
             </Field>
         </ConfigUI>
         <States>
-            <State id="onOffState">
-                <ValueType boolType="OnOff">Boolean</ValueType>
-                <TriggerLabel>Motion</TriggerLabel>
-                <ControlPageLabel>Motion</ControlPageLabel>
-            </State>
             <State id="batteryLevel">
                 <ValueType>Integer</ValueType>
                 <TriggerLabel>Battery Level</TriggerLabel>
@@ -218,11 +201,6 @@
             </Field>
         </ConfigUI>
         <States>
-            <State id="onOffState">
-                <ValueType boolType="OpenClosed">Boolean</ValueType>
-                <TriggerLabel>Contact</TriggerLabel>
-                <ControlPageLabel>Contact</ControlPageLabel>
-            </State>
             <State id="batteryLevel">
                 <ValueType>Integer</ValueType>
                 <TriggerLabel>Battery Level</TriggerLabel>
@@ -249,12 +227,6 @@
             </Field>
         </ConfigUI>
         <States>
-            <State id="sensorValue">
-                <ValueType>Number</ValueType>
-                <TriggerLabel>Illuminance</TriggerLabel>
-                <TriggerLabelPrefix>Illuminance is</TriggerLabelPrefix>
-                <ControlPageLabel>Illuminance (lux)</ControlPageLabel>
-            </State>
             <State id="batteryLevel">
                 <ValueType>Integer</ValueType>
                 <TriggerLabel>Battery Level</TriggerLabel>
@@ -416,11 +388,6 @@
             </Field>
         </ConfigUI>
         <States>
-            <State id="onOffState">
-                <ValueType boolType="OnOff">Boolean</ValueType>
-                <TriggerLabel>Alarm</TriggerLabel>
-                <ControlPageLabel>Alarm</ControlPageLabel>
-            </State>
             <State id="expressedState">
                 <ValueType>String</ValueType>
                 <TriggerLabel>Expressed State</TriggerLabel>
@@ -520,12 +487,6 @@
             </Field>
         </ConfigUI>
         <States>
-            <State id="sensorValue">
-                <ValueType>Number</ValueType>
-                <TriggerLabel>CO&#x2082; (ppm)</TriggerLabel>
-                <TriggerLabelPrefix>CO&#x2082; is</TriggerLabelPrefix>
-                <ControlPageLabel>CO&#x2082; (ppm)</ControlPageLabel>
-            </State>
             <State id="batteryLevel">
                 <ValueType>Integer</ValueType>
                 <TriggerLabel>Battery Level</TriggerLabel>
@@ -553,12 +514,6 @@
             </Field>
         </ConfigUI>
         <States>
-            <State id="sensorValue">
-                <ValueType>Number</ValueType>
-                <TriggerLabel>PM2.5 (&#xB5;g/m&#xB3;)</TriggerLabel>
-                <TriggerLabelPrefix>PM2.5 is</TriggerLabelPrefix>
-                <ControlPageLabel>PM2.5 (&#xB5;g/m&#xB3;)</ControlPageLabel>
-            </State>
             <State id="batteryLevel">
                 <ValueType>Integer</ValueType>
                 <TriggerLabel>Battery Level</TriggerLabel>
@@ -586,12 +541,6 @@
             </Field>
         </ConfigUI>
         <States>
-            <State id="sensorValue">
-                <ValueType>Number</ValueType>
-                <TriggerLabel>TVOC</TriggerLabel>
-                <TriggerLabelPrefix>TVOC is</TriggerLabelPrefix>
-                <ControlPageLabel>TVOC</ControlPageLabel>
-            </State>
             <State id="batteryLevel">
                 <ValueType>Integer</ValueType>
                 <TriggerLabel>Battery Level</TriggerLabel>
@@ -659,12 +608,6 @@
             </Field>
         </ConfigUI>
         <States>
-            <State id="sensorValue">
-                <ValueType>Number</ValueType>
-                <TriggerLabel>Pressure</TriggerLabel>
-                <TriggerLabelPrefix>Pressure is</TriggerLabelPrefix>
-                <ControlPageLabel>Pressure (hPa)</ControlPageLabel>
-            </State>
             <State id="batteryLevel">
                 <ValueType>Integer</ValueType>
                 <TriggerLabel>Battery Level</TriggerLabel>
@@ -691,12 +634,6 @@
             </Field>
         </ConfigUI>
         <States>
-            <State id="sensorValue">
-                <ValueType>Number</ValueType>
-                <TriggerLabel>Flow</TriggerLabel>
-                <TriggerLabelPrefix>Flow is</TriggerLabelPrefix>
-                <ControlPageLabel>Flow (m³/h)</ControlPageLabel>
-            </State>
             <State id="batteryLevel">
                 <ValueType>Integer</ValueType>
                 <TriggerLabel>Battery Level</TriggerLabel>

From cf0d789f250ef203c89586415a6b387a3bdca719 Mon Sep 17 00:00:00 2001
From: Simon Clark <simon@starmerclark.com>
Date: Mon, 6 Jul 2026 18:34:47 +0100
Subject: [PATCH 2/2] chore: sync with main + bump version to 2026.4.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Maintainer commit on top of Highsteads' PR #73: merge current main
(post-#80 split-endpoint energy) and bump PluginVersion per the
every-PR version rule. Patch bump — startup-noise cleanup, no
functional change.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Arj5R66d73tc3PMPvHS65Z
---
 indigo-matter.indigoPlugin/Contents/Info.plist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indigo-matter.indigoPlugin/Contents/Info.plist b/indigo-matter.indigoPlugin/Contents/Info.plist
index 44b1e42..f21c051 100644
--- a/indigo-matter.indigoPlugin/Contents/Info.plist
+++ b/indigo-matter.indigoPlugin/Contents/Info.plist
@@ -20,7 +20,7 @@
 	<key>IwsApiVersion</key>
 	<string>1.0.0</string>
 	<key>PluginVersion</key>
-	<string>2026.4.0</string>
+	<string>2026.4.1</string>
 	<key>ServerApiVersion</key>
 	<string>3.6</string>
 </dict>