Merge branch 'Jezza34000:beta' into beta

Author: mnpg

core/class/reolink.class.php

@@ -212,6 +212,21 @@ public static function updatePTZpreset($id, $data) {
       }
     }
 
+    public static function getRevertValue($id,$EqLId) {
+        foreach (reolinkCmd::byEqLogicId($id) as $cmd) {
+            $cmdLId = $cmd->getLogicalId();
+            if ($cmd->getType() == "info" && $cmdLId == $EqLId) {
+              $RVval = $cmd->getConfiguration('revertvalue');
+              log::add('reolink', 'debug', 'cmdLId : ' . $cmdLId . ' -> revertvalue : ' . $RVval);
+            }
+        }
+        if ($RVval != NULL) {
+          return $RVval;
+        } else {
+          return false;
+        }
+    }
+
     public static function refreshNFO($id) {
         $camcmd = reolink::byId($id, 'reolink');
         $camcnx = reolink::getReolinkConnection($id);
@@ -462,6 +477,12 @@ public static function refreshNFO($id) {
                     $camcmd->checkAndUpdateCmd('SetaiTrackState', $json_data['value']['aiTrack']);
                     break;
 
+                  case reolinkAPI::CAM_GET_MDALARM:
+                    $revert_value = reolink::getRevertValue($id,'SetMdDefaultSensitivityState');
+                    $mdsensdef = ($revert_value - ((int) $json_data['value']['MdAlarm']['newSens']['sensDef']));
+                    $camcmd->checkAndUpdateCmd('SetMdDefaultSensitivityState', $mdsensdef);
+                    break;
+
                   case reolinkAPI::CAM_GET_AIALARM:
                     switch ($json_data['value']['AiAlarm']['ai_type']) {
                         case "people":

core/config/reolinkapicmd.json

@@ -1655,6 +1655,37 @@
 			"isVisible": 1,
 			"logicalId": "SetaiTrack"
 		},
+		{
+			"abilityneed":"alarmMd",
+			"name": "Sensibilité par défaut Detection Mouvement (valeur)",
+			"type": "info",
+			"subtype": "numeric",
+			"configuration": {
+				"revertvalue" : "51",
+				"payload": "{\"cmd\":\"GetMdAlarm\",\"action\":0,\"param\":{\"channel\":#CHANNEL#}}"
+			},
+			"IsHistorized": 0,
+			"isVisible": 0,
+			"logicalId": "SetMdDefaultSensitivityState"
+		},
+		{
+			"abilityneed":"alarmMd",
+			"name": "Sensibilité par défaut Detection Mouvement",
+			"type": "action",
+			"subtype": "slider",
+			"configuration": {
+				"option": "slider",
+				"minValue": "1",
+				"maxValue" : "50",
+				"revertvalue" : "51",
+				"valueFrom" : "SetMdDefaultSensitivityState",
+				"actionapi": "SetMdAlarm",
+				"payload": "{\"MdAlarm\":{\"channel\":#CHANNEL#,\"newSens\":{\"sensDef\":#OPTR_SLIDER#},\"useNewSens\":1}}"
+			},
+			"IsHistorized": 0,
+			"isVisible": 1,
+			"logicalId": "SetMdDefaultSensitivity"
+		},
 		{
 			"abilityneed":"supportAiSensitivity",
 			"iastate":1,
@@ -1784,7 +1815,7 @@
 		{
 			"abilityneed":"ptzPreset",
 			"iastate":1,
-			"name": "Point de garde défini (état)",
+			"name": "Point de garde (état)",
 			"type": "info",
 			"subtype": "binary",
 			"configuration": {
@@ -1856,7 +1887,7 @@
 		{
 			"abilityneed":"ptzPreset",
 			"iastate":1,
-			"name": "Délai Retour auto. au point de garde (état)",
+			"name": "Délai Retour auto. au point de garde (valeur)",
 			"type": "info",
 			"subtype": "numeric",
 			"Unite": "s",