Merge pull request #1058 from whitevast/patch-1

Openable Homebridge
sergejey · Oct 2, 2022 · 21e048d · 21e048d
2 parents 5b6fc7c + ec890e1
commit 21e048d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/modules/devices/devices_links_actions.inc.php b/modules/devices/devices_links_actions.inc.php
@@ -134,16 +134,16 @@
                 } elseif ($open_type == 'door' || $open_type == 'window' || $open_type == 'curtains' || $open_type == 'shutters') {
                     $payload['characteristic'] = 'CurrentPosition';
                     if (gg($device1['LINKED_OBJECT'] . '.status')) {
-                        $payload['value'] = "100";
-                    } else {
                         $payload['value'] = "0";
+                    } else {
+                        $payload['value'] = "100";
                     }
                     if ($debug_sync) {
                         DebMes("MQTT to_set : " . json_encode($payload), 'homebridge');
                     }
                     sg('HomeBridge.to_set', json_encode($payload));
-                    //$payload['characteristic'] = 'TargetPosition';
-                    //sg('HomeBridge.to_set', json_encode($payload));
+                    $payload['characteristic'] = 'TargetPosition';
+                    sg('HomeBridge.to_set', json_encode($payload));
                     unset($payload['service']);
                 }
             }

diff --git a/modules/devices/homebridgeSync.inc.php b/modules/devices/homebridgeSync.inc.php
@@ -85,13 +85,15 @@
                 } 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'] = "100";
+                        $payload['value'] = "0"; // открыто на 0% (закрыто)
                     } else {
-                        $payload['value'] = "0";
+                        $payload['value'] = "100"; // открыто на 100% (открыто)
                     }
                     sg('HomeBridge.to_set', json_encode($payload));
                     $payload['characteristic'] = 'TargetPosition';
-                    $payload['value'] = "100";
+                    sg('HomeBridge.to_set', json_encode($payload));
+                    $payload['characteristic'] = 'PositionState';
+                    $payload['value'] = "2"; //0 - "Закрывается" 1 - "Открывается" 2 - нет отображения
                     sg('HomeBridge.to_set', json_encode($payload));
                 }
             }

diff --git a/modules/devices/processHomebridgeMQTT.inc.php b/modules/devices/processHomebridgeMQTT.inc.php
@@ -89,29 +89,29 @@
                 if ($data['characteristic']=='CurrentPosition') {
                     $currentStatus = (int)gg($device['LINKED_OBJECT'] . '.status');
                     if ($currentStatus) {
-                        $payload['value'] = 100;
-                    } else {
                         $payload['value'] = 0;
+                    } else {
+                        $payload['value'] = 100;
                     }
                 }
             } elseif ($open_type == 'window') {
                 $payload['service'] = 'Window';
                 if ($data['characteristic']=='CurrentPosition') {
                     $currentStatus = (int)gg($device['LINKED_OBJECT'] . '.status');
                     if ($currentStatus) {
-                        $payload['value'] = 100;
-                    } else {
                         $payload['value'] = 0;
+                    } else {
+                        $payload['value'] = 100;
                     }
                 }
             } 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'] = 100;
-                    } else {
                         $payload['value'] = 0;
+                    } else {
+                        $payload['value'] = 100;
                     }
                 }
             }