Updatw 27.01.25

README.md

@@ -76,6 +76,12 @@ With the ioBroker Matter Adapter, it is possible to map the following use cases:
 -->
 
 ## Changelog
+
+### __WORK IN PROGRESS__
+* (@Apollon77) Fixed Thermostat limit initialization and Mode error
+* (@Apollon77) Fixed Matter Event handling when mapped to an ioBroker state (e.g.GenericSwitch)
+* (@Apollon77) Fixed Device type detection by really preferring the preferred type
+
 ### 0.4.9 (2025-01-26)
 * (@Apollon77) Enhanced error and invalid devices display for UI
 * (@Apollon77) Fixed Button Press Controller support

src-admin/package.json

@@ -7,8 +7,8 @@
     },
     "dependencies": {
         "@foxriver76/iob-component-lib": "^0.2.0",
-        "@iobroker/adapter-react-v5": "^7.4.18",
-        "@iobroker/dm-gui-components": "^7.4.18",
+        "@iobroker/adapter-react-v5": "^7.4.19",
+        "@iobroker/dm-gui-components": "^7.4.19",
         "@iobroker/type-detector": "^4.1.1",
         "@types/react-dom": "^18.3.5",
         "@types/uuid": "^10.0.0",
@@ -51,4 +51,4 @@
             }
         ]
     ]
-}
+}

src-admin/src/Tabs/Bridges.tsx

@@ -1250,7 +1250,7 @@ export class Bridges extends BridgesAndDevices<BridgesProps, BridgesState> {
                             <div style={styles.deviceType}>{`${I18n.t('Device type')}: ${I18n.t(device.type)}`}</div>
                         </div>
                         <div style={{ flex: 1 }} />
-                        {this.props.nodeStates?.[bridge.uuid] ? (
+                        {this.props.nodeStates?.[bridge.uuid] && bridge.enabled ? (
                             <Tooltip
                                 key="debug"
                                 title={hasError ? I18n.t('Show error') : I18n.t('Show additional information')}

src/lib/devices/Thermostat.ts

@@ -127,6 +127,13 @@ export class Thermostat extends GenericDevice {
         return this.#modeState.value;
     }
 
+    updateMode(mode: ThermostatMode): Promise<void> {
+        if (!this.#modeState) {
+            throw new Error('Mode state not found');
+        }
+        return this.#modeState.updateValue(mode);
+    }
+
     hasMode(): boolean {
         return !!this.#modeState;
     }

src/main.ts

@@ -83,7 +83,6 @@ export class MatterAdapter extends utils.Adapter {
     readonly #bridges = new Map<string, { bridge?: BridgedDevice; error?: string }>();
     #controller?: MatterController;
     #sendControllerUpdateTimeout?: NodeJS.Timeout;
-    #detector: ChannelDetector;
     #_guiSubscribes: { clientId: string; ts: number }[] | null = null;
     readonly #matterEnvironment: Environment;
     #stateTimeout?: NodeJS.Timeout;
@@ -130,7 +129,6 @@ export class MatterAdapter extends utils.Adapter {
         this.#deviceManagement = new MatterAdapterDeviceManagement(this);
         this.#matterEnvironment = Environment.default;
 
-        this.#detector = new ChannelDetector();
         this.t = (word: string, ..._args: (string | number | boolean | null)[]): string => word;
         this.getText = (_word: string, ..._args: (string | number | boolean | null)[]): ioBroker.Translated =>
             ({}) as ioBroker.Translated;
@@ -813,8 +811,16 @@ export class MatterAdapter extends utils.Adapter {
             _usedIdsOptional: usedIds,
             ignoreIndicators,
             excludedTypes: [Types.info],
+            allowedTypes: preferredType ? [preferredType as Types] : undefined,
+            //ignoreCache: true
         };
-        const controls = this.#detector.detect(options);
+
+        const detector = new ChannelDetector();
+        let controls = detector.detect(options);
+        if (!controls?.length) {
+            delete options.allowedTypes;
+            controls = detector.detect(options);
+        }
         if (controls?.length) {
             let controlsToCheck = controls.filter((control: PatternControl) =>
                 control.states.some(({ id: foundId }) => foundId === id),

src/matter/BridgedDevicesNode.ts

@@ -225,7 +225,7 @@ class BridgedDevices extends BaseServerNode {
                     productId,
                     serialNumber: uniqueId,
                     uniqueId: md5(uniqueId),
-                    hardwareVersion: versions.versionNum,
+                    hardwareVersion: 1,
                     hardwareVersionString: versions.versionStr,
                     softwareVersion: versions.versionNum,
                     softwareVersionString: versions.versionStr,

src/matter/DeviceNode.ts

@@ -125,7 +125,7 @@ class Device extends BaseServerNode {
                         productId,
                         serialNumber: uniqueId,
                         uniqueId: md5(uniqueId),
-                        hardwareVersion: versions.versionNum,
+                        hardwareVersion: 1,
                         hardwareVersionString: versions.versionStr,
                         softwareVersion: versions.versionNum,
                         softwareVersionString: versions.versionStr,

src/matter/to-iobroker/GenericDeviceToIoBroker.ts

@@ -312,7 +312,7 @@ export abstract class GenericDeviceToIoBroker {
             eventId = cluster.events[eventName].id;
         }
 
-        if (stateData.id !== undefined) {
+        if (stateData.id === undefined) {
             stateData.id = `${this.baseId}.`;
         }
         const pathId = eventPathToString({ endpointId, clusterId, eventName });

src/matter/to-matter/ThermostatToMatter.ts

@@ -115,7 +115,7 @@ export class ThermostatToMatter extends GenericDeviceToMatter {
                     adapter: ioBrokerDevice.adapter,
                 },
                 thermostat: {
-                    // Values are potentially corrected later again
+                    // Values are corrected later again with real values
                     systemMode: hasHeating ? MatterThermostat.SystemMode.Heat : MatterThermostat.SystemMode.Cool,
                     controlSequenceOfOperation:
                         hasHeating && hasCooling
@@ -124,10 +124,10 @@ export class ThermostatToMatter extends GenericDeviceToMatter {
                               ? MatterThermostat.ControlSequenceOfOperation.CoolingOnly
                               : MatterThermostat.ControlSequenceOfOperation.HeatingOnly,
                     minSetpointDeadBand: clusterModes.includes(MatterThermostat.Feature.AutoMode) ? 0 : undefined,
-                    absMinHeatSetpointLimit: hasHeating ? this.convertTemperatureValue(7) : undefined,
-                    absMaxHeatSetpointLimit: hasHeating ? this.convertTemperatureValue(30) : undefined,
-                    absMinCoolSetpointLimit: hasCooling ? this.convertTemperatureValue(16) : undefined,
-                    absMaxCoolSetpointLimit: hasCooling ? this.convertTemperatureValue(32) : undefined,
+                    absMinHeatSetpointLimit: hasHeating ? this.convertTemperatureValue(0) : undefined,
+                    absMaxHeatSetpointLimit: hasHeating ? this.convertTemperatureValue(50) : undefined,
+                    absMinCoolSetpointLimit: hasCooling ? this.convertTemperatureValue(0) : undefined,
+                    absMaxCoolSetpointLimit: hasCooling ? this.convertTemperatureValue(50) : undefined,
                 },
             },
         );
@@ -242,8 +242,10 @@ export class ThermostatToMatter extends GenericDeviceToMatter {
                 const minMax = this.#ioBrokerDevice.getSetpointMinMax() ?? { min: 7, max: 30 };
                 await this.#matterEndpointThermostat.setStateOf(IoThermostatServer, {
                     // should be HeatingThermostatServer
-                    // @ts-expect-error Workaround a .js instancing/typing error
-                    occupiedHeatingSetpoint: this.convertTemperatureValue(setpointTemperature),
+                    // @ts-expect-error Workaround a matter.js instancing/typing error
+                    occupiedHeatingSetpoint: this.convertTemperatureValue(
+                        this.#ioBrokerDevice.cropValue(setpointTemperature, minMax.min, minMax.max, true),
+                    ),
                     absMinHeatSetpointLimit: this.convertTemperatureValue(minMax.min),
                     absMaxHeatSetpointLimit: this.convertTemperatureValue(minMax.max),
                 });
@@ -252,7 +254,9 @@ export class ThermostatToMatter extends GenericDeviceToMatter {
                 const minMax = this.#ioBrokerDevice.getSetpointMinMax() ?? { min: 16, max: 32 };
                 await this.#matterEndpointThermostat.setStateOf(IoThermostatServer, {
                     // @ts-expect-error Workaround a matter.js instancing/typing error
-                    occupiedCoolingSetpoint: this.convertTemperatureValue(setpointTemperature),
+                    occupiedCoolingSetpoint: this.convertTemperatureValue(
+                        this.#ioBrokerDevice.cropValue(setpointTemperature, minMax.min, minMax.max, true),
+                    ),
                     absMinCoolSetpointLimit: this.convertTemperatureValue(minMax.min),
                     absMaxCoolSetpointLimit: this.convertTemperatureValue(minMax.max),
                 });