.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3cbdba0eb1120d9ca723c22fc03299de78846943..f50dcb6c79745b45f2248a99cd32fc0d92f93526 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,10 +4,8 @@
     <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/domoticz_device_event.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/domoticz_device_event.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/bricks.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/bricks.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/mediarasp.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/mediarasp.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="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -211,6 +209,11 @@
   <component name="ProjectReloadState">
     <option name="STATE" value="1" />
   </component>
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showExcludedFiles" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
   <component name="PropertiesComponent">
     <property name="DatabaseDriversLRU" value="sqlite" />
     <property name="DefaultHtmlFileTemplate" value="HTML File" />
@@ -251,18 +254,6 @@
       <recent name="T:\CloudStation\Drive\Works\home\scripts" />
     </key>
   </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
   <component name="RunManager">
     <configuration default="true" type="Applet">
       <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
@@ -295,6 +286,7 @@
       <setting name="vmparams" value="" />
       <setting name="cmdLine" value="run-app" />
       <setting name="passParentEnv" value="true" />
+      <setting name="grailsApplicationRoot" value="" />
       <setting name="launchBrowser" value="true" />
       <setting name="launchBrowserUrl" value="" />
       <setting name="depsClasspath" value="false" />
@@ -329,22 +321,15 @@
     </configuration>
   </component>
   <component name="ServiceViewManager">
-    <option name="allServicesViewState">
-      <serviceView>
-        <treeState>
-          <expand>
-            <path>
-              <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
-              <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@56e2c52e" type="7427dc5b:ServiceModel$ServiceGroupNode" />
-            </path>
-            <path>
-              <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
-              <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@6b2d7142" type="7427dc5b:ServiceModel$ServiceGroupNode" />
-            </path>
-          </expand>
-          <select />
-        </treeState>
-      </serviceView>
+    <option name="viewStates">
+      <list>
+        <serviceView>
+          <treeState>
+            <expand />
+            <select />
+          </treeState>
+        </serviceView>
+      </list>
     </option>
   </component>
   <component name="SvnConfiguration">
@@ -779,14 +764,8 @@
       <workItem from="1574065436563" duration="754000" />
       <workItem from="1574066213679" duration="8067000" />
       <workItem from="1574273415760" duration="2973000" />
-      <workItem from="1574323616439" duration="14916000" />
-    </task>
-    <task id="LOCAL-00200" summary=".">
-      <created>1563349220382</created>
-      <option name="number" value="00200" />
-      <option name="presentableId" value="LOCAL-00200" />
-      <option name="project" value="LOCAL" />
-      <updated>1563349220383</updated>
+      <workItem from="1574323616439" duration="14985000" />
+      <workItem from="1575617000688" duration="627000" />
     </task>
     <task id="LOCAL-00201" summary=".">
       <created>1565598575548</created>
@@ -1124,7 +1103,14 @@
       <option name="project" value="LOCAL" />
       <updated>1574966117031</updated>
     </task>
-    <option name="localTasksCounter" value="249" />
+    <task id="LOCAL-00249" summary=".">
+      <created>1574967000583</created>
+      <option name="number" value="00249" />
+      <option name="presentableId" value="LOCAL-00249" />
+      <option name="project" value="LOCAL" />
+      <updated>1574967000583</updated>
+    </task>
+    <option name="localTasksCounter" value="250" />
     <servers />
   </component>
   <component name="TodoView">
@@ -1175,6 +1161,16 @@
     <MESSAGE value="." />
     <option name="LAST_COMMIT_MESSAGE" value="." />
   </component>
+  <component name="WindowStateProjectService">
+    <state x="935" y="114" key="CommitChangelistDialog2" timestamp="1575617704022">
+      <screen x="0" y="0" width="2560" height="1040" />
+    </state>
+    <state x="935" y="114" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1575617704022" />
+    <state x="976" y="343" key="com.intellij.ide.util.TipDialog" timestamp="1575617014990">
+      <screen x="0" y="0" width="2560" height="1040" />
+    </state>
+    <state x="976" y="343" key="com.intellij.ide.util.TipDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1575617014990" />
+  </component>
   <component name="antWorkspaceConfiguration">
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
     <option name="FILTER_TARGETS" value="false" />

diff --git a/scripts/domoticz_device_event.php b/scripts/domoticz_device_event.php
index 363e29bbec72044a426ce46a44dee40aca8511f7..f27c821d9d5b7702383b897b037d8bcc2e91ef42 100644 (file)
--- a/scripts/domoticz_device_event.php
+++ b/scripts/domoticz_device_event.php
@@ -1,11 +1,10 @@
 <?php
-if ($_GET['device'] == '1033') {
+if ($_GET['device'] == 1033) {
     $forceConfig = 'salon';
 }
 
 require_once "import.php";
 
-
 if ($_GET['device'] == 480) {
     chambreToggle();
 } else if ($_GET['device'] == 1033) {
@@ -21,6 +20,7 @@ if ($_GET['device'] == 480) {
             execScene('salon/on');
             break;
         case 'Free_Fall':
+            execScene('salon/off');
             off('salon');
             break;
         case 'Move':

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index 9b817d036204157202a47d3059c2121fe62cb673..bb9a60e2a0f6307d94c6f066587f9c997a515767 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -549,7 +549,7 @@ $scenes = [
         ['type' => 'domoticz', 'device' => '479', 'command' => true, 'priority' => true],
     ],
     'salon/freebox/off' => [
-        ['type' => 'domoticz', 'device' => '479', 'command' => true, 'priority' => true],
+        ['type' => 'domoticz', 'device' => '479', 'command' => false, 'priority' => true],
     ],
     'ecomode/basic' => [
         ['type' => 'scene', 'scene' => 'bureau/media/off'],// Media bureau