.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 15b9b0e7ac8a2b06dbb0331ebb5445268f3097ab..8d9c6430d297874d52395bd5b91b3baacecb3c6c 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,12 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
-      <change afterPath="$PROJECT_DIR$/scripts/day.php" afterDir="false" />
       <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/cron/cron.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/cron/cron.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/scenes.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/scenes.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/weatherstation.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/weatherstation.php" 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/mediarasp.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/mediarasp.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -749,14 +747,8 @@
       <workItem from="1573628826107" duration="201000" />
       <workItem from="1573629043706" duration="29000" />
       <workItem from="1573629088225" duration="3531000" />
-      <workItem from="1574065436563" duration="741000" />
-    </task>
-    <task id="LOCAL-00194" summary=".">
-      <created>1562738981896</created>
-      <option name="number" value="00194" />
-      <option name="presentableId" value="LOCAL-00194" />
-      <option name="project" value="LOCAL" />
-      <updated>1562738981897</updated>
+      <workItem from="1574065436563" duration="754000" />
+      <workItem from="1574066213679" duration="3460000" />
     </task>
     <task id="LOCAL-00195" summary=".">
       <created>1562739863351</created>
@@ -1094,7 +1086,14 @@
       <option name="project" value="LOCAL" />
       <updated>1573630565923</updated>
     </task>
-    <option name="localTasksCounter" value="243" />
+    <task id="LOCAL-00243" summary=".">
+      <created>1574066196695</created>
+      <option name="number" value="00243" />
+      <option name="presentableId" value="LOCAL-00243" />
+      <option name="project" value="LOCAL" />
+      <updated>1574066196695</updated>
+    </task>
+    <option name="localTasksCounter" value="244" />
     <servers />
   </component>
   <component name="TodoView">

diff --git a/scripts/cron/cron.php b/scripts/cron/cron.php
index b2ac2492f4a698feedace03c34318c689a7bb40b..692d60afc8b5c7d3dd52c1e75c653a7b3153fdda 100644 (file)
--- a/scripts/cron/cron.php
+++ b/scripts/cron/cron.php
@@ -72,11 +72,7 @@ function cronRooms($cronmin)
 
 function cronBackyard($cronmin)
 {
-    if (isDay()) {
-        domoticzSwitch(679,true);
-    } else {
-        domoticzSwitch(679,false);
-    }
+    domoticzSwitch(679, isDay()); // Projecteurs cour
 }
 
 function cronMediaLibrary($cronmin)

diff --git a/scripts/domoticz_device_event.php b/scripts/domoticz_device_event.php
index 21680beb27566add3c0aaa99216125320123e3aa..85abaa128e54db100a68e2e42882ede94875ef11 100644 (file)
--- a/scripts/domoticz_device_event.php
+++ b/scripts/domoticz_device_event.php
@@ -2,6 +2,35 @@
 
 require_once "import.php";
 
-if ($_GET['device'] == 480) {
+if ($_GET['hardware'] == 'rflink' && $_GET['device'] == 480) {
     chambreToggle();
+}
+if ($_GET['hardware'] == 'zigate' && $_GET['device'] == 8) {
+    // Cube
+    switch ($_GET['state']) {
+        case 'Shake':
+            execScene('home/alert');
+            break;
+        case 'Flip_90':
+            execScene('salon/cinema');
+            break;
+        case 'Flip_180':
+            execScene('salon/on');
+            break;
+        case 'Free_Fall':
+            execScene('salon/off');
+            break;
+        case 'Move':
+            _remoteCmd('play', 'salon');
+            break;
+        case 'Clock_Wise':
+            _remoteCmd('forward', 'salon');
+            break;
+        case 'Anti_Clock_Wise':
+            _remoteCmd('rewind', 'salon');
+            break;
+        case 'Alert':
+        case 'Tap':
+            break;
+    }
 }
\ No newline at end of file

diff --git a/scripts/lib/mediarasp.php b/scripts/lib/mediarasp.php
index e03c1ecac47e894ed643131cd1d2b9e53d0372bb..e2fb2528ee9737822af6dea1aab6c9f72dfe1262 100644 (file)
--- a/scripts/lib/mediarasp.php
+++ b/scripts/lib/mediarasp.php
@@ -2,6 +2,10 @@
 
 $mediaraspclient = null;
 
+function _removeCmd($cmd,$device){
+
+}
+
 function remoteCmd($cmd, $device)
 {
     $cmd = mb_strtolower($cmd);