Simple devices

Change to addons structure (homebridge sync)

Author: sergejey

modules/devices/homebridgeSync.inc.php

@@ -24,7 +24,7 @@
 
     if ($devices[$i]['SYSTEM_DEVICE'] || $devices[$i]['ARCHIVED']) {
         if ($debug_sync) {
-            DebMes("HomeBridge.to_remove: ".json_encode($payload),'homebridge');
+            DebMes("HomeBridge.to_remove: " . json_encode($payload), 'homebridge');
         }
         sg('HomeBridge.to_remove', json_encode($payload));
         continue;
@@ -82,7 +82,7 @@
                     $payload['characteristic'] = 'TargetDoorState';
                     $payload['value'] = "1";
                     sg('HomeBridge.to_set', json_encode($payload));
-                } elseif ($open_type == 'door' || $open_type == 'window' || $open_type == 'curtains'  || $open_type == 'shutters') {
+                } elseif ($open_type == 'door' || $open_type == 'window' || $open_type == 'curtains' || $open_type == 'shutters') {
                     $payload['characteristic'] = 'CurrentPosition';
                     if (gg($devices[$i]['LINKED_OBJECT'] . '.status')) {
                         $payload['value'] = "0"; // открыто на 0% (закрыто)
@@ -115,29 +115,6 @@
             $payload['value'] = gg($devices[$i]['LINKED_OBJECT'] . '.value');
             sg('HomeBridge.to_set', json_encode($payload));
             break;
-        case 'sensor_temphum':
-            // Temp
-            $payload['service'] = 'TemperatureSensor';
-            $payload['CurrentTemperature']['minValue'] = -40;
-            sg('HomeBridge.to_add', json_encode($payload));
-
-            $payload['characteristic'] = 'CurrentTemperature';
-            $payload['value'] = gg($devices[$i]['LINKED_OBJECT'] . '.value');
-            sg('HomeBridge.to_set', json_encode($payload));
-
-            // Hum
-            $payload['name'] .= '_Hum';
-            $payload['service_name'] .= '_Hum';
-            $payload['service'] = 'HumiditySensor';
-            unset($payload['CurrentTemperature']['minValue']);
-            sg('HomeBridge.to_add', json_encode($payload));
-
-            $payload['characteristic'] = 'CurrentRelativeHumidity';
-            $payload['value'] = gg($devices[$i]['LINKED_OBJECT'] . '.valueHumidity');
-            sg('HomeBridge.to_set', json_encode($payload));
-
-            break;
-
         case 'sensor_co2':
             $payload['service'] = 'CarbonDioxideSensor';
             sg('HomeBridge.to_add', json_encode($payload));
@@ -399,6 +376,10 @@
            break;
         */
     }
+    $addon_path = dirname(__FILE__) . '/addons/' . $devices[$i]['TYPE'] . '_homebridgeSync.php';
+    if (file_exists($addon_path)) {
+        require($addon_path);
+    }
 }
 
 sg('HomeBridge.to_get', '{"name": "*"}');

modules/devices/processHomebridgeMQTT.inc.php

@@ -89,29 +89,29 @@
                 if ($data['characteristic']=='CurrentPosition') {
                     $currentStatus = (int)gg($device['LINKED_OBJECT'] . '.status');
                     if ($currentStatus) {
-                        $payload['value'] = 0;
-                    } else {
                         $payload['value'] = 100;
+                    } else {
+                        $payload['value'] = 0;
                     }
                 }
             } elseif ($open_type == 'window') {
                 $payload['service'] = 'Window';
                 if ($data['characteristic']=='CurrentPosition') {
                     $currentStatus = (int)gg($device['LINKED_OBJECT'] . '.status');
                     if ($currentStatus) {
-                        $payload['value'] = 0;
-                    } else {
                         $payload['value'] = 100;
+                    } else {
+                        $payload['value'] = 0;
                     }
                 }
             } elseif ($open_type == 'curtains' || $open_type == 'shutters') {
                 $payload['service'] = 'WindowCovering';
                 if ($data['characteristic']=='CurrentPosition') {
                     $currentStatus = (int)gg($device['LINKED_OBJECT'] . '.status');
                     if ($currentStatus) {
-                        $payload['value'] = 0;
-                    } else {
                         $payload['value'] = 100;
+                    } else {
+                        $payload['value'] = 0;
                     }
                 }
             }
@@ -365,6 +365,12 @@
             }
         }
     }
+
+    $addon_path = dirname(__FILE__) . '/addons/' . $device['TYPE'] . '_processHomebridgeMQTT.php';
+    if (file_exists($addon_path)) {
+        require($addon_path);
+    }
+
 }
 
 /*