fix: update msOccupancySensing definition (#1031)

* Ignore .DS_Store * add type bitmap and contact settings * Use hex attribute ids
Koenkk · Apr 25, 2024 · 687527e · 687527e
1 parent 7867154
commit 687527e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,6 @@ dist/
 temp/
 .remote-sync.json
 tsconfig.tsbuildinfo
+
+# MacOS indexing files
+.DS_Store
diff --git a/src/zcl/definition/cluster.ts b/src/zcl/definition/cluster.ts
@@ -2599,14 +2599,18 @@ const Clusters: Readonly<Record<ClusterName, Readonly<ClusterDefinition>>> = {
     msOccupancySensing: {
         ID: 1030,
         attributes: {
-            occupancy: {ID: 0, type: DataType.bitmap8},
-            occupancySensorType: {ID: 1, type: DataType.enum8},
-            pirOToUDelay: {ID: 16, type: DataType.uint16},
-            pirUToODelay: {ID: 17, type: DataType.uint16},
-            pirUToOThreshold: {ID: 18, type: DataType.uint8},
-            ultrasonicOToUDelay: {ID: 32, type: DataType.uint16},
-            ultrasonicUToODelay: {ID: 33, type: DataType.uint16},
-            ultrasonicUToOThreshold: {ID: 34, type: DataType.uint8},
+            occupancy: {ID: 0x0000, type: DataType.bitmap8},
+            occupancySensorType: {ID: 0x0001, type: DataType.enum8},
+            occupancySensorTypeBitmap: {ID: 0x0002, type: DataType.bitmap8},
+            pirOToUDelay: {ID: 0x0010, type: DataType.uint16},
+            pirUToODelay: {ID: 0x0011, type: DataType.uint16},
+            pirUToOThreshold: {ID: 0x0012, type: DataType.uint8},
+            ultrasonicOToUDelay: {ID: 0x0020, type: DataType.uint16},
+            ultrasonicUToODelay: {ID: 0x0021, type: DataType.uint16},
+            ultrasonicUToOThreshold: {ID: 0x0022, type: DataType.uint8},
+            contactOToUDelay: {ID: 0x0030, type: DataType.uint16},
+            contactUToODelay: {ID: 0x0031, type: DataType.uint16},
+            contactUToOThreshold: {ID: 0x0032, type: DataType.uint8},
             elkoOccupancyDfltOperationMode: {ID: 0xE000, type: DataType.enum8, manufacturerCode: ManufacturerCode.ADEO},
             elkoOccupancyOperationMode: {ID: 0xE001, type: DataType.enum8, manufacturerCode: ManufacturerCode.ADEO},
             elkoForceOffTimeout: {ID: 0xE002, type: DataType.uint16, manufacturerCode: ManufacturerCode.ADEO},