Zigbee2mqtt add missing exposes owon pir313 e

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,
+  DEVICE_FEATURE_CATEGORIES.TAMPER
 ];
 
 const BinaryDeviceValue = ({ deviceFeature }) => {

front/src/config/i18n/en.json

@@ -2481,6 +2481,20 @@
           "zero": "No",
           "one": "Yes"
         }
+      },
+      "battery": {
+        "binary": {
+          "other": "No value received",
+          "zero": "No",
+          "one": "Yes"
+        }
+      },
+      "tamper": {
+        "binary": {
+          "other": "No value received",
+          "zero": "No",
+          "one": "Yes"
+        }
       }
     }
   },
@@ -2499,7 +2513,8 @@
     },
     "battery": {
       "shortCategoryName": "Battery",
-      "integer": "Battery"
+      "integer": "Battery",
+      "binary": "Low battery (yes/no)"
     },
     "temperature-sensor": {
       "shortCategoryName": "Temperature sensor",
@@ -2630,6 +2645,10 @@
       "mode": "Mode",
       "target-temperature": "Temperature"
     },
+    "tamper": {
+      "shortCategoryName": "Tamper",
+      "binary": "Tamper (yes/no)"
+    },
     "television": {
       "shortCategoryName": "Television",
       "binary": "Power",

front/src/config/i18n/fr.json

@@ -2483,6 +2483,20 @@
           "zero": "Non",
           "one": "Oui"
         }
+      },
+      "battery": {
+        "binary": {
+          "other": "Aucune valeur reçue",
+          "zero": "Non",
+          "one": "Oui"
+        }
+      },
+      "tamper": {
+        "binary": {
+          "other": "Aucune valeur reçue",
+          "zero": "Non",
+          "one": "Oui"
+        }
       }
     }
   },
@@ -2501,7 +2515,8 @@
     },
     "battery": {
       "shortCategoryName": "Batterie",
-      "integer": "Batterie"
+      "integer": "Batterie",
+      "binary": "Batterie faible (Oui/Non)"
     },
     "temperature-sensor": {
       "shortCategoryName": "Capteur température",
@@ -2632,6 +2647,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",

front/src/routes/integration/all/mqtt/device-page/Device.jsx

@@ -5,7 +5,7 @@ import cx from 'classnames';
 import get from 'get-value';
 
 import { RequestStatus } from '../../../../../utils/consts';
-import { DEVICE_FEATURE_CATEGORIES } from '../../../../../../../server/utils/constants';
+import { DEVICE_FEATURE_CATEGORIES, DEVICE_FEATURE_TYPES } from '../../../../../../../server/utils/constants';
 import MqttDeviceForm from './DeviceForm';
 import BatteryLevelFeature from '../../../../../components/device/view/BatteryLevelFeature';
 
@@ -42,7 +42,9 @@ class MqttDeviceBox extends Component {
       return null;
     }
     const batteryLevelDeviceFeature = this.props.device.features.find(
-      deviceFeature => deviceFeature.category === DEVICE_FEATURE_CATEGORIES.BATTERY
+      deviceFeature =>
+        deviceFeature.category === DEVICE_FEATURE_CATEGORIES.BATTERY &&
+        deviceFeature.type === DEVICE_FEATURE_TYPES.BATTERY.INTEGER
     );
     const batteryLevel = get(batteryLevelDeviceFeature, 'last_value');
     let mostRecentValueAt = null;

front/src/utils/consts.js

@@ -99,7 +99,8 @@ export const DASHBOARD_BOX_DATA_KEY = 'DashboardBoxData';
 
 export const DeviceFeatureCategoriesIcon = {
   [DEVICE_FEATURE_CATEGORIES.BATTERY]: {
-    [DEVICE_FEATURE_TYPES.SENSOR.INTEGER]: 'battery'
+    [DEVICE_FEATURE_TYPES.SENSOR.INTEGER]: 'battery',
+    [DEVICE_FEATURE_TYPES.SENSOR.BINARY]: 'battery'
   },
   [DEVICE_FEATURE_CATEGORIES.CAMERA]: {
     [DEVICE_FEATURE_TYPES.CAMERA.IMAGE]: 'camera'
@@ -220,6 +221,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'
   },

server/services/zigbee2mqtt/exposes/binaryType.js

@@ -78,6 +78,12 @@ const names = {
       type: DEVICE_FEATURE_TYPES.SENSOR.BINARY,
     },
   },
+  battery_low: {
+    feature: {
+      category: DEVICE_FEATURE_CATEGORIES.BATTERY,
+      type: DEVICE_FEATURE_TYPES.SENSOR.BINARY,
+    },
+  },
 };
 
 module.exports = {

server/utils/constants.js

@@ -426,6 +426,7 @@ const DEVICE_FEATURE_CATEGORIES = {
   SURFACE: 'surface',
   SWITCH: 'switch',
   SPEED_SENSOR: 'speed-sensor',
+  TAMPER: 'tamper',
   TELEVISION: 'television',
   TEMPERATURE_SENSOR: 'temperature-sensor',
   THERMOSTAT: 'thermostat',
@@ -480,6 +481,7 @@ const DEVICE_FEATURE_TYPES = {
   },
   BATTERY: {
     INTEGER: 'integer',
+    BINARY: 'binary',
   },
   VIBRATION_SENSOR: {
     BINARY: 'binary',
@@ -507,6 +509,9 @@ const DEVICE_FEATURE_TYPES = {
   SURFACE: {
     DECIMAL: 'decimal',
   },
+  TAMPER: {
+    BINARY: 'binary',
+  },
   TELEVISION: {
     BINARY: 'binary',
     SOURCE: 'source',