Add the optional ventilation, pedestrian, and calibration options to the Closure constructor.

Author: Luligu

apps/frontend/src/components/DevicesIcons.tsx

@@ -135,6 +135,20 @@ const outletDeviceTypes = [0x010a, 0x010b];
 const switchDeviceTypes = [0x010f, 0x0110];
 const currentLevelDeviceTypes = [0x0100, 0x0101, 0x010c, 0x010d, 0x010a, 0x010b, 0x0110];
 const fanControlDeviceTypes = [0x002b, 0x002d]; // Fan, AirPurifier
+const closurePositionNames = ['Closed', 'Open', 'Partial', 'Pedestrian', 'Ventilation', 'Signature'] as const;
+
+/**
+ * Gets the ClosureControl current position name from an OverallCurrentState value.
+ *
+ * @param {unknown} value ClosureControl OverallCurrentState attribute value.
+ * @returns {string | undefined} The current position name, or undefined when unavailable or invalid.
+ */
+function getClosurePositionName(value: unknown): string | undefined {
+  if (typeof value !== 'object' || value === null || !('position' in value)) return undefined;
+  const position = value.position;
+  if (typeof position !== 'number' || !Number.isInteger(position) || position < 0 || position >= closurePositionNames.length) return undefined;
+  return closurePositionNames[position];
+}
 
 interface RenderProps {
   icon: React.JSX.Element;
@@ -384,7 +398,7 @@ function Device({ device, endpoint, id, deviceType, clusters }: DeviceProps): Re
       ))}
       {/* Closure */}
       {deviceType===0x0230 && clusters.filter(cluster => cluster.clusterName === 'ClosureControl' && cluster.attributeName === 'overallCurrentState').map(cluster => (
-        <Render key={`${cluster.clusterId}-${cluster.attributeId}`} icon={<BlindsIcon/>} cluster={cluster} value='Closure' />
+        <Render key={`${cluster.clusterId}-${cluster.attributeId}`} icon={<BlindsIcon/>} cluster={cluster} value={getClosurePositionName(cluster.attributeLocalValue)} />
       ))}
       {/* ClosureController */}
       {deviceType===0x023e && clusters.filter(cluster => cluster.clusterName === 'Descriptor' && cluster.attributeName === 'clusterRevision').map(cluster => (

packages/core/src/demoDevices.ts

@@ -303,6 +303,15 @@ export async function createDemoDevices(matterbridge: Matterbridge): Promise<voi
   ep = new Closure('Closure', 'ENTRY-08-05', { id: 'Closure', number: EndpointNumber(8_05) });
   await registerDevice(ep, 'Closure', 'ENTRY-08-05');
 
+  ep = new Closure('Closure Pedestrian', 'ENTRY-08-05-1', { id: 'ClosurePedestrian', number: EndpointNumber(8_05_1), pedestrian: true });
+  await registerDevice(ep, 'Closure Pedestrian', 'ENTRY-08-05-1');
+
+  ep = new Closure('Closure Ventilation', 'ENTRY-08-05-2', { id: 'ClosureVentilation', number: EndpointNumber(8_05_2), ventilation: true });
+  await registerDevice(ep, 'Closure Ventilation', 'ENTRY-08-05-2');
+
+  ep = new Closure('Closure Calibrate', 'ENTRY-08-05-3', { id: 'ClosureCalibrate', number: EndpointNumber(8_05_3), calibration: true });
+  await registerDevice(ep, 'Closure Calibrate', 'ENTRY-08-05-3');
+
   ep = new MatterbridgeEndpoint([getSupportedDeviceType('ClosureController')!, bridgedNode, powerSource], { id: 'ClosureController', number: EndpointNumber(8_07) });
   await registerDevice(ep, 'Closure Controller', 'ENTRY-08-07');
 

packages/core/src/frontend.ts

@@ -62,6 +62,7 @@ import { SoilMeasurement } from '@matter/types/clusters/soil-measurement';
 import { ValveConfigurationAndControl } from '@matter/types/clusters/valve-configuration-and-control';
 import { CommissioningOptions } from '@matter/types/commissioning';
 import { type ClusterId, type EndpointNumber, FabricIndex } from '@matter/types/datatype';
+import { ThreeLevelAuto } from '@matter/types/globals';
 // @matterbridge
 import { BroadcastServer } from '@matterbridge/thread/server';
 import type {
@@ -1502,11 +1503,12 @@ export class Frontend extends EventEmitter<FrontendEvents> {
         attributes += `Cover position: ${attributeValue / 100}% `;
       if (clusterName === 'doorLock' && attributeName === 'lockState') attributes += `State: ${attributeValue === 1 ? 'Locked' : 'Not locked'} `;
       if (clusterName === 'closureControl' && attributeName === 'overallCurrentState' && attributeValue === null)
-        attributes += `Position: unknown Latch: unknown SecureState: unknown `;
+        attributes += `Position: unknown Latch: unknown Speed: unknown SecureState: unknown `;
       if (clusterName === 'closureControl' && attributeName === 'overallCurrentState' && isValidObject(attributeValue)) {
         const overallCurrentState = attributeValue as ClosureControl.OverallCurrentState;
         attributes += `Position: ${getEnumDescription(ClosureControl.CurrentPosition, overallCurrentState.position, { fallback: 'unknown' })} `;
         attributes += `Latch: ${overallCurrentState.latch ?? 'unknown'} `;
+        attributes += `Speed: ${getEnumDescription(ThreeLevelAuto, overallCurrentState.speed, { fallback: 'unknown' })} `;
         attributes += `SecureState: ${overallCurrentState.secureState ?? 'unknown'} `;
       }
       if (clusterName === 'thermostat' && attributeName === 'localTemperature' && isValidNumber(attributeValue)) attributes += `Temperature: ${attributeValue / 100}°C `;

packages/core/vitest/frontend.test.ts

@@ -28,6 +28,7 @@ import { OperationalState } from '@matter/types/clusters/operational-state';
 import { PowerSource } from '@matter/types/clusters/power-source';
 import { RvcOperationalState } from '@matter/types/clusters/rvc-operational-state';
 import { EndpointNumber } from '@matter/types/datatype';
+import { ThreeLevelAuto } from '@matter/types/globals';
 import { BroadcastServer } from '@matterbridge/thread/server';
 import { BridgeStatus } from '@matterbridge/types';
 import { wait, waiter } from '@matterbridge/utils/wait';
@@ -473,7 +474,7 @@ describe('Matterbridge frontend', () => {
       ['windowCovering', 0x102, 'currentPositionLiftPercent100ths', 0, 5000],
       ['doorLock', 0x101, 'lockState', 0, 1],
       ['doorLock', 0x101, 'lockState', 0, 2],
-      ['closureControl', 0x104, 'overallCurrentState', 0, { position: 0, latch: true, secureState: true }],
+      ['closureControl', 0x104, 'overallCurrentState', 0, { position: 0, latch: true, speed: ThreeLevelAuto.Auto, secureState: true }],
       ['thermostat', 0x201, 'localTemperature', 0, 2000],
       ['thermostat', 0x201, 'occupiedHeatingSetpoint', 0, 2100],
       ['thermostat', 0x201, 'occupiedCoolingSetpoint', 0, 2500],
@@ -529,6 +530,7 @@ describe('Matterbridge frontend', () => {
     expect(text).toContain('State: Not locked');
     expect(text).toContain('Position: FullyClosed');
     expect(text).toContain('Latch: true');
+    expect(text).toContain('Speed: Auto');
     expect(text).toContain('SecureState: true');
     expect(text).toContain('Temperature: 20°C');
     expect(text).toContain('Heat to: 21°C');
@@ -565,7 +567,7 @@ describe('Matterbridge frontend', () => {
     const nullMeasurements = runTuples([
       ['illuminanceMeasurement', 0x400, 'measuredValue', 0, null],
       ['closureControl', 0x104, 'overallCurrentState', 0, null],
-      ['closureControl', 0x104, 'overallCurrentState', 0, { position: null, latch: null, secureState: null }],
+      ['closureControl', 0x104, 'overallCurrentState', 0, { position: null, latch: null, speed: null, secureState: null }],
       ['valveConfigurationAndControl', 0x81, 'currentState', 0, null],
       ['totalVolatileOrganicCompoundsConcentrationMeasurement', 0x42e, 'measuredValue', 0, null],
       ['pm1ConcentrationMeasurement', 0x42c, 'measuredValue', 0, null],
@@ -583,6 +585,7 @@ describe('Matterbridge frontend', () => {
     expect(nullMeasurements).toContain('Illuminance: unknown');
     expect(nullMeasurements).toContain('Position: unknown');
     expect(nullMeasurements).toContain('Latch: unknown');
+    expect(nullMeasurements).toContain('Speed: unknown');
     expect(nullMeasurements).toContain('SecureState: unknown');
     expect(nullMeasurements).toContain('State: unknown');
     expect(nullMeasurements).toContain('Voc: unknown');