.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5fe25e4a91246f9eab3d6cba0a9b39299acb377d..c3508db15057ef1b4b580e42bbeec823043daa01 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,12 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
-      <change afterPath="$PROJECT_DIR$/scripts/lib/flowerpower.php" 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/flowerpower.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/flowerpower.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/lib.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/lib.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/tmdb.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/tmdb.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/domoticz_device_event.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/domoticz_device_event.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -46,8 +42,9 @@
   <component name="DefaultGradleProjectSettings">
     <option name="isMigrated" value="true" />
   </component>
-  <component name="FavoritesManager">
-    <favorites_list name="home" />
+  <component name="ElmWorkspace">
+    <elmProjects />
+    <settings elmCompilerPath="" elmFormatPath="" elmTestPath="" isElmFormatOnSaveEnabled="false" />
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -155,50 +152,50 @@
       <path value="$PROJECT_DIR$/vendor/hoa/consistency" />
       <path value="$PROJECT_DIR$/vendor/hoa/eventsource" />
       <path value="$PROJECT_DIR$/vendor/woojean/php-redis-queue" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/zf1/zend-exception" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/zf1/zend-locale" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/zf1/zend-xml" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/zzarbi/synology" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/alphayax/freebox_api_php" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/alphayax/rest" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/composer" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/container-interop/container-interop" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/datto/json-rpc" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/datto/json-rpc-http" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/doctrine/cache" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/guzzlehttp/guzzle" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/guzzlehttp/promises" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/guzzlehttp/psr7" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/kevinrob/guzzle-cache-middleware" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/monolog/monolog" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/php-tmdb/api" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/psr/container" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/psr/http-message" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/psr/log" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/ralouphie/getallheaders" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/rtheunissen/guzzle-log-middleware" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/sqmk/phue" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/symfony/event-dispatcher" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/symfony/options-resolver" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/zendframework/zend-db" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/zendframework/zend-escaper" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/zendframework/zend-http" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/zendframework/zend-i18n" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/zendframework/zend-i18n-resources" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/zendframework/zend-loader" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/zendframework/zend-stdlib" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/zendframework/zend-uri" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/zendframework/zend-validator" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/zf1/zend-cache" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/hoa/stream" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/hoa/protocol" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/hoa/http" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/hoa/exception" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/hoa/event" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/hoa/consistency" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/hoa/eventsource" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/woojean/php-redis-queue" />
-      <path value="T:/CloudStation/Drive/Works/home/vendor/symfony/contracts" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zf1/zend-exception" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zf1/zend-locale" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zf1/zend-xml" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zzarbi/synology" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/alphayax/freebox_api_php" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/alphayax/rest" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/composer" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/container-interop/container-interop" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/datto/json-rpc" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/datto/json-rpc-http" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/doctrine/cache" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/guzzlehttp/guzzle" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/guzzlehttp/promises" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/guzzlehttp/psr7" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/kevinrob/guzzle-cache-middleware" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/monolog/monolog" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/php-tmdb/api" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/psr/container" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/psr/http-message" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/psr/log" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/ralouphie/getallheaders" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/rtheunissen/guzzle-log-middleware" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/sqmk/phue" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/symfony/event-dispatcher" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/symfony/options-resolver" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zendframework/zend-db" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zendframework/zend-escaper" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zendframework/zend-http" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zendframework/zend-i18n" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zendframework/zend-i18n-resources" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zendframework/zend-loader" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zendframework/zend-stdlib" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zendframework/zend-uri" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zendframework/zend-validator" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/zf1/zend-cache" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/hoa/stream" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/hoa/protocol" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/hoa/http" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/hoa/exception" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/hoa/event" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/hoa/consistency" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/hoa/eventsource" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/woojean/php-redis-queue" />
+      <path value="$PROJECT_DIR$/../../../CloudStation/Drive/Works/home/vendor/symfony/contracts" />
       <path value="$PROJECT_DIR$/vendor/symfony/contracts" />
       <path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher-contracts" />
       <path value="$PROJECT_DIR$/vendor/predis/predis" />
@@ -214,7 +211,6 @@
   </component>
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showExcludedFiles" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
   <component name="PropertiesComponent">
@@ -240,7 +236,7 @@
     <property name="project.structure.last.edited" value="Problems" />
     <property name="project.structure.proportion" value="0.0" />
     <property name="project.structure.side.proportion" value="0.2" />
-    <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
+    <property name="settings.editor.selected.configurable" value="editor.preferences.fonts.default" />
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
@@ -324,18 +320,6 @@
       <method v="2" />
     </configuration>
   </component>
-  <component name="ServiceViewManager">
-    <option name="viewStates">
-      <list>
-        <serviceView>
-          <treeState>
-            <expand />
-            <select />
-          </treeState>
-        </serviceView>
-      </list>
-    </option>
-  </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
@@ -834,14 +818,13 @@
       <workItem from="1586006363270" duration="2364000" />
       <workItem from="1586090290653" duration="248000" />
       <workItem from="1586099772158" duration="2962000" />
-      <workItem from="1586418521676" duration="1255000" />
-    </task>
-    <task id="LOCAL-00271" summary=".">
-      <created>1578472489576</created>
-      <option name="number" value="00271" />
-      <option name="presentableId" value="LOCAL-00271" />
-      <option name="project" value="LOCAL" />
-      <updated>1578472489576</updated>
+      <workItem from="1586418521676" duration="1869000" />
+      <workItem from="1586722441222" duration="26000" />
+      <workItem from="1586722485245" duration="641000" />
+      <workItem from="1586849664844" duration="183000" />
+      <workItem from="1587198086476" duration="111000" />
+      <workItem from="1587628693502" duration="622000" />
+      <workItem from="1590315129913" duration="1124000" />
     </task>
     <task id="LOCAL-00272" summary=".">
       <created>1578476755038</created>
@@ -1179,11 +1162,18 @@
       <option name="project" value="LOCAL" />
       <updated>1585899396650</updated>
     </task>
-    <option name="localTasksCounter" value="320" />
+    <task id="LOCAL-00320" summary=".">
+      <created>1586519228613</created>
+      <option name="number" value="00320" />
+      <option name="presentableId" value="LOCAL-00320" />
+      <option name="project" value="LOCAL" />
+      <updated>1586519228613</updated>
+    </task>
+    <option name="localTasksCounter" value="321" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
+    <option name="version" value="2" />
   </component>
   <component name="Vcs.Log.History.Properties">
     <option name="COLUMN_ORDER">
@@ -1200,13 +1190,12 @@
       <map>
         <entry key="MAIN">
           <value>
-            <State>
-              <option name="COLUMN_ORDER" />
-            </State>
+            <State />
           </value>
         </entry>
       </map>
     </option>
+    <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
@@ -1222,6 +1211,10 @@
     <option name="LAST_COMMIT_MESSAGE" value="." />
   </component>
   <component name="WindowStateProjectService">
+    <state x="1511" y="161" key="#Plugins" timestamp="1586722473970">
+      <screen x="0" y="0" width="2560" height="1040" />
+    </state>
+    <state x="1511" y="161" key="#Plugins/0.0.2560.1040@0.0.2560.1040" timestamp="1586722473970" />
     <state x="1019" y="324" key="#com.intellij.fileTypes.FileTypeChooser" timestamp="1581415995312">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
@@ -1230,11 +1223,11 @@
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="960" y="247" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1585852940968" />
-    <state x="935" y="114" width="1170" height="972" key="CommitChangelistDialog2" timestamp="1585899371621">
+    <state x="935" y="114" width="1170" height="972" key="CommitChangelistDialog2" timestamp="1586519189652">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="701" y="127" width="1170" height="972" key="CommitChangelistDialog2/0.0.1920.1160@0.0.1920.1160" timestamp="1582220569877" />
-    <state x="935" y="114" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1585899371621" />
+    <state x="935" y="114" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1586519189652" />
     <state x="92" y="92" width="2376" height="856" key="DiffContextDialog" timestamp="1580377344165">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
@@ -1247,6 +1240,10 @@
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="1114" y="443" key="NewPhpFileDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1584290302981" />
+    <state x="1420" y="165" key="SettingsEditor" timestamp="1586722506607">
+      <screen x="0" y="0" width="2560" height="1040" />
+    </state>
+    <state x="1420" y="165" key="SettingsEditor/0.0.2560.1040@0.0.2560.1040" timestamp="1586722506607" />
     <state x="873" y="242" key="Vcs.Push.Dialog.v2" timestamp="1585899399605">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
@@ -1256,15 +1253,11 @@
     </state>
     <state x="732" y="383" key="com.intellij.ide.util.TipDialog/0.0.1920.1160@0.0.1920.1160" timestamp="1582201881167" />
     <state x="1456" y="240" key="com.intellij.ide.util.TipDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1586418523328" />
-    <state x="977" y="257" width="607" height="536" key="find.popup" timestamp="1584360859362">
+    <state x="977" y="257" width="607" height="536" key="find.popup" timestamp="1587628717476">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="733" y="287" width="607" height="598" key="find.popup/0.0.1920.1160@0.0.1920.1160" timestamp="1582125776502" />
-    <state x="977" y="257" width="607" height="536" key="find.popup/0.0.2560.1040@0.0.2560.1040" timestamp="1584360859362" />
-    <state x="936" y="240" key="run.anything.popup" timestamp="1578386519646">
-      <screen x="0" y="0" width="2560" height="1040" />
-    </state>
-    <state x="936" y="240" key="run.anything.popup/0.0.2560.1040@0.0.2560.1040" timestamp="1578386519646" />
+    <state x="977" y="257" width="607" height="536" key="find.popup/0.0.2560.1040@0.0.2560.1040" timestamp="1587628717476" />
     <state x="943" y="225" width="672" height="678" key="search.everywhere.popup" timestamp="1584289936754">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>

diff --git a/scripts/domoticz_device_event.php b/scripts/domoticz_device_event.php
index 40404fb27fa8686c90c11142b8af59d22489c7a4..6ff92d3e4b25b4654a0e24dbb67f75a61ab81ae4 100644 (file)
--- a/scripts/domoticz_device_event.php
+++ b/scripts/domoticz_device_event.php
@@ -1,16 +1,14 @@
 <?php
-if ($_GET['device'] == 1033) {
+
+if ($_GET['device'] == 1033 || $_GET['device'] == 1476 || $_GET['device'] == 1478) {
     $forceConfig = 'salon';
 }
-if ($_GET['device'] == 1476) {
-    $forceConfig = 'bureau';
-}
 
 require_once "import.php";
 
 if ($_GET['device'] == 480) {
     chambreToggle();
-} else if ($_GET['device'] == 1033) {
+} else if ($_GET['device'] == 1033 || $_GET['device'] == 1476 || $_GET['device'] == 1478) {
     // Cube
     switch ($_GET['state']) {
         case 'Shake':
@@ -52,48 +50,6 @@ if ($_GET['device'] == 480) {
         default:
             break;
     }
-} else if ($_GET['device'] == 1476) {
-    // Cube
-//    switch ($_GET['state']) {
-//        case 'Shake':
-//            execScene('home/alert');
-//            break;
-//        case 'Flip_90':
-//            execScene('bureau/off');
-//            break;
-//        case 'Flip_180':
-//            execScene('bureau/auto');
-//            break;
-//        case 'Free_Fall':
-//            execScene('salon/off');
-//            off('bureau');
-//            break;
-//        case 'Move':
-//            if (getCurrentHarmonyActivity() != 'musique-radio') {
-//                _remoteCmd('pause', 'salon');
-//            }
-//            break;
-//        case 'Clock_Wise':
-//            if (getCurrentHarmonyActivity() !== 'poweroff') {
-//                harmonyRequest('commands/volume-up?repeat=3', 'POST');
-//            }
-//            break;
-//        case 'Anti_Clock_Wise':
-//            if (getCurrentHarmonyActivity() !== 'poweroff') {
-//                harmonyRequest('commands/volume-down?repeat=5', 'POST');
-//            }
-//            break;
-//        case 'Tap':
-//            if (getCurrentHarmonyActivity() == 'poweroff') {
-//                squeezePlayByName('FIP', $squeezeboxPlayers['Salon']);
-//            } else if (getCurrentHarmonyActivity() == 'musique-radio') {
-//                stopHarmony();
-//            }
-//            break;
-//        case 'Alert':
-//        default:
-//            break;
-//    }
 } else if ($_GET['device'] == 1451) {
     domoticzSwitch(1450);
 }