]> _ Git - tortuga-home.git/commitdiff
.
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Tue, 18 Jul 2023 17:11:07 +0000 (19:11 +0200)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Tue, 18 Jul 2023 17:11:07 +0000 (19:11 +0200)
.idea/workspace.xml
scripts/homeassistant_device_event.php
scripts/lib/homeassistant.php
scripts/lib/scenes.php

index 4d97b4e11b5c0a92d468da5605c4939c9e3218a1..a67e675eb6f48dea6322f06a821719df9d3470e0 100644 (file)
@@ -5,9 +5,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
-      <change beforePath="$PROJECT_DIR$/.docker/update" beforeDir="false" afterPath="$PROJECT_DIR$/.docker/update" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/cron/cron.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/cron/cron.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/homeassistant_device_event.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/homeassistant_device_event.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/homeassistant.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/homeassistant.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/scenes.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/scenes.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
       <workItem from="1689413321160" duration="1300000" />
       <workItem from="1689419400638" duration="1484000" />
       <workItem from="1689437591381" duration="3503000" />
-      <workItem from="1689663231923" duration="225000" />
+      <workItem from="1689663231923" duration="380000" />
+      <workItem from="1689669472736" duration="10000" />
+      <workItem from="1689699901478" duration="329000" />
     </task>
     <task id="LOCAL-00502" summary=".">
       <created>1641726946298</created>
       <option name="project" value="LOCAL" />
       <updated>1687259667913</updated>
     </task>
-    <option name="localTasksCounter" value="580" />
+    <option name="localTasksCounter" value="581" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
index 3350661c24cb65f2967f06e97d54799097fdc3cd..e7df1058b86aef6e926d3757c8eaf5e4a73db628 100644 (file)
@@ -96,6 +96,7 @@ function cubeBureau() {
                        execScene('bureau/rideaux/toggle', true);
                        break;
                case 'flip180':
+                       haAction(HA_OFFICE_MAIN_SCREEN);
                        execScene('bureau/auto', true);
                        break;
                case 'fall':
index a0a1c38eb913d9fc534bf53f4874f58b06305044..c3b4d17c6630fc5b680798dd72d1c1f335ef6f1a 100644 (file)
@@ -10,6 +10,8 @@ const HA_HOTTE = 'switch.hotte';
 const HA_BAR = 'switch.bar';
 const HA_PLANETARIUM = 'switch.0xa4c138788071821e';
 
+const HA_OFFICE_MAIN_SCREEN = 'switch.0xa4c138787633f01d';
+const HA_OFFICE_PLANE_SCREENS = 'switch.0xa4c138ba535d2cc5';
 function haGetState($id, $attribute = null) { //ID to read - for example sensor.foo
 
 
index 09153d60550f3c2ef03ba003ff7f272da9fe57b1..d2c01b82878d0a33470c459a40e063cd4b5aa3af 100644 (file)
@@ -678,6 +678,8 @@ $scenes = [
                ['type' => 'scene', 'scene' => 'sdb/hotwater/auto'],
                ['type' => 'scene', 'scene' => 'bureau/off'],
                ['type' => 'scene', 'scene' => 'chambre/off'],
+               ['type'=>'ha','device'=>HA_OFFICE_PLANE_SCREENS,'action'=>'turn_off'],
+               ['type'=>'ha','device'=>HA_OFFICE_MAIN_SCREEN,'action'=>'turn_off'],
        ],
 
        'home/welcome/eco/homeoffice' => [
@@ -687,12 +689,14 @@ $scenes = [
                ['type' => 'scene', 'scene' => 'sdb/hotwater/auto'],
                ['type' => 'scene', 'scene' => 'salon/off'],
                ['type' => 'scene', 'scene' => 'chambre/off'],
+               ['type'=>'ha','device'=>HA_OFFICE_PLANE_SCREENS,'action'=>'turn_off'],
        ],
 
        'home/welcome' => [
                ['type' => 'scene', 'scene' => 'cuisine/on'],
                ['type' => 'scene', 'scene' => 'salon/auto'],
                ['type' => 'scene', 'scene' => 'bureau/auto'],
+               ['type'=>'ha','device'=>HA_OFFICE_PLANE_SCREENS,'action'=>'turn_on'],
                ['type' => 'scene', 'scene' => 'chambre/auto'],
                ['type' => 'scene', 'scene' => 'sdb/on'],
                ['type' => 'scene', 'scene' => 'cour/auto'],