From: Vincent Date: Fri, 31 Jan 2020 08:56:02 +0000 (+0100) Subject: . X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=e5c1eefce7ec3f285dacb155c448d6a813eb1aee;p=tortuga-home.git . --- diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 3ebe478..d8027ba 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,9 +2,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -1184,11 +1227,11 @@ - + - + @@ -1208,17 +1251,17 @@ - + - - + + - + diff --git a/images/weather/01.svg b/images/weather/01.svg new file mode 100644 index 0000000..47627d7 --- /dev/null +++ b/images/weather/01.svg @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/weather/02.svg b/images/weather/02.svg new file mode 100644 index 0000000..5f32f16 --- /dev/null +++ b/images/weather/02.svg @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/weather/03.svg b/images/weather/03.svg new file mode 100644 index 0000000..d425cbf --- /dev/null +++ b/images/weather/03.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/weather/04.svg b/images/weather/04.svg new file mode 100644 index 0000000..e34fff9 --- /dev/null +++ b/images/weather/04.svg @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/weather/05.svg b/images/weather/05.svg new file mode 100644 index 0000000..430e90e --- /dev/null +++ b/images/weather/05.svg @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/weather/06.svg b/images/weather/06.svg new file mode 100644 index 0000000..c9991af --- /dev/null +++ b/images/weather/06.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/weather/07.svg b/images/weather/07.svg new file mode 100644 index 0000000..48d017f --- /dev/null +++ b/images/weather/07.svg @@ -0,0 +1,13 @@ + + + + + + + + \ No newline at end of file diff --git a/images/weather/08.svg b/images/weather/08.svg new file mode 100644 index 0000000..7409711 --- /dev/null +++ b/images/weather/08.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/images/weather/11.svg b/images/weather/11.svg new file mode 100644 index 0000000..ef6f3a2 --- /dev/null +++ b/images/weather/11.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/weather/12.svg b/images/weather/12.svg new file mode 100644 index 0000000..569f80c --- /dev/null +++ b/images/weather/12.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/weather/13.svg b/images/weather/13.svg new file mode 100644 index 0000000..0c9ec0e --- /dev/null +++ b/images/weather/13.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/weather/14.svg b/images/weather/14.svg new file mode 100644 index 0000000..9ab8f4b --- /dev/null +++ b/images/weather/14.svg @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/weather/15.svg b/images/weather/15.svg new file mode 100644 index 0000000..2e657fc --- /dev/null +++ b/images/weather/15.svg @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file diff --git a/images/weather/16.svg b/images/weather/16.svg new file mode 100644 index 0000000..8f6a2b1 --- /dev/null +++ b/images/weather/16.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/weather/17.svg b/images/weather/17.svg new file mode 100644 index 0000000..05b09f5 --- /dev/null +++ b/images/weather/17.svg @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/weather/18.svg b/images/weather/18.svg new file mode 100644 index 0000000..a146695 --- /dev/null +++ b/images/weather/18.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/weather/19.svg b/images/weather/19.svg new file mode 100644 index 0000000..ee2cbe1 --- /dev/null +++ b/images/weather/19.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/images/weather/20.svg b/images/weather/20.svg new file mode 100644 index 0000000..6c5105a --- /dev/null +++ b/images/weather/20.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/weather/21.svg b/images/weather/21.svg new file mode 100644 index 0000000..b1d0ef7 --- /dev/null +++ b/images/weather/21.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/weather/22.svg b/images/weather/22.svg new file mode 100644 index 0000000..1cc251a --- /dev/null +++ b/images/weather/22.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/weather/23.svg b/images/weather/23.svg new file mode 100644 index 0000000..859acdc --- /dev/null +++ b/images/weather/23.svg @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/weather/24.svg b/images/weather/24.svg new file mode 100644 index 0000000..258060c --- /dev/null +++ b/images/weather/24.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/images/weather/25.svg b/images/weather/25.svg new file mode 100644 index 0000000..2549da1 --- /dev/null +++ b/images/weather/25.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/weather/26.svg b/images/weather/26.svg new file mode 100644 index 0000000..6648c96 --- /dev/null +++ b/images/weather/26.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/weather/29.svg b/images/weather/29.svg new file mode 100644 index 0000000..a04a470 --- /dev/null +++ b/images/weather/29.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/weather/30.svg b/images/weather/30.svg new file mode 100644 index 0000000..adb70a5 --- /dev/null +++ b/images/weather/30.svg @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file diff --git a/images/weather/31.svg b/images/weather/31.svg new file mode 100644 index 0000000..fb03c50 --- /dev/null +++ b/images/weather/31.svg @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file diff --git a/images/weather/32.svg b/images/weather/32.svg new file mode 100644 index 0000000..cf609ed --- /dev/null +++ b/images/weather/32.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/images/weather/33.svg b/images/weather/33.svg new file mode 100644 index 0000000..dffce65 --- /dev/null +++ b/images/weather/33.svg @@ -0,0 +1,13 @@ + + + + + + + + \ No newline at end of file diff --git a/images/weather/34.svg b/images/weather/34.svg new file mode 100644 index 0000000..ecdfcdd --- /dev/null +++ b/images/weather/34.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/images/weather/35.svg b/images/weather/35.svg new file mode 100644 index 0000000..7c3d0db --- /dev/null +++ b/images/weather/35.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/weather/36.svg b/images/weather/36.svg new file mode 100644 index 0000000..77be50b --- /dev/null +++ b/images/weather/36.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/weather/37.svg b/images/weather/37.svg new file mode 100644 index 0000000..a37c236 --- /dev/null +++ b/images/weather/37.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/weather/38.svg b/images/weather/38.svg new file mode 100644 index 0000000..c4fa669 --- /dev/null +++ b/images/weather/38.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/images/weather/39.svg b/images/weather/39.svg new file mode 100644 index 0000000..f69dd75 --- /dev/null +++ b/images/weather/39.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/weather/40.svg b/images/weather/40.svg new file mode 100644 index 0000000..3bb9452 --- /dev/null +++ b/images/weather/40.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/weather/41.svg b/images/weather/41.svg new file mode 100644 index 0000000..429d7f4 --- /dev/null +++ b/images/weather/41.svg @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/images/weather/42.svg b/images/weather/42.svg new file mode 100644 index 0000000..b97c20a --- /dev/null +++ b/images/weather/42.svg @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/images/weather/43.svg b/images/weather/43.svg new file mode 100644 index 0000000..344d122 --- /dev/null +++ b/images/weather/43.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/images/weather/44.svg b/images/weather/44.svg new file mode 100644 index 0000000..05f9fd0 --- /dev/null +++ b/images/weather/44.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/js/home.js b/js/home.js index 2c3dc70..34055c6 100644 --- a/js/home.js +++ b/js/home.js @@ -676,7 +676,7 @@ function updateVelib(force) { function initWeather() { setInterval(function () { updateWeather(); - }, 1000 * 1200); + }, 1000 * 60); updateWeather(); } @@ -684,8 +684,8 @@ function updateWeather() { var w = $(".weather"); $.get('cache/weather.json?j=' + new Date().getTime(), function (data) { w.find('.temp-min').text(data.min + '°C'); - w.find('.icon-day').html(''); - w.find('.icon-night').html(''); + w.find('.icon-day').html(''); + w.find('.icon-night').html(''); w.find('.temp-max').text(data.max + '°C'); w.find('.temp').text(data.outdoor_temp + '°C'); w.attr('data-init', 1); diff --git a/scripts/cron/cron.php b/scripts/cron/cron.php index aa0863a..3fcef55 100644 --- a/scripts/cron/cron.php +++ b/scripts/cron/cron.php @@ -7,11 +7,11 @@ function cronOneLoop($cronmin) set_time_limit(0); cronRooms($cronmin); cronInsteon($cronmin); + cronWeather($cronmin); if ($cronmin % 5 == 0) { cronTraffic($cronmin, false); cronVelib($cronmin); - cronWeather($cronmin); cronBackyard($cronmin); cronGuest($cronmin); } @@ -174,12 +174,12 @@ function cronWeather($cronmin) $res['backyard_temp'] = toNumber(getDomoticzDeviceStatus(1025), true); $res['backyard_humidity'] = toNumber(getDomoticzDeviceStatus(1026), true); $res['backyard_pressure'] = toNumber(getDomoticzDeviceStatus(1027), true); - $res['bathroom_temp']=toNumber(getDomoticzDeviceStatus(1346), true); - $res['bathroom_humidity']=toNumber(getDomoticzDeviceStatus(1347), true); - $res['bedroom_temp']=toNumber(getDomoticzDeviceStatus(1356), true); - $res['bedroom_humidity']=toNumber(getDomoticzDeviceStatus(1357), true); - $res['livingroom_temp']=toNumber(getDomoticzDeviceStatus(1351), true); - $res['livingroom_humidity']=toNumber(getDomoticzDeviceStatus(1352), true); + $res['bathroom_temp'] = toNumber(getDomoticzDeviceStatus(1346), true); + $res['bathroom_humidity'] = toNumber(getDomoticzDeviceStatus(1347), true); + $res['bedroom_temp'] = toNumber(getDomoticzDeviceStatus(1356), true); + $res['bedroom_humidity'] = toNumber(getDomoticzDeviceStatus(1357), true); + $res['livingroom_temp'] = toNumber(getDomoticzDeviceStatus(1351), true); + $res['livingroom_humidity'] = toNumber(getDomoticzDeviceStatus(1352), true); $res['pressure'] = round($weather['Pressure']['Metric']['Value']); $res['pressureTendency'] = $weather['PressureTendency']['Code']; $res['precipitations24'] = round($weather['PrecipitationSummary']['Past24Hours']['Metric']['Value']); diff --git a/scripts/lib/medialibrary.php b/scripts/lib/medialibrary.php index f96403d..6f20fb8 100644 --- a/scripts/lib/medialibrary.php +++ b/scripts/lib/medialibrary.php @@ -153,7 +153,7 @@ function transcodeOneVideo() function videosHaveSameDuration($v1, $v2, $tolerance = 10) { - return abs(getVideoDuration($v1) - getVideoDuration($v2)) < $tolerance; + return abs((float)getVideoDuration($v1) - (float)getVideoDuration($v2)) < $tolerance; } function nasToAvion($path) diff --git a/scripts/lib/weatherstation.php b/scripts/lib/weatherstation.php index 7288bcd..8809d68 100644 --- a/scripts/lib/weatherstation.php +++ b/scripts/lib/weatherstation.php @@ -104,7 +104,7 @@ function getPosOnCircle($angle, $radius, $x, $y) function accuweatherIcon($icon) { - return ''; + return ''; // return ''; }