.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 697054a4560cb89ff82dda322f87c9d86e39217a..34f7f4c6ac065deeddcee17b816f57b7185aaa47 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,20 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
-      <change afterPath="$PROJECT_DIR$/config/coffee.php" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/scripts/ifttt.php" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/scripts/lib/ifttt.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/cuisine.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/cuisine.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/default.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/default.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/entree.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/entree.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/salon.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/salon.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/sdb.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/sdb.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/lib/lib.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/lib.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$/style/style.css" beforeDir="false" afterPath="$PROJECT_DIR$/style/style.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/style/style.less" beforeDir="false" afterPath="$PROJECT_DIR$/style/style.less" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/freebox.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/freebox.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/netgearwifiext.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/netgearwifiext.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/tortugatask.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/tortugatask.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/tools/jarvis/commands" beforeDir="false" afterPath="$PROJECT_DIR$/tools/jarvis/commands" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -708,6 +699,9 @@
       <workItem from="1565598552133" duration="873000" />
       <workItem from="1565857750276" duration="198000" />
       <workItem from="1565857963461" duration="9853000" />
+      <workItem from="1565888259142" duration="142000" />
+      <workItem from="1565888705576" duration="695000" />
+      <workItem from="1565943575929" duration="354000" />
     </task>
     <task id="LOCAL-00154" summary=".">
       <created>1550698148331</created>

diff --git a/scripts/lib/freebox.php b/scripts/lib/freebox.php
index 277886b57aacba627483a0d49c767213dac99155..e9933e162d17383372474d856d55f78285367011 100644 (file)
--- a/scripts/lib/freebox.php
+++ b/scripts/lib/freebox.php
@@ -11,7 +11,7 @@ function freeboxKey($keys, $long = false)
             continue;
         }
         echo $key . "<br>";
-        httpRequest('http://192.168.1.3/pub/remote_control', 'GET', ['code' => '42472024', 'key' => $key]);
+        httpRequest('http://192.168.13.2/pub/remote_control', 'GET', ['code' => '42472024', 'key' => $key]);
     }
 }
 

diff --git a/scripts/lib/netgearwifiext.php b/scripts/lib/netgearwifiext.php
index d11dbed628a65a38cd9fec8fc07d6b1563d39961..85e685afca0e4a417af42d3a570b2b33e2364f41 100644 (file)
--- a/scripts/lib/netgearwifiext.php
+++ b/scripts/lib/netgearwifiext.php
@@ -5,7 +5,7 @@ function getNetgearWifiExtHttpClient()
        global $netgearWifiExtHttpClient;
        if (null == $netgearWifiExtHttpClient) {
                $netgearWifiExtHttpClient = getHttpClient();
-               $response = $netgearWifiExtHttpClient->post('http://192.168.1.80/ajax/weblogin', ['form_params' => [
+               $response = $netgearWifiExtHttpClient->post('http://192.168.13.84/ajax/weblogin', ['form_params' => [
                        'email_auth' => 'vincent@enhydra.fr',
                        'passwd_auth' => 'HXXzYlphGy!xLe3k',
                        'remember_func' => 'Remember+Me',
@@ -22,7 +22,7 @@ function netgearWifiExtReboot()
 {
 
        $client = getNetgearWifiExtHttpClient();
-       $resp = $client->request('get', 'http://192.168.1.80/BAK_restart.htm');
+       $resp = $client->request('get', 'http://192.168.13.84/BAK_restart.htm');
        preg_match('|backup\.cgi\?id=\d+|', $resp->getBody(), $matches);
        $url = '/' . $matches[0];
 
@@ -30,5 +30,5 @@ function netgearWifiExtReboot()
                'ROMRestart' => 'Oui',
        ]]);
 
-       $client->get('http://192.168.1.80/logout.htm');
+       $client->get('http://192.168.13.84/logout.htm');
 }
\ No newline at end of file

diff --git a/scripts/tortugatask.php b/scripts/tortugatask.php
index 31504f251f6aeb1e69b806d2b718387d7620e7c0..6f85c4ef87c75037e58e73e1cdb4630ccae23920 100644 (file)
--- a/scripts/tortugatask.php
+++ b/scripts/tortugatask.php
@@ -9,7 +9,7 @@ if (isset($_GET['task'])) {
 $task = rawurlencode($task) . "=:=task";
 
 if (getState('vincenthere') == '1') {
-    $tortuga = 'http://192.168.1.53:1817/?message=' . $task . '&password=4pyA?Rnyeyc1$44M';
+    $tortuga = 'http://192.168.13.31:1817/?message=' . $task . '&password=4pyA?Rnyeyc1$44M';
 } else {
     $tortuga = "https://autoremotejoaomgcd.appspot.com/sendmessage?key=APA91bEnQyiR8RE7HcPCcm3mhb6ALojD9PQjHAAHM7y0ih8jYrt1c5q8r_zT_WJacMh8jpvI-bIdstHRQLe6Cx3PTxigQo2H-jsazHOisbFIW9JLvmKNs0O7Mt6kQDPLBvRhBESVTAXa&message=$task&target=TORTUGA&password=4pyA?Rnyeyc1$44M";
 }

diff --git a/tools/jarvis/commands b/tools/jarvis/commands
index 3a6165c88461c98513a5141a0676f1df6b71b595..9eb477fff5547833d38a57a88fe9574b47930419 100644 (file)
--- a/tools/jarvis/commands
+++ b/tools/jarvis/commands
@@ -16,6 +16,7 @@ ENCORE*==jv_repeat_last_command
 *AU*LIT*==say "Bonne nuit" && jv_curl "https://entree.home.tortuga.enhydra.fr/scripts/light.php?scene=home/aulit&im"
 *ALLUME*LUMIERE*==say "J'allume tout"  && jv_curl "https://entree.home.tortuga.enhydra.fr/scripts/light.php?scene=home/welcome&im"
 *ETEIN*MAISON*==say "J'éteins tout, à la prochaine"  && jv_curl "https://entree.home.tortuga.enhydra.fr/scripts/light.php?scene=home/off&im"
+*ALLUM*CAFE*==say "C'est parti ! Profites-en pour te nettoyer une tasse ;)"
 *SENS*VIE*==say "42"
 *RADIO*SALON*==say "D'accord, je mets FIP" && jv_curl "https://entree.home.tortuga.enhydra.fr/scripts/squeeze.php?player=Salon&name=FIP"
 *INFO*==say "D'accord, j'allume franceinfo: (BFM, j'aime pas trop)" && jv_curl "https://entree.home.tortuga.enhydra.fr/scripts/squeeze.php?player=Salon&name=France%20Info"