]> _ Git - tortuga-home.git/commitdiff
projects / tortuga-home.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7163542)
.
authorVincent <vincent@enhydra.fr>
Wed, 2 Dec 2020 19:42:36 +0000 (20:42 +0100)
committerVincent <vincent@enhydra.fr>
Wed, 2 Dec 2020 19:42:36 +0000 (20:42 +0100)
.idea/workspace.xml patch | blob | history
scripts/lib/pc.php patch | blob | history
scripts/lib/scenes.php patch | blob | history

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5e3043673ece1a1a6c2a500361ef2b3599b5812a..2fd8e7f4ee145e460e12364766d131d89da15a28 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/global.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/global.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/pc.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/pc.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" />
@@ -268,17 +269,6 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
-      <option name="arquillianRunConfiguration">
-        <value>
-          <option name="containerStateName" value="" />
-        </value>
-      </option>
-      <option name="TEST_OBJECT" value="class" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
     <configuration default="true" type="ArquillianTestNG" factoryName="">
       <option name="arquillianRunConfiguration">
         <value>
@@ -922,14 +912,9 @@
       <workItem from="1606480003955" duration="1588000" />
       <workItem from="1606647174961" duration="4677000" />
       <workItem from="1606674601895" duration="3813000" />
-      <workItem from="1606808878260" duration="441000" />
-    </task>
-    <task id="LOCAL-00366" summary=".">
-      <created>1604387168422</created>
-      <option name="number" value="00366" />
-      <option name="presentableId" value="LOCAL-00366" />
-      <option name="project" value="LOCAL" />
-      <updated>1604387168423</updated>
+      <workItem from="1606808878260" duration="456000" />
+      <workItem from="1606936960189" duration="47000" />
+      <workItem from="1606937045400" duration="880000" />
     </task>
     <task id="LOCAL-00367" summary=".">
       <created>1604389791156</created>
@@ -1267,7 +1252,14 @@
       <option name="project" value="LOCAL" />
       <updated>1606677800858</updated>
     </task>
-    <option name="localTasksCounter" value="415" />
+    <task id="LOCAL-00415" summary=".">
+      <created>1606809331094</created>
+      <option name="number" value="00415" />
+      <option name="presentableId" value="LOCAL-00415" />
+      <option name="project" value="LOCAL" />
+      <updated>1606809331095</updated>
+    </task>
+    <option name="localTasksCounter" value="416" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1314,12 +1306,12 @@
     </state>
     <state x="740" y="229" key="#com.jetbrains.php.refactoring.extractMethod.PhpExtractMethodDialog#function0/0.0.1707.920@0.0.1707.920" timestamp="1604146905948" />
     <state x="1110" y="259" key="#com.jetbrains.php.refactoring.extractMethod.PhpExtractMethodDialog#function0/0.0.2560.1040@0.0.2560.1040" timestamp="1605437484620" />
-    <state x="198" y="0" width="737" height="502" key="CommitChangelistDialog2" timestamp="1606677797891">
+    <state x="198" y="0" width="737" height="502" key="CommitChangelistDialog2" timestamp="1606809327302">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="132" y="0" width="737" height="502" key="CommitChangelistDialog2/0.0.1707.920@0.0.1707.920" timestamp="1605086955514" />
     <state x="701" y="75" key="CommitChangelistDialog2/0.0.1920.1160@0.0.1920.1160" timestamp="1605188136787" />
-    <state x="198" y="0" width="745" height="567" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1606677797891" />
+    <state x="198" y="0" width="745" height="567" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1606809327302" />
     <state x="952" y="244" key="FileChooserDialogImpl" timestamp="1605726960903">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
@@ -1367,16 +1359,6 @@
     <state x="90" y="196" width="672" height="678" key="search.everywhere.popup/0.0.1707.920@0.0.1707.920" timestamp="1605086908435" />
     <state x="135" y="222" width="1008" height="767" key="search.everywhere.popup/0.0.2560.1040@0.0.2560.1040" timestamp="1604481521257" />
   </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="php">
-          <url>file://$PROJECT_DIR$/scripts/lib/freebox.php</url>
-          <option name="timeStamp" value="2" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
   <component name="antWorkspaceConfiguration">
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
     <option name="FILTER_TARGETS" value="false" />
diff --git a/scripts/lib/pc.php b/scripts/lib/pc.php
index 5cbc62aca6984194f2d0eb77b75b253c03b6002f..ab75dfc3ada775557512d4892da7cd719adb8bbc 100644 (file)
--- a/scripts/lib/pc.php
+++ b/scripts/lib/pc.php
@@ -26,7 +26,7 @@ function sleepPC($device)
         return;
     }
     setState($s, '0');
-    $res = sshCommand('"C:\Program Files\Scripts\sleep.bat"', $device, true);
+    $res = sshCommand('"C:\Program Files\Scripts\sleep.bat"', $device, false);
     setState($s, '0');
     return $res;
 }
\ No newline at end of file
diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index 7816a8bee28ee57393fd9e50404b35c0a18805ed..e61fe142cf093084703bf5577ddb6ae18f1af303 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -38,10 +38,10 @@ $scenes = [
         ['type' => 'scene', 'scene' => 'chambre/auto', 'delay' => 35],
     ],
     'chambre/deshumidificateur/on' => [
-        ['type' => 'domoticz', 'device' => $chambrefan, 'command' => true],
+        //['type' => 'domoticz', 'device' => $chambrefan, 'command' => true],
     ],
     'chambre/deshumidificateur/off' => [
-        ['type' => 'domoticz', 'device' => $chambrefan, 'command' => false],
+        //['type' => 'domoticz', 'device' => $chambrefan, 'command' => false],
     ],
     'chambre/fan/on' => [
         ['type' => 'domoticz', 'device' => $chambrefan, 'command' => true],
@@ -65,7 +65,6 @@ $scenes = [
         //['type' => 'insteon', 'command' => '0?1131=I=0=0'],
         ['type' => 'function', 'function' => 'bedbrightness', 'args' => [$bedlowscreenbrightness]],
         ['type' => 'scene', 'scene' => 'chambre/deshumidificateur/off'],
-        ['type' => 'scene', 'scene' => 'chambre/raspberry/off'],
         ['type' => 'phonetask', 'phone' => 'vincent', 'task' => 'Va Au Lit'],
     ],
     'chambre/bed' => [
@@ -309,8 +308,8 @@ $scenes = [
         ['type' => 'domoticz', 'device' => '392', 'command' => true, 'priority' => true],
     ],
     'home/aulit' => [
-        ['type' => 'scene', 'scene' => 'home/aulitbase'],
         ['type' => 'scene', 'scene' => 'chambre/bed'],
+        ['type' => 'scene', 'scene' => 'home/aulitbase'],
     ],
     'home/aulitoff' => [
         ['type' => 'scene', 'scene' => 'home/aulitbase'],
@@ -318,14 +317,14 @@ $scenes = [
         ['type' => 'scene', 'scene' => 'sdb/off'],
     ],
     'home/aulitbase' => [
-        ['type' => 'nightmode', 'mode' => '1'],
-        ['type' => 'ecomode', 'mode' => '1'],
         ['type' => 'scene', 'scene' => 'bureau/off'],
         ['type' => 'scene', 'scene' => 'salon/off'],
         ['type' => 'scene', 'scene' => 'cuisine/off'],
         ['type' => 'scene', 'scene' => 'cour/off'],
         ['type' => 'function', 'function' => 'stopHarmony'],
         ['type' => 'function', 'function' => 'stopAllSqueezebox'],
+        ['type' => 'nightmode', 'mode' => '1'],
+        ['type' => 'ecomode', 'mode' => '1'],
     ],
     'home/music/synchro/soiree' => [
         ['type' => 'function', 'function' => 'synchroSoiree'],
@@ -541,14 +540,15 @@ $scenes = [
         //['type' => 'ifttt', 'event' => 'oven_off'],
     ],
     'home/welcome' => [
-        ['type' => 'ecomode', 'mode' => '0'],
         ['type' => 'scene', 'scene' => 'cuisine/on'],
         ['type' => 'scene', 'scene' => 'salon/on'],
         ['type' => 'scene', 'scene' => 'bureau/auto'],
         ['type' => 'scene', 'scene' => 'chambre/auto'],
+        ['type' => 'scene', 'scene' => 'chambre/rideaux/open'],
         ['type' => 'scene', 'scene' => 'sdb/on'],
         ['type' => 'scene', 'scene' => 'cour/auto'],
         ['type' => 'scene', 'scene' => 'chambre/deshumidificateur/on'],
+        ['type' => 'ecomode', 'mode' => '0'],
     ],
     'home/hueoff' => [
         ['type' => 'hue', 'group' => 17, 'scene' => ['on' => false, 'brightness' => 0, 'effect' => 'none']],
Unnamed repository; edit this file 'description' to name the repository.