Zigbee2mqtt: Add low_battery and tamper expose on Owon pir313 e (#1962)

GladysAssistant · Dec 8, 2023 · c1d76bd · c1d76bd
1 parent b39e024
commit c1d76bd
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 1 deletion.
diff --git a/front/src/components/boxs/device-in-room/device-features/sensor-value/BinaryDeviceValue.jsx b/front/src/components/boxs/device-in-room/device-features/sensor-value/BinaryDeviceValue.jsx
@@ -6,7 +6,9 @@ import { DEVICE_FEATURE_CATEGORIES } from '../../../../../../../server/utils/con
 const DANGER_ON_VALUE_SENSORS = [
   DEVICE_FEATURE_CATEGORIES.CO_SENSOR,
   DEVICE_FEATURE_CATEGORIES.LEAK_SENSOR,
-  DEVICE_FEATURE_CATEGORIES.SMOKE_SENSOR
+  DEVICE_FEATURE_CATEGORIES.SMOKE_SENSOR,
+  DEVICE_FEATURE_CATEGORIES.BATTERY_LOW,
+  DEVICE_FEATURE_CATEGORIES.TAMPER
 ];
 
 const BinaryDeviceValue = ({ deviceFeature }) => {

diff --git a/front/src/config/i18n/en.json b/front/src/config/i18n/en.json
@@ -2481,6 +2481,20 @@
           "zero": "No",
           "one": "Yes"
         }
+      },
+      "battery-low": {
+        "binary": {
+          "other": "No value received",
+          "zero": "No",
+          "one": "Yes"
+        }
+      },
+      "tamper": {
+        "binary": {
+          "other": "No value received",
+          "zero": "No",
+          "one": "Yes"
+        }
       }
     }
   },
@@ -2501,6 +2515,10 @@
       "shortCategoryName": "Battery",
       "integer": "Battery"
     },
+    "battery-low": {
+      "shortCategoryName": "Low Battery",
+      "binary": "Low battery (yes/no)"
+    },
     "temperature-sensor": {
       "shortCategoryName": "Temperature sensor",
       "decimal": "Temperature"
@@ -2630,6 +2648,10 @@
       "mode": "Mode",
       "target-temperature": "Temperature"
     },
+    "tamper": {
+      "shortCategoryName": "Tamper",
+      "binary": "Tamper (yes/no)"
+    },
     "television": {
       "shortCategoryName": "Television",
       "binary": "Power",

diff --git a/front/src/config/i18n/fr.json b/front/src/config/i18n/fr.json
@@ -2483,6 +2483,20 @@
           "zero": "Non",
           "one": "Oui"
         }
+      },
+      "battery-low": {
+        "binary": {
+          "other": "Aucune valeur reçue",
+          "zero": "Non",
+          "one": "Oui"
+        }
+      },
+      "tamper": {
+        "binary": {
+          "other": "Aucune valeur reçue",
+          "zero": "Non",
+          "one": "Oui"
+        }
       }
     }
   },
@@ -2503,6 +2517,10 @@
       "shortCategoryName": "Batterie",
       "integer": "Batterie"
     },
+    "battery-low": {
+      "shortCategoryName": "Batterie faible",
+      "binary": "Batterie faible (Oui/Non)"
+    },
     "temperature-sensor": {
       "shortCategoryName": "Capteur température",
       "decimal": "Température"
@@ -2632,6 +2650,10 @@
       "mode": "Mode",
       "target-temperature": "Température"
     },
+    "tamper": {
+      "shortCategoryName": "Détecteur de sabotage",
+      "binary": "Détection sabotage (Oui/Non)"
+    },
     "television": {
       "shortCategoryName": "Télévision",
       "binary": "Power",

diff --git a/front/src/utils/consts.js b/front/src/utils/consts.js
@@ -101,6 +101,9 @@ export const DeviceFeatureCategoriesIcon = {
   [DEVICE_FEATURE_CATEGORIES.BATTERY]: {
     [DEVICE_FEATURE_TYPES.SENSOR.INTEGER]: 'battery'
   },
+  [DEVICE_FEATURE_CATEGORIES.BATTERY_LOW]: {
+    [DEVICE_FEATURE_TYPES.SENSOR.BINARY]: 'battery'
+  },
   [DEVICE_FEATURE_CATEGORIES.CAMERA]: {
     [DEVICE_FEATURE_TYPES.CAMERA.IMAGE]: 'camera'
   },
@@ -220,6 +223,9 @@ export const DeviceFeatureCategoriesIcon = {
   [DEVICE_FEATURE_CATEGORIES.SIREN]: {
     [DEVICE_FEATURE_TYPES.SIREN.BINARY]: 'bell'
   },
+  [DEVICE_FEATURE_CATEGORIES.TAMPER]: {
+    [DEVICE_FEATURE_TYPES.SENSOR.BINARY]: 'shield'
+  },
   [DEVICE_FEATURE_CATEGORIES.ACCESS_CONTROL]: {
     [DEVICE_FEATURE_TYPES.ACCESS_CONTROL.MODE]: 'lock'
   },

diff --git a/server/services/zigbee2mqtt/exposes/binaryType.js b/server/services/zigbee2mqtt/exposes/binaryType.js
@@ -78,6 +78,18 @@ const names = {
       type: DEVICE_FEATURE_TYPES.SENSOR.BINARY,
     },
   },
+  battery_low: {
+    feature: {
+      category: DEVICE_FEATURE_CATEGORIES.BATTERY_LOW,
+      type: DEVICE_FEATURE_TYPES.SENSOR.BINARY,
+    },
+  },
+  tamper: {
+    feature: {
+      category: DEVICE_FEATURE_CATEGORIES.TAMPER,
+      type: DEVICE_FEATURE_TYPES.SENSOR.BINARY,
+    },
+  },
 };
 
 module.exports = {

diff --git a/server/utils/constants.js b/server/utils/constants.js
@@ -391,6 +391,7 @@ const DEVICE_FEATURE_CATEGORIES = {
   AIRQUALITY_SENSOR: 'airquality-sensor',
   AIR_CONDITIONING: 'air-conditioning',
   BATTERY: 'battery',
+  BATTERY_LOW: 'battery-low',
   BUTTON: 'button',
   CAMERA: 'camera',
   CUBE: 'cube',
@@ -426,6 +427,7 @@ const DEVICE_FEATURE_CATEGORIES = {
   SURFACE: 'surface',
   SWITCH: 'switch',
   SPEED_SENSOR: 'speed-sensor',
+  TAMPER: 'tamper',
   TELEVISION: 'television',
   TEMPERATURE_SENSOR: 'temperature-sensor',
   THERMOSTAT: 'thermostat',
@@ -482,6 +484,9 @@ const DEVICE_FEATURE_TYPES = {
   BATTERY: {
     INTEGER: 'integer',
   },
+  BATTERY_LOW: {
+    BINARY: 'binary',
+  },
   VIBRATION_SENSOR: {
     BINARY: 'binary',
     STATUS: 'status',
@@ -508,6 +513,9 @@ const DEVICE_FEATURE_TYPES = {
   SURFACE: {
     DECIMAL: 'decimal',
   },
+  TAMPER: {
+    BINARY: 'binary',
+  },
   TELEVISION: {
     BINARY: 'binary',
     SOURCE: 'source',