Merge branch 'beta' into main

w35l3y · Dec 19, 2023 · 1e5df72 · 1e5df72
2 parents 8e597b2 + 5815782
commit 1e5df72
Show file tree

Hide file tree

Showing 32 changed files with 564 additions and 124 deletions.
diff --git a/.github/workflows/call-test-driver.yaml b/.github/workflows/call-test-driver.yaml
@@ -33,11 +33,11 @@ jobs:
       fail-fast: false
       matrix:
         stapi:
-          - v6_49
+          - v8_51
         include:
-          - stapi: v6_49
-            release: apiv6_49/lua_libs-api_v6_49X
-            path: lua_libs-api_v6
+          - stapi: v8_51
+            release: apiv8_51/lua_libs-api_v8_51X
+            path: lua_libs-api_v8
     steps:
       - name: Check SMARTTHINGS_TOKEN
         uses: actions/github-script@v3
@@ -121,19 +121,19 @@ jobs:
       fail-fast: false
       matrix:
         stapi:
-          - v3_46
           - v4_47_B
           - v5_48
+          - v6_49
         include:
-          - stapi: v3_46
-            release: apiv3_46/lua_libs-api_v3_46X
-            path: lua_libs-api_v3
           - stapi: v4_47_B
             release: apiv4_47_beta/lua_libs-api_v4_47X_beta
             path: lua_libs-api_v4
           - stapi: v5_48
             release: apiv5_48/lua_libs-api_v5_48X
             path: lua_libs-api_v5
+          - stapi: v6_49
+            release: apiv6_49/lua_libs-api_v6_49X
+            path: lua_libs-api_v6
     steps:
       - name: Check SMARTTHINGS_TOKEN
         uses: actions/github-script@v3

diff --git a/default-clusters/fingerprints.yaml b/default-clusters/fingerprints.yaml
@@ -8,6 +8,29 @@ zigbeeGeneric:
         - 0x0201
         - 0x0402
         - 0x0405
+  - id: "GenericMultiSensorV2"
+    deviceProfileName: multisensor_v2
+    deviceLabel: Generic Multi Sensor
+    clusters:
+      server:
+        - 0x0000
+        - 0x0001
+        - 0x0400
+        - 0x0402
+        - 0x0405
+        - 0x0406
+        - 0x0500
+  - id: "GenericMultiSensorV1"
+    deviceProfileName: multisensor_v1
+    deviceLabel: Generic Multi Sensor
+    clusters:
+      server:
+        - 0x0000
+        - 0x0400
+        - 0x0402
+        - 0x0405
+        - 0x0406
+        - 0x0500
   - id: "GenericTempHumiBatt"
     deviceProfileName: temphumibatt_v1
     deviceLabel: Generic Thermostat

diff --git a/default-clusters/profiles/default_v1.yaml b/default-clusters/profiles/default_v1.yaml
@@ -64,7 +64,7 @@ components:
 preferences:
   - name: profile
     title: Profile
-    description: "Choose the profile "
+    description: "Choose the profile  "
     required: true
     preferenceType: enumeration
     definition:
@@ -77,6 +77,7 @@ preferences:
         humidity_v1: Humidity Sensor
         lock_v1: Lock
         motion_v1: Motion Sensor
+        multisensor_v1: Multi Sensor
         occupancy_v1: Occupancy Sensor
         power_v1: Power Meter
         smoke_v1: Smoke Detector

diff --git a/default-clusters/profiles/multisensor_v1.yaml b/default-clusters/profiles/multisensor_v1.yaml
@@ -0,0 +1,51 @@
+# https://developer.smartthings.com/docs/devices/device-profiles#categories
+# https://community.smartthings.com/t/change-icons-in-new-app/184190/25?u=w35l3y
+name: "multisensor_v1"
+components:
+  - id: main
+    label: Multi sensor
+    capabilities:
+      - id: occupancySensor # 0x0406
+        version: 1
+      - id: motionSensor # 0x0500
+        version: 1
+      - id: illuminanceMeasurement # 0x0400
+        version: 1
+      - id: temperatureMeasurement # 0x0402
+        version: 1
+      - id: relativeHumidityMeasurement # 0x0405
+        version: 1
+      - id: signalStrength
+        version: 1
+      - id: powerSource
+        version: 1
+      - id: refresh
+        version: 1
+      - id: valleyboard16460.info
+        version: 1
+    categories:
+      - name: MultiFunctionalSensor
+preferences:
+  - name: profile
+    title: Profile
+    description: "Choose the profile"
+    required: true
+    preferenceType: enumeration
+    definition:
+      options:
+        multisensor_v1: Normal
+        multisensor_v2: +Battery
+        default_v1: Default
+      default: multisensor_v1
+  - preferenceId: tempOffset
+    explicit: true
+  - preferenceId: humidityOffset
+    explicit: true
+metadata:
+  deviceType: MultiFunctionalSensor
+  ocfDeviceType: x.com.st.d.sensor.multifunction
+  deviceTypeId: MultiFunctionalSensor
+  mnmn: SmartThingsCommunity
+owner:
+  ownerType: USER
+  ownerId: ea35e8c8-3aef-2f72-958b-e3ad10644043
diff --git a/default-clusters/profiles/multisensor_v2.yaml b/default-clusters/profiles/multisensor_v2.yaml
@@ -0,0 +1,53 @@
+# https://developer.smartthings.com/docs/devices/device-profiles#categories
+# https://community.smartthings.com/t/change-icons-in-new-app/184190/25?u=w35l3y
+name: "multisensor_v2"
+components:
+  - id: main
+    label: Multi sensor
+    capabilities:
+      - id: occupancySensor # 0x0406
+        version: 1
+      - id: motionSensor # 0x0500
+        version: 1
+      - id: illuminanceMeasurement # 0x0400
+        version: 1
+      - id: temperatureMeasurement # 0x0402
+        version: 1
+      - id: relativeHumidityMeasurement # 0x0405
+        version: 1
+      - id: battery
+        version: 1
+      - id: signalStrength
+        version: 1
+      - id: powerSource
+        version: 1
+      - id: refresh
+        version: 1
+      - id: valleyboard16460.info
+        version: 1
+    categories:
+      - name: MultiFunctionalSensor
+preferences:
+  - name: profile
+    title: Profile
+    description: "Choose the profile"
+    required: true
+    preferenceType: enumeration
+    definition:
+      options:
+        multisensor_v2: Normal
+        multisensor_v1: No battery
+        default_v1: Default
+      default: multisensor_v2
+  - preferenceId: tempOffset
+    explicit: true
+  - preferenceId: humidityOffset
+    explicit: true
+metadata:
+  deviceType: MultiFunctionalSensor
+  ocfDeviceType: x.com.st.d.sensor.multifunction
+  deviceTypeId: MultiFunctionalSensor
+  mnmn: SmartThingsCommunity
+owner:
+  ownerType: USER
+  ownerId: ea35e8c8-3aef-2f72-958b-e3ad10644043
diff --git a/personal-tuya-devices/DEVICES.md b/personal-tuya-devices/DEVICES.md
@@ -22,6 +22,7 @@
 | TS0601  | \_TZE200_bcusnqt8     | Power Meter     | normal-powerMeter-v1       |   6,   1                                                   |
 | TS0601  | \_TZE200_cxu0jkjk     | Window Shade    | normal-windowShade-v1      |   1,   2,   3,   7                                         |
 | TS0601  | \_TZE200_d0ypnbvn     | Smart Valve     | normal-valve-v1            |   1                                                        |
+| TS0601  | \_TZE200_d0yu2xgi     | Alarm           | normal-alarm-v2            | 104, 106, 105, 116, 102, 103                               |
 | TS0601  | \_TZE200_dfxkcots     | Dimmer          | normal-single-dimmer-v1    |   1,   2,   3                                              |
 | TS0601  | \_TZE200_dwcarsat     | Air Quality     | normal-air-quality-v2      |   2,  18,  19,  20,  21,  22                               |
 | TS0601  | \_TZE200_e3oitdyu     | Multi Dimmer    | normal-multi-dimmer-v2     |   1,   2,   3,   4,   7,   8,   9,  10                     |

diff --git a/personal-tuya-devices/PROFILES.md b/personal-tuya-devices/PROFILES.md
@@ -3,6 +3,7 @@
 | normal-air-quality-v1      | Air Quality > No fine dust sensor |
 | normal-air-quality-v2      | Air Quality                       |
 | normal-alarm-v1            | Alarm                             |
+| normal-alarm-v2            | Alarm > +Temp+Humidity            |
 | normal-contactSensor-v2    | Contact Sensor                    |
 | normal-garage-door-v1      | Garage Door                       |
 | normal-gasDetector-v1      | Gas Detector                      |

diff --git a/personal-tuya-devices/fingerprints.yaml b/personal-tuya-devices/fingerprints.yaml
@@ -141,6 +141,11 @@ zigbeeManufacturer:
     manufacturer: _TZE200_d0ypnbvn
     deviceProfileName: normal-valve-v1
     deviceLabel: Smart Valve
+  - id: TS0601/_TZE200_d0yu2xgi
+    model: TS0601
+    manufacturer: _TZE200_d0yu2xgi
+    deviceProfileName: normal-alarm-v2
+    deviceLabel: Alarm
   - id: TS0601/_TZE200_dfxkcots
     model: TS0601
     manufacturer: _TZE200_dfxkcots

diff --git a/personal-tuya-devices/models/TS0601/_TZE200_d0yu2xgi.yaml b/personal-tuya-devices/models/TS0601/_TZE200_d0yu2xgi.yaml
@@ -0,0 +1,35 @@
+deviceLabel: Alarm
+profiles:
+  - normal_alarm_v2
+datapoints:
+  # https://community.smartthings.com/t/neo-zigbee-siren-thing/267433/13?u=w35l3y
+  - id: 104
+    command: alarm
+    base:
+      group: 1
+  - id: 106
+    command: relativeHumidityMeasurement
+    base:
+      group: 1
+      rate: 100
+  - id: 105
+    command: temperatureMeasurement
+    base:
+      group: 1
+      rate: 1000
+  - id: 116
+    command: audioVolume
+    base:
+      group: 1
+      supported_values: [0, 50, 100]
+      reverse: true
+  - id: 102
+    command: enum
+    base:
+      group: 2
+      name: melody
+  - id: 103
+    command: value
+    base:
+      group: 2
+      name: duration
diff --git a/personal-tuya-devices/profiles/child-audioVolume-v1.yaml b/personal-tuya-devices/profiles/child-audioVolume-v1.yaml
@@ -11,6 +11,9 @@ components:
         version: 1
     categories:
       - name: Speaker
+preferences:
+  - preferenceId: reverse
+    explicit: true
 metadata:
   deviceType: ActiveSpeaker
   ocfDeviceType: oic.d.speaker

diff --git a/personal-tuya-devices/profiles/normal-alarm-v1.yaml b/personal-tuya-devices/profiles/normal-alarm-v1.yaml
@@ -46,6 +46,7 @@ preferences:
     definition:
       options:
         normal_alarm_v1: Normal
+        normal_alarm_v2: +Temp+Humidity
         generic_ef00_v1: Generic
       default: normal_alarm_v1
   - name: logLevel
@@ -59,6 +60,8 @@ preferences:
         info: Info, Warn, Error
         debug: Debug, Info, Warn, Error
       default: error
+  - preferenceId: reverse
+    explicit: true
   - name: prefMelody
     title: Melody
     description: An integer between 1 and 18