.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 939a646c50317782d668c2100e146866796d3a55..499d85044504f8bec38fccd96895e9437e3c93a3 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,9 @@
   <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/harmony.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/harmony.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/ecomode.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/ecomode.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" />
@@ -269,17 +271,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>
@@ -901,14 +892,8 @@
       <workItem from="1604497757709" duration="6812000" />
       <workItem from="1604521477525" duration="943000" />
       <workItem from="1604526310660" duration="647000" />
-      <workItem from="1604565468930" duration="1537000" />
-    </task>
-    <task id="LOCAL-00326" summary=".">
-      <created>1592288366340</created>
-      <option name="number" value="00326" />
-      <option name="presentableId" value="LOCAL-00326" />
-      <option name="project" value="LOCAL" />
-      <updated>1592288366341</updated>
+      <workItem from="1604565468930" duration="2053000" />
+      <workItem from="1604740529001" duration="1728000" />
     </task>
     <task id="LOCAL-00327" summary=".">
       <created>1592548753578</created>
@@ -1246,7 +1231,14 @@
       <option name="project" value="LOCAL" />
       <updated>1604568864148</updated>
     </task>
-    <option name="localTasksCounter" value="375" />
+    <task id="LOCAL-00375" summary=".">
+      <created>1604568925231</created>
+      <option name="number" value="00375" />
+      <option name="presentableId" value="LOCAL-00375" />
+      <option name="project" value="LOCAL" />
+      <updated>1604568925231</updated>
+    </task>
+    <option name="localTasksCounter" value="376" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1288,20 +1280,16 @@
     <option name="LAST_COMMIT_MESSAGE" value="." />
   </component>
   <component name="WindowStateProjectService">
-    <state x="872" y="161" key="#Plugins" timestamp="1596008801840">
-      <screen x="0" y="0" width="2560" height="1040" />
-    </state>
-    <state x="872" y="161" key="#Plugins/0.0.2560.1040@0.0.2560.1040" timestamp="1596008801840" />
     <state x="740" y="229" key="#com.jetbrains.php.refactoring.extractMethod.PhpExtractMethodDialog#function0" timestamp="1604146905948">
       <screen x="0" y="0" width="1707" height="920" />
     </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="198" y="0" width="737" height="502" key="CommitChangelistDialog2" timestamp="1604568824026">
+    <state x="198" y="0" width="737" height="502" key="CommitChangelistDialog2" timestamp="1604568911948">
       <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="1604307637401" />
     <state x="701" y="75" key="CommitChangelistDialog2/0.0.1920.1160@0.0.1920.1160" timestamp="1602171117745" />
-    <state x="198" y="0" width="745" height="567" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1604568824026" />
+    <state x="198" y="0" width="745" height="567" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1604568911948" />
     <state x="635" y="216" key="FileChooserDialogImpl" timestamp="1604227698339">
       <screen x="0" y="0" width="1707" height="920" />
     </state>
@@ -1311,10 +1299,6 @@
     </state>
     <state x="743" y="392" key="NewPhpFileDialog/0.0.1707.920@0.0.1707.920" timestamp="1604238041494" />
     <state x="1114" y="443" key="NewPhpFileDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1604521861497" />
-    <state x="781" y="165" key="SettingsEditor" timestamp="1596008871908">
-      <screen x="0" y="0" width="2560" height="1040" />
-    </state>
-    <state x="781" y="165" key="SettingsEditor/0.0.2560.1040@0.0.2560.1040" timestamp="1596008871908" />
     <state width="498" height="446" key="SwitcherDM" timestamp="1604228166964">
       <screen x="0" y="0" width="1707" height="920" />
     </state>
@@ -1323,11 +1307,11 @@
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="295" y="0" width="1290" height="907" key="dock-window-1/0.0.2560.1040@0.0.2560.1040" timestamp="1603274697406" />
-    <state x="977" y="257" width="607" height="536" key="find.popup" timestamp="1604565837014">
+    <state x="977" y="257" width="607" height="536" key="find.popup" timestamp="1604741528604">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="651" y="227" width="550" height="534" key="find.popup/0.0.1707.920@0.0.1707.920" timestamp="1604301949692" />
-    <state x="977" y="257" width="607" height="536" key="find.popup/0.0.2560.1040@0.0.2560.1040" timestamp="1604565837014" />
+    <state x="977" y="257" width="607" height="536" key="find.popup/0.0.2560.1040@0.0.2560.1040" timestamp="1604741528604" />
     <state x="1056" y="292" key="refactoring.ChangeSignatureDialog" timestamp="1604518096294">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>

diff --git a/scripts/cron/cron.php b/scripts/cron/cron.php
index f6f7d91fe906ab7a384c0ae3b1871b156937761f..0be294cf49b6cd701e96589b44b784e4d4567248 100644 (file)
--- a/scripts/cron/cron.php
+++ b/scripts/cron/cron.php
@@ -83,13 +83,13 @@ function cronInsteon($cronmin)
 function cronEcoMode($cronmin)
 {
     _logSection('Ecomode');
-    ecoMode(null);
+    ecoMode(null, false);
 }
 
 function cronTranscode($cronmin)
 {
-    _logSection('Transcode');
-    httpRequest('https://salon.home.tortuga.enhydra.fr/scripts/transcode.php', 'get', [], null, 10, true);
+    //_logSection('Transcode');
+    //httpRequest('https://salon.home.tortuga.enhydra.fr/scripts/transcode.php', 'get', [], null, 10, true);
 }
 
 function _logSection($t)

diff --git a/scripts/lib/ecomode.php b/scripts/lib/ecomode.php
index 8de82b59ab85990822f7fae029980e3a17cbce2b..fb8348a74ee6eaa47c2c133cf1dbc1a17435dc30 100644 (file)
--- a/scripts/lib/ecomode.php
+++ b/scripts/lib/ecomode.php
@@ -10,7 +10,8 @@ function ecoMode($mode = null, $force = false)
     if (!$force && $mode == $currentMode) {
         return;
     }
-    getState('triggeredEcomode', $mode);
+    echo 'switch eco mode :: force ('.$force.') :: (' . $mode . ') :: former (' . $currentMode . ')' . "\n";
+    setState('triggeredEcomode', $mode);
 
     $scenes = [0 => 'off', 1 => 'on', 2 => 'super'];
     execScene('ecomode/' . $scenes[$mode]);

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index 2925b539988ad206d511b1d0d3c8ef79226859bc..a32381b11514a8239e0ff1cb7ff8325e7170b7e0 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -785,7 +785,7 @@ function execScene($name, $fromUserAction = false, $transitionTime = null)
         } else if ($action['type'] == 'phonetask') {
             phoneTask($action['task'], $action['phone'], true);
         } else if ($action['type'] == 'ecomode') {
-            ecoMode($action['mode'], true);
+            ecoMode($action['mode'], $fromUserAction);
         } else if ($action['type'] == 'domoticz') {
             if (isset($action['scene'])) {
                 $action['device'] = $action['scene'];