]> _ Git - tortuga-home.git/commitdiff
.
authorVincent <vincent@enhydra.fr>
Sun, 20 Oct 2019 18:19:33 +0000 (20:19 +0200)
committerVincent <vincent@enhydra.fr>
Sun, 20 Oct 2019 18:19:33 +0000 (20:19 +0200)
.idea/workspace.xml
scripts/pcgames.php

index ff7395546fd2c754f7b845c92196872666124eef..63636066070b45616dd26aa429ca7dbfa52d7f18 100644 (file)
@@ -2,13 +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/checkstate.php" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/scripts/pcgames.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/media.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/media.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/rooms.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/rooms.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/pcgames.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/pcgames.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
       <workItem from="1571207547358" duration="2774000" />
       <workItem from="1571379187683" duration="3078000" />
       <workItem from="1571384814081" duration="5000" />
-      <workItem from="1571569117453" duration="3639000" />
-    </task>
-    <task id="LOCAL-00187" summary=".">
-      <created>1562430926369</created>
-      <option name="number" value="00187" />
-      <option name="presentableId" value="LOCAL-00187" />
-      <option name="project" value="LOCAL" />
-      <updated>1562430926369</updated>
+      <workItem from="1571569117453" duration="4627000" />
+      <workItem from="1571594532253" duration="924000" />
     </task>
     <task id="LOCAL-00188" summary=".">
       <created>1562433498333</created>
       <option name="project" value="LOCAL" />
       <updated>1571209734093</updated>
     </task>
-    <option name="localTasksCounter" value="236" />
+    <task id="LOCAL-00236" summary=".">
+      <created>1571574019434</created>
+      <option name="number" value="00236" />
+      <option name="presentableId" value="LOCAL-00236" />
+      <option name="project" value="LOCAL" />
+      <updated>1571574019435</updated>
+    </task>
+    <option name="localTasksCounter" value="237" />
     <servers />
   </component>
   <component name="TodoView">
index 058154981da6214d8d9624c1833c049d529be208..69cf55d3f3a661118f230453327f68d2970286c3 100644 (file)
@@ -3,6 +3,10 @@ require_once "import.php";
 
 if (config('DEVICE') == 'salon') {
     harmonyActivity('media');
-    sshCommand('killall fbi', 'salon', false,true);
-    sshCommand('DISPLAY=:0 remmina -c /home/pi/.local/share/remmina/1571565005433.remmina', 'salon');
-}
\ No newline at end of file
+} else if (config('DEVICE') == 'bureau') {
+    bureauMediaOn();
+}
+
+sshCommand('killall fbi', null, false, true);
+sshCommand('killall /usr/bin/remmina', null, false, true);
+sshCommand('DISPLAY=:0 /usr/bin/remmina -c /home/pi/.local/share/remmina/1571565005433.remmina', null, false, false);
\ No newline at end of file