.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4834f427ff60d4cd8c0246ef6f29abd44757311c..9e22030eddcaa53984f6696f4002d4acbc7d743b 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,9 +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/cron/cron.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/cron/cron.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/domoticz_status.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/domoticz_status.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/domoticz.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/domoticz.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/index.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/mediarasp.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/mediarasp.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/scripts/lib/weatherstation.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/weatherstation.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -779,14 +779,8 @@
       <workItem from="1577358967357" duration="4847000" />
       <workItem from="1577378088885" duration="2201000" />
       <workItem from="1577380387468" duration="866000" />
-      <workItem from="1577785483253" duration="2153000" />
-    </task>
-    <task id="LOCAL-00212" summary=".">
-      <created>1566551436129</created>
-      <option name="number" value="00212" />
-      <option name="presentableId" value="LOCAL-00212" />
-      <option name="project" value="LOCAL" />
-      <updated>1566551436129</updated>
+      <workItem from="1577785483253" duration="3506000" />
+      <workItem from="1577891426611" duration="1934000" />
     </task>
     <task id="LOCAL-00213" summary=".">
       <created>1566603610179</created>
@@ -1124,7 +1118,14 @@
       <option name="project" value="LOCAL" />
       <updated>1577786536735</updated>
     </task>
-    <option name="localTasksCounter" value="261" />
+    <task id="LOCAL-00261" summary=".">
+      <created>1577787688220</created>
+      <option name="number" value="00261" />
+      <option name="presentableId" value="LOCAL-00261" />
+      <option name="project" value="LOCAL" />
+      <updated>1577787688220</updated>
+    </task>
+    <option name="localTasksCounter" value="262" />
     <servers />
   </component>
   <component name="TodoView">
@@ -1185,23 +1186,27 @@
     </state>
     <state x="720" y="247" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1577298128269" />
     <state x="960" y="247" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1576479992407" />
-    <state x="935" y="114" key="CommitChangelistDialog2" timestamp="1577786532749">
+    <state x="935" y="114" key="CommitChangelistDialog2" timestamp="1577787685019">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="701" y="114" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1577381105204" />
     <state x="701" y="127" key="CommitChangelistDialog2/0.0.1920.1160@0.0.1920.1160" timestamp="1575647157027" />
-    <state x="935" y="114" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1577786532749" />
+    <state x="935" y="114" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1577787685019" />
     <state x="1114" y="443" key="NewPhpFileDialog" timestamp="1577785958789">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="836" y="443" key="NewPhpFileDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1577363498855" />
     <state x="1114" y="443" key="NewPhpFileDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1577785958789" />
-    <state x="976" y="343" key="com.intellij.ide.util.TipDialog" timestamp="1577785483789">
+    <state x="872" y="242" key="Vcs.Push.Dialog.v2" timestamp="1577787700897">
+      <screen x="0" y="0" width="2560" height="1040" />
+    </state>
+    <state x="872" y="242" key="Vcs.Push.Dialog.v2/0.0.2560.1040@0.0.2560.1040" timestamp="1577787700897" />
+    <state x="976" y="343" key="com.intellij.ide.util.TipDialog" timestamp="1577891427221">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="732" y="343" key="com.intellij.ide.util.TipDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1577380394903" />
     <state x="732" y="383" key="com.intellij.ide.util.TipDialog/0.0.1920.1160@0.0.1920.1160" timestamp="1575647093028" />
-    <state x="976" y="343" key="com.intellij.ide.util.TipDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1577785483789" />
+    <state x="976" y="343" key="com.intellij.ide.util.TipDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1577891427221" />
     <state x="732" y="257" width="607" height="536" key="find.popup" timestamp="1577380471547">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>

diff --git a/index.php b/index.php
index c03df47e98f9dc2c591c90cad132d60feebceb6d..5554cc17323c5c375970b2db3cc75be9eeb45223 100644 (file)
--- a/index.php
+++ b/index.php
@@ -56,7 +56,6 @@ function relativePath($p)
         <meta name="msapplication-TileImage" content="/images/favicon/ms-icon-144x144.png">
         <meta name="theme-color" content="#0049a4">
     <?php endif; ?>
-
     <style type="text/css">
         #weatherstation {
             background-image: url('<?php echo relativePath('images/backgrounds/'.getCurrentConfig().'.jpg') ?>'), linear-gradient(rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5));

diff --git a/js/home.js b/js/home.js
index ca64b6393f23b841a49769be9f4f10ece59e330a..245c8bc4a08b2ab1121548bbbbb2e1b2f6206060 100644 (file)
--- a/js/home.js
+++ b/js/home.js
@@ -537,6 +537,7 @@ function updateScreenSaver(force) {
         $.ajax('scripts/weatherstation.php', {
             dataType: 'html',
             data: {update: 1},
+            cache: false,
             success: function (data) {
                 $("#weatherstation").html($(data).find("#weatherstation").html());
                 updateTime();

diff --git a/scripts/lib/mediarasp.php b/scripts/lib/mediarasp.php
index 01d272f2d05fdd71822ef7d1e1c956980bef3762..57d524d205ded90ece1f9971cbe9bae5d3fa87a1 100644 (file)
--- a/scripts/lib/mediarasp.php
+++ b/scripts/lib/mediarasp.php
@@ -514,6 +514,9 @@ function VLCPlay($fileorstream, $device = null, $timeout = 5)
     if (file_exists($fileorstream)) {
         $fileorstream = 'file://' . $fileorstream;
     }
+    if ($device === 'bureau') {
+        sshCommand('/usr/local/bin/soundtohdmi', $device, true, true);
+    }
     return VLCCmd(['command' => 'in_play', 'input' => $fileorstream], $device, $timeout);
 }
 

diff --git a/scripts/lib/weatherstation.php b/scripts/lib/weatherstation.php
index 3482c0dad5a226fc9163bdd523f5ca4d37f13da0..e3eecf2da2942620c9c201d171d79c0917d16c1c 100644 (file)
--- a/scripts/lib/weatherstation.php
+++ b/scripts/lib/weatherstation.php
@@ -101,6 +101,7 @@ function getPosOnCircle($angle, $radius, $x, $y)
 function accuweatherIcon($icon)
 {
     return '<img src="https://vortex.accuweather.com/adc2010/images/slate/icons/' . $icon . '.svg" />';
+   // return '<img src="https://www.accuweather.com/images/weathericons/' . $icon . '.svg" />';
 }
 
 function isDay()