.

diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
index 8eb37dbc5d9abc1e9a36d218297b7053bde047cd..7f9ba08a7935fd6e7095cf8784b8dedbc394db6d 100644 (file)
--- a/.idea/dataSources.local.xml
+++ b/.idea/dataSources.local.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="dataSourceStorageLocal" created-in="IU-241.14494.240">
+  <component name="dataSourceStorageLocal" created-in="IU-241.15989.150">
     <data-source name="LFY(3).db" uuid="e5a3291d-855f-44b2-be41-76fe6b0c2136">
       <database-info product="SQLite" version="3.25.1" jdbc-version="2.1" driver-name="SQLite JDBC" driver-version="3.25.1" dbms="SQLITE" exact-version="3.25.1" exact-driver-version="3.25">
         <identifier-quote-string>&quot;</identifier-quote-string>

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 99c8e25ac9f7a12b46444fbb1bafdf0a01239b4d..0b499dddfdc85cf46009f4bdd2951e78d8ebac01 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,19 +5,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
+      <change beforePath="$PROJECT_DIR$/.idea/dataSources.local.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.local.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/coffee.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/coffee.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/global.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/global.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/js/home.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/home.js" 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/domoticz_status.php" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/domoticz.php" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/flowerpower.php" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/ifttt.php" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/lib.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/lib.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/dnsmasq.conf" beforeDir="false" afterPath="$PROJECT_DIR$/config/dnsmasq.conf" 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$/tools/flowerpower.js" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -426,8 +417,8 @@
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
-        <option value="bundled-jdk-9f38398b9061-18abd8497189-intellij.indexing.shared.core-IU-241.14494.240" />
-        <option value="bundled-js-predefined-1d06a55b98c1-74d2a5396914-JavaScript-IU-241.14494.240" />
+        <option value="bundled-jdk-9f38398b9061-39b83d9b5494-intellij.indexing.shared.core-IU-241.15989.150" />
+        <option value="bundled-js-predefined-1d06a55b98c1-91d5c284f522-JavaScript-IU-241.15989.150" />
       </set>
     </attachedChunks>
   </component>
@@ -1327,7 +1318,9 @@
       <workItem from="1713376517416" duration="792000" />
       <workItem from="1713440657070" duration="147000" />
       <workItem from="1713531985684" duration="2444000" />
-      <workItem from="1713941353441" duration="2332000" />
+      <workItem from="1713941353441" duration="3152000" />
+      <workItem from="1715586628163" duration="670000" />
+      <workItem from="1716389152246" duration="456000" />
     </task>
     <task id="LOCAL-00502" summary=".">
       <created>1641726946298</created>
@@ -1672,7 +1665,7 @@
       <option name="project" value="LOCAL" />
       <updated>1687259667913</updated>
     </task>
-    <option name="localTasksCounter" value="615" />
+    <option name="localTasksCounter" value="616" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/config/dnsmasq.conf b/config/dnsmasq.conf
index e5ec709e294033bb07fa135d3a1c0ab99b02ee64..36ce5bb4ef9bbe113b3604405b31f76a3bf2617f 100644 (file)
--- a/config/dnsmasq.conf
+++ b/config/dnsmasq.conf
@@ -1,8 +1,6 @@
+server=141.94.68.154
 server=1.1.1.1
 server=8.8.8.8
-server=95.217.229.211
-server=151.80.222.79
-server=192.168.13.1
 server=8.8.4.4
 server=1.0.0.1
 # Freebox

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index 89cbeb054eafa6b46b3d8a75f247cc376867663f..b1ca4b60c804ddb3ada84f23c201e8b151e73078 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -620,12 +620,11 @@ $scenes = [
         ['type' => 'ha', 'device' => HA_OFFICE_SCREEN, 'command' => 'open_cover'],
     ],
     'bureau/rideaux/close' => [
-        ['type' => 'function', 'function' => 'bureauRideau', 'args' => ['close_cover']],
+        ['type' => 'function', 'function' => 'bureauRideau', 'args' => ['turn_off']],
 
     ],
     'bureau/rideaux/open' => [
-        ['type' => 'function', 'function' => 'bureauRideau', 'args' => ['open_cover']],
-
+        ['type' => 'function', 'function' => 'bureauRideau', 'args' => ['turn_on']],
     ],
     'bureau/rideaux/toggle' => [
         ['type' => 'function', 'function' => 'bureauRideau', 'args' => ['toggle']],
@@ -873,9 +872,9 @@ function welcomeEco()
 
 function bureauRideau($cmd)
 {
-    if (haGetState('binary_sensor.0x00124b002933744d_contact') == 'on') {
-        return;
-    }
+//    if (haGetState('binary_sensor.0x00124b002933744d_contact') == 'on') {
+//        return;
+//    }
     haAction(HA_OFFICE_CURTAIN, $cmd);
 }