improve disable device handling

jeedom · Oct 18, 2024 · ebaefd2 · ebaefd2
1 parent de122b9
commit ebaefd2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/core/class/netatmo.class.php b/core/class/netatmo.class.php
@@ -96,7 +96,7 @@ public static function refreshClassNetatmo($homesdata = null) {
           continue;
         }
         $eqLogic = eqLogic::byLogicalId($home['id'], 'netatmo');
-        if (!is_object($eqLogic)) {
+        if (!is_object($eqLogic) || $eqLogic->getIsEnable() == 0) {
           continue;
         }
         if ($home['therm_mode'] != 'schedule') {
@@ -131,7 +131,7 @@ public static function refreshClassNetatmo($homesdata = null) {
         foreach ($homestatus['errors'] as $deviceerror) {
           $ModulesError[$deviceerror['id']] = $deviceerror['code'];
           $eqLogic = eqLogic::byLogicalId($deviceerror['id'], 'netatmo');
-          if (!is_object($eqLogic)) {
+          if (!is_object($eqLogic) || $eqLogic->getIsEnable() == 0) {
             continue;
           }
           $Cmderrorinfo = $eqLogic->getCmd('info', 'error_status');
@@ -155,7 +155,7 @@ public static function refreshClassNetatmo($homesdata = null) {
             }
           }
           $eqLogic = eqLogic::byLogicalId($module['id'], 'netatmo');
-          if (!is_object($eqLogic)) {
+          if (!is_object($eqLogic) || $eqLogic->getIsEnable() == 0) {
             continue;
           }
           foreach ($eqLogic->getCmd('info') as $cmd) {
@@ -178,7 +178,7 @@ public static function refreshClassNetatmo($homesdata = null) {
       if (isset($homestatus['home']) && isset($homestatus['home']['rooms']) &&  count($homestatus['home']['rooms']) > 0) {
         foreach ($homestatus['home']['rooms'] as $room) {
           $eqLogic = eqLogic::byLogicalId($room['id'], 'netatmo');
-          if (!is_object($eqLogic)) {
+          if (!is_object($eqLogic) || $eqLogic->getIsEnable() == 0) {
             continue;
           }
           foreach ($eqLogic->getCmd('info') as $cmd) {

diff --git a/core/class/netatmo_security.class.php b/core/class/netatmo_security.class.php
@@ -144,7 +144,7 @@ public static function createCamera($_security = null) {
     foreach ($security['homes'] as $home) {
       foreach ($home['cameras'] as $camera) {
         $eqLogic = eqLogic::byLogicalId($camera['id'], 'netatmo');
-        if(!is_object($eqLogic)){
+        if(!is_object($eqLogic) || $eqLogic->getIsEnable() == 0){
           continue;
         }
         $url_parse = parse_url($eqLogic->getCache('vpnUrl'). '/live/snapshot_720.jpg');
@@ -197,7 +197,7 @@ public static function refresh($_security = null) {
         continue;
       }
       $home_eqLogic = eqLogic::byLogicalId($home['id'], 'netatmo');
-      if (!is_object($home_eqLogic)) {
+      if (!is_object($home_eqLogic) || $home_eqLogic->getIsEnable() == 0) {
         continue;
       }
       foreach ($home['persons'] as $person) {
@@ -206,7 +206,7 @@ public static function refresh($_security = null) {
       }
       foreach ($home['cameras'] as $camera) {
         $camera_eqLogic = eqLogic::byLogicalId($camera['id'], 'netatmo');
-        if (!is_object($camera_eqLogic)) {
+        if (!is_object($camera_eqLogic) || $camera_eqLogic->getIsEnable() == 0) {
           continue;
         }
         if(isset($camera['light_mode_status'])){
@@ -223,7 +223,7 @@ public static function refresh($_security = null) {
         if(isset($camera['modules'])){
           foreach ($camera['modules'] as $module) {
             $module_eqLogic = eqLogic::byLogicalId($module['id'], 'netatmo');
-            if (!is_object($module_eqLogic)) {
+            if (!is_object($module_eqLogic) || $module_eqLogic->getIsEnable() == 0) {
               continue;
             }
             if(isset($module['battery_percent'])){

diff --git a/core/class/netatmo_weather.class.php b/core/class/netatmo_weather.class.php
@@ -80,7 +80,7 @@ public static function refresh($_weather = null) {
     if(isset($weather['devices']) &&  count($weather['devices']) > 0){
       foreach ($weather['devices'] as $device) {
         $eqLogic = eqLogic::byLogicalId($device["_id"], 'netatmo');
-        if (!is_object($eqLogic)) {
+        if (!is_object($eqLogic) || $eqLogic->getIsEnable() == 0) {
           continue;
         }
         $eqLogic->setConfiguration('firmware', $device['firmware']);
@@ -103,7 +103,7 @@ public static function refresh($_weather = null) {
         if(isset($device['modules']) &&  count($device['modules']) > 0){
           foreach ($device['modules'] as $module) {
             $eqLogic = eqLogic::byLogicalId($module["_id"], 'netatmo');
-            if(!is_object($eqLogic)){
+            if(!is_object($eqLogic) || $eqLogic->getIsEnable() == 0){
               continue;
             }
             $eqLogic->setConfiguration('rf_status', $module['rf_status']);

diff --git a/docs/fr_FR/changelog.md b/docs/fr_FR/changelog.md
@@ -7,6 +7,7 @@
 >Pour rappel s'il n'y a pas d'information sur la mise à jour, c'est que celle-ci concerne uniquement de la mise à jour de documentation, de traduction ou de texte.
 
 - Correction de warnings
+- Meilleur gestion des équipements désactivés
 
 # 06/10/2024