]> _ Git - tortuga-home.git/commitdiff
.
authorVincent <vincent@enhydra.fr>
Thu, 23 Jan 2020 10:30:29 +0000 (11:30 +0100)
committerVincent <vincent@enhydra.fr>
Thu, 23 Jan 2020 10:30:29 +0000 (11:30 +0100)
.idea/workspace.xml
scripts/lib/scenes.php

index 1b97fcb3be7e4cb0e8fbe0df8355738dd33d5ae7..4a4c0f4bc69edb05efd24a4075fc0aabac65797b 100644 (file)
@@ -3,7 +3,7 @@
   <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$/scripts/lib/squeezebox.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/squeezebox.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="1578759225069" duration="373000" />
       <workItem from="1578771487829" duration="5723000" />
       <workItem from="1579161178878" duration="2992000" />
-      <workItem from="1579457368919" duration="5866000" />
-    </task>
-    <task id="LOCAL-00230" summary=".">
-      <created>1568621038274</created>
-      <option name="number" value="00230" />
-      <option name="presentableId" value="LOCAL-00230" />
-      <option name="project" value="LOCAL" />
-      <updated>1568621038275</updated>
+      <workItem from="1579457368919" duration="5928000" />
+      <workItem from="1579773474654" duration="57000" />
+      <workItem from="1579773545061" duration="601000" />
     </task>
     <task id="LOCAL-00231" summary=".">
       <created>1568792710779</created>
       <option name="project" value="LOCAL" />
       <updated>1579602721221</updated>
     </task>
-    <option name="localTasksCounter" value="279" />
+    <task id="LOCAL-00279" summary=".">
+      <created>1579628617831</created>
+      <option name="number" value="00279" />
+      <option name="presentableId" value="LOCAL-00279" />
+      <option name="project" value="LOCAL" />
+      <updated>1579628617831</updated>
+    </task>
+    <option name="localTasksCounter" value="280" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
     <state x="552" y="238" key="#Plugins/0.0.1920.1160@0.0.1920.1160" timestamp="1575647067016" />
-    <state x="720" y="247" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog" timestamp="1577298128269">
-      <screen x="0" y="0" width="1920" height="1040" />
+    <state x="960" y="247" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog" timestamp="1579773503974">
+      <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="720" y="247" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1577298128269" />
-    <state x="960" y="247" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1576479992407" />
+    <state x="960" y="247" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1579773503974" />
     <state x="935" y="114" key="CommitChangelistDialog2" timestamp="1579628605830">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="872" y="242" key="Vcs.Push.Dialog.v2/0.0.2560.1040@0.0.2560.1040" timestamp="1578558711439" />
-    <state x="976" y="343" key="com.intellij.ide.util.TipDialog" timestamp="1579457397304">
+    <state x="976" y="343" key="com.intellij.ide.util.TipDialog" timestamp="1579773544720">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="732" y="343" key="com.intellij.ide.util.TipDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1577380394903" />
     <state x="732" y="383" key="com.intellij.ide.util.TipDialog/0.0.1920.1160@0.0.1920.1160" timestamp="1575647093028" />
-    <state x="976" y="343" key="com.intellij.ide.util.TipDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1579457397304" />
+    <state x="976" y="343" key="com.intellij.ide.util.TipDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1579773544720" />
     <state x="976" y="257" width="607" height="536" key="find.popup" timestamp="1579506279995">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
index 4c27038ff85971421b1bca3a2771db6ab3759ddc..2c3207e776ea835abce34d6550ad1ed077cb7291 100644 (file)
@@ -37,10 +37,10 @@ $scenes = [
         ['type' => 'ifttt', 'event' => 'coffee_on'],
     ],
     'chambre/deshumidificateur/on' => [
-        ['type' => 'domoticz', 'device' => '1063', 'command' => true, 'priority' => true],
+        ['type' => 'domoticz', 'device' => '477', 'command' => true, 'priority' => true],
     ],
     'chambre/deshumidificateur/off' => [
-        ['type' => 'domoticz', 'device' => '1063', 'command' => false, 'priority' => true],
+        ['type' => 'domoticz', 'device' => '477', 'command' => false, 'priority' => true],
     ],
     'chambre/raspberry/on' => [
         ['type' => 'insteon', 'command' => '0?1138=I=0=0'],
@@ -335,7 +335,6 @@ $scenes = [
     ],
     'bureau/base/on' => [
         ['type' => 'ecomode', 'mode' => '0'],
-        ['type' => 'scene', 'scene' => 'bureau/plasma/on'],
         ['type' => 'function', 'function' => 'wakeupPC', 'args' => ['avion']],
     ],
 
@@ -415,18 +414,11 @@ $scenes = [
         ['type' => 'scene', 'scene' => 'bureau/base/on'],
     ],
     'bureau/off' => [
-        ['type' => 'scene', 'scene' => 'bureau/plasma/off'],
         ['type' => 'function', 'function' => 'bureauAuto', 'args' => [false]],
         ['type' => 'hue', 'group' => $bureau, 'scene' => array('on' => false, 'brightness' => 0)],
         ['type' => 'state', 'key' => 'bureau_gradient', 'value' => 'off'],
         ['type' => 'function', 'function' => 'sleepPC', 'args' => ['avion']],
     ],
-    'bureau/plasma/on' => [
-        ['type' => 'domoticz', 'device' => '477', 'command' => true, 'priority' => true],
-    ],
-    'bureau/plasma/off' => [
-        ['type' => 'domoticz', 'device' => '477', 'command' => false, 'priority' => true],
-    ],
     'bureau/media/play' => [
         ['type' => 'function', 'function' => 'bureauMediaOn'],
         ['type' => 'scene', 'scene' => 'bureau/screen/down'],