add new expose Volume

William-De71 · Apr 1, 2024 · 559d86b · 559d86b
1 parent 38401f3
commit 559d86b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 2 deletions.
diff --git a/front/src/components/boxs/device-in-room/DeviceRow.jsx b/front/src/components/boxs/device-in-room/DeviceRow.jsx
@@ -31,6 +31,7 @@ const ROW_TYPE_BY_FEATURE_TYPE = {
   [DEVICE_FEATURE_TYPES.AIR_CONDITIONING.TARGET_TEMPERATURE]: ThermostatDeviceFeature,
   [DEVICE_FEATURE_TYPES.SIREN.LMH_VOLUME]: LMHVolumeDeviceFeature,
   [DEVICE_FEATURE_TYPES.SIREN.MELODY]: NumberDeviceFeature,
+  [DEVICE_FEATURE_TYPES.SIREN.VOLUME]: MultiLevelDeviceFeature,
   [DEVICE_FEATURE_TYPES.DURATION.DECIMAL]: MultiLevelDeviceFeature
 };
 

diff --git a/front/src/config/i18n/fr.json b/front/src/config/i18n/fr.json
@@ -2882,8 +2882,8 @@
       "binary": "Détection sabotage (Oui/Non)"
     },
     "ac-connected": {
-      "shortCategoryName": "Connecté Prise de courant",
-      "binary": "Conneté Prise de courant (Oui/Non)"
+      "shortCategoryName": "Prise de courant connecté",
+      "binary": "Prise de courant connecté (Oui/Non)"
     },
     "television": {
       "shortCategoryName": "Télévision",

diff --git a/front/src/utils/consts.js b/front/src/utils/consts.js
@@ -226,6 +226,7 @@ export const DeviceFeatureCategoriesIcon = {
   [DEVICE_FEATURE_CATEGORIES.SIREN]: {
     [DEVICE_FEATURE_TYPES.SIREN.BINARY]: 'bell',
     [DEVICE_FEATURE_TYPES.SIREN.LMH_VOLUME]: 'volume-1',
+    [DEVICE_FEATURE_TYPES.SIREN.VOLUME]: 'volume',
     [DEVICE_FEATURE_TYPES.SIREN.MELODY]: 'music'
   },
   [DEVICE_FEATURE_CATEGORIES.TAMPER]: {

diff --git a/server/services/zigbee2mqtt/exposes/numericType.js b/server/services/zigbee2mqtt/exposes/numericType.js
@@ -269,6 +269,12 @@ module.exports = {
         unit: DEVICE_FEATURE_UNITS.VOLT,
       },
     },
+    volume: {
+      feature: {
+        category: DEVICE_FEATURE_CATEGORIES.SIREN,
+        type: DEVICE_FEATURE_TYPES.SIREN.VOLUME,
+      },
+    },
     // Lixee TIC Device
     BASE: {
       feature: {

diff --git a/server/utils/constants.js b/server/utils/constants.js
@@ -509,6 +509,7 @@ const DEVICE_FEATURE_TYPES = {
   SIREN: {
     BINARY: 'binary',
     LMH_VOLUME: 'volume',
+    VOLUME: 'volume',
     MELODY: 'melody',
   },
   CHILD_LOCK: {