Merge branch 'master' into device-state-nan

GladysAssistant · Jan 3, 2022 · 357498b · 357498b
2 parents 367f006 + a0b8831
commit 357498b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/server/services/xiaomi/lib/event/xiaomi.onMessage.js b/server/services/xiaomi/lib/event/xiaomi.onMessage.js
@@ -36,6 +36,7 @@ function onMessage(msg, rsinfo) {
     case 'sensor_cube.aqgl01':
       this.newValueCube(message, data);
       break;
+    case 'sensor_switch.aq2':
     case 'switch':
       this.newValueSwitch(message, data);
       break;

diff --git a/server/services/zigbee2mqtt/exposes/numericType.js b/server/services/zigbee2mqtt/exposes/numericType.js
@@ -115,14 +115,6 @@ module.exports = {
         max: 100,
       },
     },
-    illuminance: {
-      feature: {
-        category: DEVICE_FEATURE_CATEGORIES.LIGHT_SENSOR,
-        type: DEVICE_FEATURE_TYPES.SENSOR.DECIMAL,
-        min: 0,
-        max: 100000,
-      },
-    },
     illuminance_lux: {
       feature: {
         category: DEVICE_FEATURE_CATEGORIES.LIGHT_SENSOR,

diff --git a/server/test/services/xiaomi/messagesToTest.test.js b/server/test/services/xiaomi/messagesToTest.test.js
@@ -1,4 +1,4 @@
-/*  
+/*
     case '86sw2':
       this.newValueDuplexWirelessSwitch(message, data);
       break;
@@ -88,6 +88,14 @@ const MESSAGES = [
     }),
   },
   // SWITCH
+  {
+    sid: `1245${(counter += 1)}`,
+    model: 'sensor_switch.aq2',
+    data: JSON.stringify({
+      status: 'click',
+      voltage: 3000,
+    }),
+  },
   {
     sid: `1245${(counter += 1)}`,
     model: 'switch',