From dd05aa8c179d6244ccd26cfbb314d9c17141444d Mon Sep 17 00:00:00 2001 From: Generoso Martello Date: Sat, 7 Nov 2015 16:58:23 +0100 Subject: [PATCH] fixed stats page not showing correct temperature unit; added about popup with hg plus link --- BaseFiles/Common/html/index.html | 34 +- .../Common/html/js/api/homegenie.webapp.js | 28 ++ .../Common/html/pages/analyze/_statistics.js | 300 ++++++++++-------- BaseFiles/Common/html/pages/analyze/main.html | 3 +- .../configure/interfaces/configlet/upnp.html | 2 +- .../widgets/homegenie/generic/timetable.html | 2 +- BaseFiles/Common/html/pages/events/_events.js | 2 +- HomeGenie/Service/Logging/StatisticsLogger.cs | 1 - HomeGenie/release_info.xml | 2 +- HomeGenie_Linux/Packager/DEBIAN/md5sums | 56 ++-- 10 files changed, 252 insertions(+), 178 deletions(-) diff --git a/BaseFiles/Common/html/index.html b/BaseFiles/Common/html/index.html index ba9c5f5e1..7bb9b41cf 100644 --- a/BaseFiles/Common/html/index.html +++ b/BaseFiles/Common/html/index.html @@ -467,9 +467,9 @@

  • Settings
  • Maintenance
  • About
    • -
  • Version ?
    • -
  • Users Guide
    • -
  • Programming Guide
    • +
  • About HomeGenie
    • +
  • Users Guide
    • +
  • Programming Guide
  • Users Forum
  • Keep HomeGenie Up!
    • @@ -496,5 +496,33 @@

    + +
    +
    +

    About

    +
    +
    +

    HomeGenie Version ?

    +
    +

    What's hot

    +

    + Don't miss the new client for Android! +

    +
    + HomeGenie Plus +
    +
    +
    +
    + Close +
    +
    + Update Check +
    +
    + +
    + + diff --git a/BaseFiles/Common/html/js/api/homegenie.webapp.js b/BaseFiles/Common/html/js/api/homegenie.webapp.js index 05b3601a4..bb60c054b 100644 --- a/BaseFiles/Common/html/js/api/homegenie.webapp.js +++ b/BaseFiles/Common/html/js/api/homegenie.webapp.js @@ -113,6 +113,11 @@ HG.WebApp.InitializePage = function () HG.WebApp.Locales.Localize(document, './locales/' + userLang.toLowerCase().substring(0, 2) + '.json', function(success){ HG.WebApp.Locales.Localize(document, './locales/' + userLang.toLowerCase().substring(0, 2) + '.programs.json', function(success){ $('#homegenie_overlay').fadeOut(200); + // Show about popup + if (!dataStore.get('UI.AboutPopupShown')) { + dataStore.set('UI.AboutPopupShown', true); + setTimeout(HG.WebApp.Home.About, 3000); + } }); }); HG.VoiceControl.Initialize(); @@ -224,9 +229,16 @@ HG.WebApp.InitializePage = function () element.enhanceWithin().popup(); HG.Ui.Popup.CronWizard = handler; }); + + $('#homegenie_about').enhanceWithin().popup(); + $('#about_popup_updatebutton').on('click', function(){ + HG.System.UpdateManager.UpdateCheck(); + $('#homegenie_about').popup('close'); + }); }; + // // namespace : HG.WebApp.Events // info : - @@ -298,6 +310,11 @@ HG.WebApp.InitializePage = function () // info : - // HG.WebApp.Home = HG.WebApp.Home || {}; +HG.WebApp.Home.About = function() +{ + $('#homegenie_about').popup('open'); +}; +// HG.WebApp.Home.UpdateHeaderStatus = function() { HG.WebApp.Home.UpdateInterfacesStatus(); @@ -572,6 +589,17 @@ HG.WebApp.Utility.GetCommandFromEvent = function (module, event) return commandobj; }; +HG.WebApp.Utility.GetLocaleTemperature = function (temp) { + var temperatureUnit = dataStore.get('UI.TemperatureUnit'); + if (temperatureUnit != 'C' && (temperatureUnit == 'F' || HG.WebApp.Locales.GetDateEndianType() == 'M')) { + // display as Fahrenheit + temp = Math.round((temp * 1.8 + 32) * 10) / 10; + } else { + // display as Celsius + temp = Math.round(temp * 10) / 10; + } + return (temp * 1).toFixed(2); +}; HG.WebApp.Utility.FormatTemperature = function (temp) { var displayvalue = ''; var temperatureUnit = dataStore.get('UI.TemperatureUnit'); diff --git a/BaseFiles/Common/html/pages/analyze/_statistics.js b/BaseFiles/Common/html/pages/analyze/_statistics.js index c4d88d8a2..c916ddf83 100644 --- a/BaseFiles/Common/html/pages/analyze/_statistics.js +++ b/BaseFiles/Common/html/pages/analyze/_statistics.js @@ -24,16 +24,16 @@ HG.WebApp.Statistics.InitializePage = function () { $('#page_analyze_param').on('change', function () { HG.WebApp.Statistics.RefreshModules(); }); - $('#page_analyze_graphtype').on('change', function () { - //... - }); + //$('#page_analyze_graphtype').on('change', function () { + // //... + //}); // $('#page_analyze_renderbutton').bind('click', function () { var selected = $('#page_analyze_source').find('option:selected'); HG.WebApp.Statistics._CurrentModule = selected.attr('data-context-domain') + ':' + selected.attr('data-context-address'); if (HG.WebApp.Statistics._CurrentModule == ':') HG.WebApp.Statistics._CurrentModule = ''; HG.WebApp.Statistics._CurrentParameter = $('#page_analyze_param').val(); - HG.WebApp.Statistics._CurrentGraphType = $('#page_analyze_graphtype').val(); + //HG.WebApp.Statistics._CurrentGraphType = $('#page_analyze_graphtype').val(); HG.WebApp.Statistics._CurrentType = $('#page_analyze_type').val(); // if (HG.WebApp.Statistics._CurrentParameter.substring(0, 6) == 'Meter.' || HG.WebApp.Statistics._CurrentParameter.substring(0, 13) == 'PowerMonitor.') { @@ -114,11 +114,11 @@ HG.WebApp.Statistics.InitializePage = function () { { if( HG.WebApp.Statistics._SelItemObject == false ) { - $("#page_delete_stat").html("Delete Value : "+item.datapoint[1]); + $("#page_delete_stat").html("Delete Value : "+item.datapoint[1]); HG.WebApp.Statistics._ItemObject = item.datapoint[0]+'/'+item.datapoint[1]; - api.elements.tooltip.stop(1, 1); - api.show(item); - } + api.elements.tooltip.stop(1, 1); + api.show(item); + } } else { @@ -169,23 +169,23 @@ HG.WebApp.Statistics.InitializePage = function () { $("#page_delete_stat").on('click', function () { if( HG.WebApp.Statistics._SelItemObject == true ) { - $.ajax({ - url: '/' + HG.WebApp.Data.ServiceKey + '/' + HG.WebApp.Data.ServiceDomain + '/Statistics/Parameter.StatDelete/' + HG.WebApp.Statistics._ItemObject, - type: 'GET', - success: function (data) { - var stats = eval(data); -// $("#page_analyze_title").html(data) ; - $.mobile.loading('hide'); - }, - error: function(xhr, status, error) { - console.log('STATISTICS ERROR: '+xhr.status+':'+xhr.statusText); - $.mobile.loading('hide'); - } - }); + $.ajax({ + url: '/' + HG.WebApp.Data.ServiceKey + '/' + HG.WebApp.Data.ServiceDomain + '/Statistics/Parameter.StatDelete/' + HG.WebApp.Statistics._ItemObject, + type: 'GET', + success: function (data) { + var stats = eval(data); +// $("#page_analyze_title").html(data) ; + $.mobile.loading('hide'); + }, + error: function(xhr, status, error) { + console.log('STATISTICS ERROR: '+xhr.status+':'+xhr.statusText); + $.mobile.loading('hide'); + } + }); HG.WebApp.Statistics._ItemObject = ''; } HG.WebApp.Statistics._SelItemObject = false; - $("#page_delete_stat").hide(); + $("#page_delete_stat").hide(); }); $("#statshour").on('click', function () { if( HG.WebApp.Statistics._SelItemObject == false ) @@ -193,14 +193,14 @@ HG.WebApp.Statistics.InitializePage = function () { if( HG.WebApp.Statistics._ItemObject != '' ) { HG.WebApp.Statistics._SelItemObject = true; - $("#page_delete_stat").show(); - } + $("#page_delete_stat").show(); + } } else { HG.WebApp.Statistics._ItemObject = ''; HG.WebApp.Statistics._SelItemObject = false; - $("#page_delete_stat").hide(); + $("#page_delete_stat").hide(); } }); }; @@ -257,9 +257,9 @@ HG.WebApp.Statistics.RefreshModules = function () { var saddress = coption.attr('data-context-address'); // $('#page_analyze_source').empty(); - $('#page_analyze_source').append(''); + $('#page_analyze_source').append(''); var allSelected = (sdomain == "All"); - $('#page_analyze_source').append(''); + $('#page_analyze_source').append(''); // var datasources = ''; @@ -302,7 +302,7 @@ HG.WebApp.Statistics.Refresh = function () { if(HG.WebApp.Statistics._CurrentTab == 1) { if(HG.WebApp.Statistics._SelItemObject == false) - $("#page_delete_stat").hide(); + $("#page_delete_stat").hide(); HG.Statistics.ServiceCall('Global.TimeRange', '', '', function (trange) { var start = new Date(parseFloat(trange.StartTime)); var end = new Date(parseFloat(trange.EndTime)); @@ -324,104 +324,122 @@ HG.WebApp.Statistics.Refresh = function () { dto.setHours(23, 59, 59, 0); if(HG.WebApp.Statistics._CurrentModule !="All:") { - if(showtype == true) - { - $.ajax({ - url: '/' + HG.WebApp.Data.ServiceKey + '/' + HG.WebApp.Data.ServiceDomain + '/Statistics/Parameter.StatsHour/' + HG.WebApp.Statistics._CurrentParameter + '/' + HG.WebApp.Statistics._CurrentModule + '/' + dfrom.getTime() + '/' + dto.getTime(), - type: 'GET', - success: function (data) { - var stats = eval(data); - try { - $.plot($("#statshour"), [ - { label: 'Max', data: stats[1], bars: { show: showbars, barWidth: (30 * 60 * 1000), align: 'center', steps: true } }, - { label: 'Avg', data: stats[2], bars: { show: showbars, barWidth: (30 * 60 * 1000), align: 'center', steps: true } }, - { label: 'Min', data: stats[0], bars: { show: showbars, barWidth: (30 * 60 * 1000), align: 'center', steps: true } }, - { label: 'Today Avg', data: stats[3], bars: { show: showbars, barWidth: (10 * 60 * 1000), align: 'center', steps: false } }, - { label: 'Today Detail', data: stats[4], lines: { show: true, lineWidth: 2.0 }, bars: { show: false }, splines: { show: false }, points: { show: false } } - ], - { - yaxis: { show: true }, - xaxis: { mode: "time", timeformat: "%H:00", minTickSize: [1, "hour"], tickSize: [1, "hour"] }, - legend: { position: "nw", noColumns: 5, backgroundOpacity: 0.3 }, - lines: { show: showlines, lineWidth: 1.0 }, - series: { - splines: { show: showsplines } - }, - grid: { - backgroundColor: { colors: ["#fff", "#ddd"] }, - hoverable: true - }, - colors: ["rgba(200, 255, 0, 0.5)", "rgba(120, 160, 0, 0.5)", "rgba(40, 70, 0, 0.5)", "rgba(110, 80, 255, 0.5)", "rgba(200, 30, 0, 1.0)"], //"rgba(0, 30, 180, 1.0)" - points: { show: true }, - zoom: { - interactive: true - }, - pan: { - interactive: true - } - }); - } catch (e) { } - $.mobile.loading('hide'); - }, - error: function(xhr, status, error) { - console.log('STATISTICS ERROR: '+xhr.status+':'+xhr.statusText); - $.mobile.loading('hide'); - } - }); - } - else - { - $.ajax({ - url: '/' + HG.WebApp.Data.ServiceKey + '/' + HG.WebApp.Data.ServiceDomain + '/Statistics/Parameter.StatsDay/' + HG.WebApp.Statistics._CurrentParameter + '/' + HG.WebApp.Statistics._CurrentModule + '/' + dfrom.getTime() + '/' + dto.getTime(), - type: 'GET', - success: function (data) { - var stats = eval(data); - try { - $.plot($("#statshour"), [ - { label: $('#page_analyze_title').text(), data: stats[0], lines: { show: true, lineWidth: 1.0 }, bars: { show: false }, splines: { show: false }, points: { show: false } } - ], - { - yaxis: { show: true }, - xaxis: { mode: "time", timeformat: "%d/%m", minTickSize: [1, "day"], tickSize: [1, "day"] }, - legend: { position: "nw", noColumns: 5, backgroundOpacity: 0.3 }, - lines: { show: showlines, lineWidth: 1.0 }, - series: { - splines: { show: showsplines } - }, - grid: { - backgroundColor: { colors: ["#fff", "#ddd"] }, - hoverable: true - }, - colors: ["rgba(200, 30, 0, 1.0)"], - points: { show: true }, - zoom: { - interactive: true - }, - pan: { - interactive: true - } - }); - } catch (e) { } - $.mobile.loading('hide'); - }, - error: function(xhr, status, error) { - console.log('STATISTICS ERROR: '+xhr.status+':'+xhr.statusText); - $.mobile.loading('hide'); - } - }); - } - } - else - { - $.ajax({ - url: '/' + HG.WebApp.Data.ServiceKey + '/' + HG.WebApp.Data.ServiceDomain + '/Statistics/Parameter.StatsMultiple/' + HG.WebApp.Statistics._CurrentParameter + '/' + HG.WebApp.Statistics._CurrentModule + '/' + dfrom.getTime() + '/' + dto.getTime(), - type: 'GET', - success: function (data) { - var name = ''; - var tformat = ""; - var tickSize = ""; + if(showtype == true) + { + $.ajax({ + url: '/' + HG.WebApp.Data.ServiceKey + '/' + HG.WebApp.Data.ServiceDomain + '/Statistics/Parameter.StatsHour/' + HG.WebApp.Statistics._CurrentParameter + '/' + HG.WebApp.Statistics._CurrentModule + '/' + dfrom.getTime() + '/' + dto.getTime(), + type: 'GET', + success: function (data) { + var stats = eval(data); + try { + if (HG.WebApp.Statistics._CurrentParameter == 'Sensor.Temperature') { + // convert to farehnehit if needed + for (var sx = 0; sx < stats.length; sx++) + for (var tx = 0; tx < stats[sx].length; tx++) + stats[sx][tx][1] = HG.WebApp.Utility.GetLocaleTemperature(stats[sx][tx][1]); + } + $.plot($("#statshour"), [ + { label: 'Max', data: stats[1], bars: { show: showbars, barWidth: (30 * 60 * 1000), align: 'center', steps: true } }, + { label: 'Avg', data: stats[2], bars: { show: showbars, barWidth: (30 * 60 * 1000), align: 'center', steps: true } }, + { label: 'Min', data: stats[0], bars: { show: showbars, barWidth: (30 * 60 * 1000), align: 'center', steps: true } }, + { label: 'Today Avg', data: stats[3], bars: { show: showbars, barWidth: (10 * 60 * 1000), align: 'center', steps: false } }, + { label: 'Today Detail', data: stats[4], lines: { show: true, lineWidth: 2.0 }, bars: { show: false }, splines: { show: false }, points: { show: false } } + ], + { + yaxis: { show: true }, + xaxis: { mode: "time", timeformat: "%H:00", minTickSize: [1, "hour"], tickSize: [1, "hour"] }, + legend: { position: "nw", noColumns: 5, backgroundOpacity: 0.3 }, + lines: { show: showlines, lineWidth: 1.0 }, + series: { + splines: { show: showsplines } + }, + grid: { + backgroundColor: { colors: ["#fff", "#ddd"] }, + hoverable: true + }, + colors: ["rgba(200, 255, 0, 0.5)", "rgba(120, 160, 0, 0.5)", "rgba(40, 70, 0, 0.5)", "rgba(110, 80, 255, 0.5)", "rgba(200, 30, 0, 1.0)"], //"rgba(0, 30, 180, 1.0)" + points: { show: true }, + zoom: { + interactive: true + }, + pan: { + interactive: true + } + }); + } catch (e) { console.log(e); } + $.mobile.loading('hide'); + }, + error: function(xhr, status, error) { + console.log('STATISTICS ERROR: '+xhr.status+':'+xhr.statusText); + $.mobile.loading('hide'); + } + }); + } + else + { + $.ajax({ + url: '/' + HG.WebApp.Data.ServiceKey + '/' + HG.WebApp.Data.ServiceDomain + '/Statistics/Parameter.StatsDay/' + HG.WebApp.Statistics._CurrentParameter + '/' + HG.WebApp.Statistics._CurrentModule + '/' + dfrom.getTime() + '/' + dto.getTime(), + type: 'GET', + success: function (data) { + var stats = eval(data); + try { + if (HG.WebApp.Statistics._CurrentParameter == 'Sensor.Temperature') { + // convert to farehnehit if needed + for (var sx = 0; sx < stats.length; sx++) + for (var tx = 0; tx < stats[sx].length; tx++) + stats[sx][tx][1] = HG.WebApp.Utility.GetLocaleTemperature(stats[sx][tx][1]); + } + $.plot($("#statshour"), [ + { label: $('#page_analyze_title').text(), data: stats[0], lines: { show: true, lineWidth: 1.0 }, bars: { show: false }, splines: { show: false }, points: { show: false } } + ], + { + yaxis: { show: true }, + xaxis: { mode: "time", timeformat: "%d/%m", minTickSize: [1, "day"], tickSize: [1, "day"] }, + legend: { position: "nw", noColumns: 5, backgroundOpacity: 0.3 }, + lines: { show: showlines, lineWidth: 1.0 }, + series: { + splines: { show: showsplines } + }, + grid: { + backgroundColor: { colors: ["#fff", "#ddd"] }, + hoverable: true + }, + colors: ["rgba(200, 30, 0, 1.0)"], + points: { show: true }, + zoom: { + interactive: true + }, + pan: { + interactive: true + } + }); + } catch (e) { console.log(e); } + $.mobile.loading('hide'); + }, + error: function(xhr, status, error) { + console.log('STATISTICS ERROR: '+xhr.status+':'+xhr.statusText); + $.mobile.loading('hide'); + } + }); + } + } + else + { + $.ajax({ + url: '/' + HG.WebApp.Data.ServiceKey + '/' + HG.WebApp.Data.ServiceDomain + '/Statistics/Parameter.StatsMultiple/' + HG.WebApp.Statistics._CurrentParameter + '/' + HG.WebApp.Statistics._CurrentModule + '/' + dfrom.getTime() + '/' + dto.getTime(), + type: 'GET', + success: function (data) { + var name = ''; + var tformat = ""; + var tickSize = ""; var graph_data = []; - var stats = eval(data); + var stats = eval(data); + if (HG.WebApp.Statistics._CurrentParameter == 'Sensor.Temperature') { + // convert to farehnehit if needed + for (var sx = 1; sx < stats.length; sx+=2) + for (var tx = 0; tx < stats[sx].length; tx++) + stats[sx][tx][1] = HG.WebApp.Utility.GetLocaleTemperature(stats[sx][tx][1]); + } if(showtype == true) { tformat = "%H:00"; @@ -444,28 +462,28 @@ HG.WebApp.Statistics.Refresh = function () { xaxis: {mode: "time", timeformat: tformat, minTickSize: [1, tickSize], tickSize: [1, tickSize]}, legend: { backgroundOpacity: 0.3 }, grid: { - backgroundColor: { colors: ["#fff", "#ddd"] }, - hoverable: true - }, - points: { show: true }, - zoom: { + backgroundColor: { colors: ["#fff", "#ddd"] }, + hoverable: true + }, + points: { show: true }, + zoom: { interactive: true }, pan: { interactive: true - } + } }); - $.mobile.loading('hide'); - }, - error: function(xhr, status, error) { - console.log('STATISTICS ERROR: '+xhr.status+':'+xhr.statusText); - $.mobile.loading('hide'); - } - }); + $.mobile.loading('hide'); + }, + error: function(xhr, status, error) { + console.log('STATISTICS ERROR: '+xhr.status+':'+xhr.statusText); + $.mobile.loading('hide'); + } + }); } }); } - else + else { HG.Statistics.ServiceCall('Global.CounterTotal', HG.WebApp.Statistics._CurrentParameter, '', function (total) { $('#page_analyze_totalunits').val((total * 1).toFixed(2)); @@ -513,9 +531,9 @@ HG.WebApp.Statistics.Refresh = function () { }, pan: { interactive: true - } + } }); - } catch (e) { } + } catch (e) { console.log(e); } // $.mobile.loading('hide'); }, diff --git a/BaseFiles/Common/html/pages/analyze/main.html b/BaseFiles/Common/html/pages/analyze/main.html index 4e7ac013b..1bc31d8ad 100644 --- a/BaseFiles/Common/html/pages/analyze/main.html +++ b/BaseFiles/Common/html/pages/analyze/main.html @@ -109,12 +109,13 @@

    Options

    - +
    diff --git a/BaseFiles/Common/html/pages/configure/interfaces/configlet/upnp.html b/BaseFiles/Common/html/pages/configure/interfaces/configlet/upnp.html index 1835df074..45b02c8c4 100644 --- a/BaseFiles/Common/html/pages/configure/interfaces/configlet/upnp.html +++ b/BaseFiles/Common/html/pages/configure/interfaces/configlet/upnp.html @@ -2,7 +2,7 @@
    - UPnP/DLNA control point (experimental/unstable) + UPnP/DLNA control point
    diff --git a/BaseFiles/Common/html/pages/control/widgets/homegenie/generic/timetable.html b/BaseFiles/Common/html/pages/control/widgets/homegenie/generic/timetable.html index ee21b48d8..32c6cbf8b 100644 --- a/BaseFiles/Common/html/pages/control/widgets/homegenie/generic/timetable.html +++ b/BaseFiles/Common/html/pages/control/widgets/homegenie/generic/timetable.html @@ -11,7 +11,7 @@
    -
    +
    Program
    1 diff --git a/BaseFiles/Common/html/pages/events/_events.js b/BaseFiles/Common/html/pages/events/_events.js index 7389ea8c0..61c90c684 100644 --- a/BaseFiles/Common/html/pages/events/_events.js +++ b/BaseFiles/Common/html/pages/events/_events.js @@ -181,7 +181,7 @@ HG.WebApp.Events.SendEventToUi = function (module, eventLog) { } else { $('#configure_system_updateinstall_log').prepend('* ' + eventLog.Property + '
      ' + eventLog.Value + '
    '); - var iconImage = HG.Ui.GetModuleIcon(module, null); + var iconImage = 'images/genie.png'; popupdata = { icon: iconImage, title: eventLog.Property + '
    ' + eventLog.Value, diff --git a/HomeGenie/Service/Logging/StatisticsLogger.cs b/HomeGenie/Service/Logging/StatisticsLogger.cs index bf4d2eeda..920a7bce9 100644 --- a/HomeGenie/Service/Logging/StatisticsLogger.cs +++ b/HomeGenie/Service/Logging/StatisticsLogger.cs @@ -48,7 +48,6 @@ public class StatisticsEntry public class StatisticsLogger { public static List StatisticsFields = new List() { - "Conditions.", "Sensor.", "Meter.", "PowerMonitor.", diff --git a/HomeGenie/release_info.xml b/HomeGenie/release_info.xml index b01a7fbc4..7e18b6f92 100644 --- a/HomeGenie/release_info.xml +++ b/HomeGenie/release_info.xml @@ -1,7 +1,7 @@  HomeGenie - 1.1 beta r450 + 1.1 beta r500 Latest public release. - Fixed ZWave interface sensor timeout bug and sensor Status.Level "0.01" bug - Disabled limit of max one opened http connection per program in NetHelper diff --git a/HomeGenie_Linux/Packager/DEBIAN/md5sums b/HomeGenie_Linux/Packager/DEBIAN/md5sums index 6dd784eda..e66aadb00 100644 --- a/HomeGenie_Linux/Packager/DEBIAN/md5sums +++ b/HomeGenie_Linux/Packager/DEBIAN/md5sums @@ -3,8 +3,8 @@ 513c0ab6c041976fe0bfc13a0c3f1690 usr/local/bin/homegenie/websocket-sharp.dll a2cfe6b2fa0fe02e41ed5aa6a592376e usr/local/bin/homegenie/UnitsNet.dll cc27215f3e44078c573b0018b7f6d4c5 usr/local/bin/homegenie/homegenie_stats.db -2ac0d6a45d12ad4b9e96252c82e2a5f8 usr/local/bin/homegenie/MIG.dll -d4769a1838a1c0026d57ec64f6c55cd6 usr/local/bin/homegenie/startup_debug.sh +03f881af9b27c78e41f349bfc35f5fe8 usr/local/bin/homegenie/MIG.dll +86342aca3b08488c2ae376b62f5af544 usr/local/bin/homegenie/startup_debug.sh fd387d7e07d27394fb2fa2d323ff8c5c usr/local/bin/homegenie/CREDITS.TXT ed3022822cd3dc3348bb51dc054f1574 usr/local/bin/homegenie/IronPython.dll ad77e91f08f489a282e6deab524ce48a usr/local/bin/homegenie/automationgroups.xml @@ -36,20 +36,19 @@ a10fc9aa97ec8123eb53d6cce5205aad usr/local/bin/homegenie/lib/shared/SoapBox.Flu e6d7626e06a8028c8759d354ac0292ef usr/local/bin/homegenie/lib/shared/uk/CronExpressionDescriptor.resources.dll 9797dd3759e5838a90f919a0a82ea1b4 usr/local/bin/homegenie/lib/shared/System.Reactive.PlatformServices.dll 7dddb28083ea3c65c55d26e11fce73ba usr/local/bin/homegenie/lib/shared/es/CronExpressionDescriptor.resources.dll -a29741b144c7af3349dd7ef1897d6073 usr/local/bin/homegenie/lib/shared/SerialPortLib.dll b3a0e50dfe3bfb988838c3eb8892095f usr/local/bin/homegenie/lib/shared/no/CronExpressionDescriptor.resources.dll b28c8e3d0dd93543461eb01f2e5a0ee2 usr/local/bin/homegenie/lib/shared/de/CronExpressionDescriptor.resources.dll 9152e305b5638cacf958dab918e0a5b7 usr/local/bin/homegenie/lib/shared/UPnP.dll.mdb 307ff2f4e8793df854f930424f2873e0 usr/local/bin/homegenie/lib/mig/MIG.Controllers.dll 1667324c690ff6888da4e63da9c8682f usr/local/bin/homegenie/lib/mig/MIG.Media.dll -37a3c2874b74a5f39120c5911d8547dd usr/local/bin/homegenie/lib/mig/XTenLib.dll +37ec56873a3a793a229c008c38262b62 usr/local/bin/homegenie/lib/mig/XTenLib.dll 71cbc2cbf22d9703ddf26767d3bf814b usr/local/bin/homegenie/lib/mig/lircconfig.xml d74542475a616d242338fa16c60e3678 usr/local/bin/homegenie/lib/mig/W800Rf32Lib.dll 4b2e8cdefcdd848a1e4293864093ff7d usr/local/bin/homegenie/lib/mig/v4l/debian64_libCameraCaptureV4L.so 6d8594a2978b5070055a4c1ad0d460f5 usr/local/bin/homegenie/lib/mig/v4l/debian64_libCameraCaptureV4L.so.gd3 9fa7c1e2979434e4fd3eeb8fa259184c usr/local/bin/homegenie/lib/mig/v4l/raspbian_libCameraCaptureV4L.so -8ce139109309689702a944ca12477329 usr/local/bin/homegenie/lib/mig/MIG.HomeAutomation.dll -723ed861781606e3d850db73b821fa8c usr/local/bin/homegenie/lib/mig/MIG.Protocols.dll +4f907935988508832672e37aa92e8c89 usr/local/bin/homegenie/lib/mig/MIG.HomeAutomation.dll +285173b225a6acbf4d898f7b91d573bc usr/local/bin/homegenie/lib/mig/MIG.Protocols.dll e2f6b564cb161a24fbd82e93352d1c9b usr/local/bin/homegenie/lib/mig/LibUsbDotNet.dll 1ea9479ac6c39ca30fb079e7dcc8ec82 usr/local/bin/homegenie/lib/mig/ZWaveLib.dll 13874c9fb26ea8a5ea60d59a38ba450e usr/local/bin/homegenie/lib/mig/lircremotes.xml @@ -87,7 +86,7 @@ a8f9e66c1788ac8938f42165edafb08d usr/local/bin/homegenie/programs/133.dll 5b3c03964a86d3d5a0587bbf6a9a0c6f usr/local/bin/homegenie/programs/75.dll 726fbc3a8f5eb25f09b085e94126628e usr/local/bin/homegenie/programs/40.dll 586f9e130606eef67319ba706c499e85 usr/local/bin/homegenie/programs/180.dll -253060915944eaed914eeb5334663462 usr/local/bin/homegenie/programs/34.dll +024f9354d7b0f2fd7195812b3c90b51d usr/local/bin/homegenie/programs/34.dll 0e8fec4b1c08881b8741dd9e5d7de410 usr/local/bin/homegenie/programs/77.dll 38e11d0aad42eed7c303cf3a99bb4238 usr/local/bin/homegenie/programs/82.dll dc5932ac9baf0e8f1ad0a682ace87fc3 usr/local/bin/homegenie/programs/150.dll @@ -110,7 +109,7 @@ f85bd266c0d92a420ea12d5835156db8 usr/local/bin/homegenie/programs/7.dll f44705a2e7251541db32e4761cf6bae6 usr/local/bin/homegenie/programs/41.dll 8efb9babdfbfb500e59f0cc1c10d372c usr/local/bin/homegenie/programs/16.dll 6e911e0a393f7d7d6f2de035fa4f883b usr/local/bin/homegenie/Microsoft.Scripting.Metadata.dll -979497075ed4859d761def86cf695389 usr/local/bin/homegenie/HomeGenie.exe.mdb +d5d1f74245aeb8adc3c7bf2964a0e77f usr/local/bin/homegenie/HomeGenie.exe.mdb edb4222ca9b4aa24ff7ad7dc5d63ab89 usr/local/bin/homegenie/NetClientLib.dll.mdb 198a54b1a3bba2d5300270ea6f1b9cb5 usr/local/bin/homegenie/Common.Logging.dll 037a39c0e60471e2ad6a155519aabaf8 usr/local/bin/homegenie/Common.dll.mdb @@ -125,9 +124,9 @@ b367f1a0f7ba435a0c92f591f4ae0070 usr/local/bin/homegenie/Raspberry.IO.Component 027d050500b7bb55a5ff9ae25aff0168 usr/local/bin/homegenie/Linux.dll 702ba55b7993d65eee480c723c150a1d usr/local/bin/homegenie/Raspberry.IO.InterIntegratedCircuit.dll 2074c256e8b7a372e28490a436a8e04d usr/local/bin/homegenie/NLog.dll -87d34e72adb6dbd5d8da79aac4a76ff3 usr/local/bin/homegenie/HISTORY.TXT +aec0904531f8f71908ca988931e71828 usr/local/bin/homegenie/HISTORY.TXT 3435a8ca2eb89ec7fc13a463590121c0 usr/local/bin/homegenie/README.TXT -e480afc1ec823559c12d60df05eae48d usr/local/bin/homegenie/programs.xml +ea6b979fb9b1201d5dcb36772a3ce4c3 usr/local/bin/homegenie/programs.xml 58d4389f29365489f41cd547eb1f10ec usr/local/bin/homegenie/modules.xml a19a8070a77444aafa96d3fbe033c42e usr/local/bin/homegenie/IronRuby.Libraries.dll 75bc82884f5bd1ab9c0a53ca0522e255 usr/local/bin/homegenie/Raspberry.IO.Interop.dll @@ -865,7 +864,7 @@ a60aaef3d6478322e40d935c212219fc usr/local/bin/homegenie/html/pages/control/wid 8db319edbaf742052efedfb08bb94ea5 usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/locales/it.json a7b75411324053e37e3f11963ff20a22 usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/locales/fr.json 215e685d1bd511020f45fa39dfa4fa35 usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/locales/en.json -430afef2c969afd5ef4d882c713ec4a0 usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/camerainput.html +b871f56356e7ced6ca7bd71e2c8d7008 usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/camerainput.html ccec1a774f4cbdfe74ae6fc8971d3704 usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/doorwindow.html 905e21c8aefb7fad61a9d86aa5cb5ff8 usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/program.html bac553cdffda0607623ca5b553e7e0e5 usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/doorlock.js @@ -990,21 +989,21 @@ bbec5d9010c19ed04b1189c8cef64195 usr/local/bin/homegenie/html/pages/control/wid cc50c76ffa33dc4c4c5eb3c161b95389 usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/images/light_on.png dde9a824e5685ecfe2bb4a006fca6061 usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/images/battery_level_20.png 33df08b35ec8cddecbca0bf8d55451b4 usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/dimmer.js -c3fe38d1513a6af8b5d14e5cabe1b7fc usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/mediaserver.html +1966b49c67723d24ab0a3ff0b98b28a9 usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/mediaserver.html 15bfa35fe64e5d9e6240ec471e8d6bb6 usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/switch.js 57aa59c98ffe503f31a986907fe52dc9 usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/light.html a7b66f6c274401de96a368d888ea9596 usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/unknown.js 25872392addd246c71665caca9b3acde usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/shutter.js 23f2b3e5cc2b63908280739d4705430d usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/securitysystem.js 15bfa35fe64e5d9e6240ec471e8d6bb6 usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/light.js -da1bccff5778c0431ece0abd2da1806a usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/mediaserver.js +ed7cc6c15ae860c7c27844e7c414015a usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/mediaserver.js 57aa59c98ffe503f31a986907fe52dc9 usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/switch.html -f74e7d139332a58ef8ddf1fce4acc9c6 usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/camerainput.js +8662ca3480b3caa089ebcb6bfed5bced usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/camerainput.js 84c6aba927ad341061091d9124f25858 usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/program.js 3007f8c059bbeaf4f1d5ef674184211f usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/link.html b0d066b93a16e398a1bcc1becadc80f6 usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/colorlight.html 44d8254d7903af7ae26602c79b13e36f usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/colorlight.js -1fe7615c17f2acba01cc5759802118e8 usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/timetable.html +98d973e261d49b9a1682af5a79204cba usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/timetable.html 15bfa35fe64e5d9e6240ec471e8d6bb6 usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/siren.js 91214805e9bc018067a6fc9ca43ef297 usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/grouplabel.js 57aa59c98ffe503f31a986907fe52dc9 usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/siren.html @@ -1026,7 +1025,7 @@ dc00ffd52a33bdf27dc2d459dc2d7943 usr/local/bin/homegenie/html/pages/control/wid 36d2dd4e56d3a1533e488f14017be978 usr/local/bin/homegenie/html/pages/control/widgets/DaniMail/fibaro/rgbw.html 44f2f3906a305e5946169b9d6925b12c usr/local/bin/homegenie/html/pages/control/_control.js d427dfc02f1f6277e41bd22f0462b618 usr/local/bin/homegenie/html/pages/events/main.html -858a396ed56b3a845aa608c6e34bafc6 usr/local/bin/homegenie/html/pages/events/_events.js +6d8e998d48b8ee1fe7021a3c8e771608 usr/local/bin/homegenie/html/pages/events/_events.js a76e3bca4fbe34d3dbc2a130c5e3f17f usr/local/bin/homegenie/html/pages/apps/netplay/_slideshow.js 110a74cdaba4da7a8dbd471e4e90cc8b usr/local/bin/homegenie/html/pages/apps/netplay/slideshow.html 59c62b496ded33ba38f2b2354f792ac3 usr/local/bin/homegenie/html/pages/header.html @@ -1038,11 +1037,11 @@ be3642f282ec1acabb42533d14602e88 usr/local/bin/homegenie/html/pages/configure/i 27ebe3de1f7ee93628fd96895e0466ae usr/local/bin/homegenie/html/pages/configure/interfaces/configlet/insteon.html 2fee98ad08aa23c08a9db168e94f1ba6 usr/local/bin/homegenie/html/pages/configure/interfaces/configlet/lircremote.html 8836c97cad677590515a63ffa9b63f68 usr/local/bin/homegenie/html/pages/configure/interfaces/configlet/x10.html -b1efdb22d49964d3cad972a793b41950 usr/local/bin/homegenie/html/pages/configure/interfaces/configlet/upnp.html +7e86b4d6367578767de5f3bc6ce33eec usr/local/bin/homegenie/html/pages/configure/interfaces/configlet/upnp.html 7b52e2da234e79f5c300127150e46342 usr/local/bin/homegenie/html/pages/configure/maintenance/main.html 3db066615ac212b43a63ae7cd737baf4 usr/local/bin/homegenie/html/pages/configure/maintenance/_maintenance.js 17dbc2f4236458b774197c65f8da7f8e usr/local/bin/homegenie/html/pages/configure/groups/_groupslist.js -6c5ae6f792e7e8eea9ab304f91f414bd usr/local/bin/homegenie/html/pages/configure/groups/_groupmodules.js +cd9a21cbada7574eae09abe47c01249f usr/local/bin/homegenie/html/pages/configure/groups/_groupmodules.js 2c5284a1f0794f7fbcf6302e3c2aceea usr/local/bin/homegenie/html/pages/configure/groups/listgroups.html 2bc5d1b70be034ad1a78f27aea549834 usr/local/bin/homegenie/html/pages/configure/groups/listmodules.html cd32538725a3b49f5895517c6e7b9460 usr/local/bin/homegenie/html/pages/configure/programengine/_groupslist.js @@ -1059,8 +1058,8 @@ ee29ee461d8f4fb0883b3176a907489e usr/local/bin/homegenie/html/pages/configure/p e40e9f3d7c6470e2b2667b794ca3505e usr/local/bin/homegenie/html/pages/configure/widgeteditor/_widgetslist.js 8f47cd4f42bcf753a0794bb29af4f1d1 usr/local/bin/homegenie/html/pages/configure/widgeteditor/editwidget.html 59bb1c2b21a1dd0be40f70a0534b8a0e usr/local/bin/homegenie/html/pages/configure/widgeteditor/listwidgets.html -144c990bde309cbd08001f891b4bc337 usr/local/bin/homegenie/html/pages/analyze/main.html -69fbf68f4e8ac57ec844669224b779f8 usr/local/bin/homegenie/html/pages/analyze/_statistics.js +3d85e954a150c8a1c3e001af005494b5 usr/local/bin/homegenie/html/pages/analyze/main.html +93fc0427f8e00bca552ac0d1278b3f71 usr/local/bin/homegenie/html/pages/analyze/_statistics.js 50048e2a8f01a633a34ef20f30798326 usr/local/bin/homegenie/html/locales/sv.lingo.json f0ab1246c4369e046013d92764a961b1 usr/local/bin/homegenie/html/locales/pl.lingo.json eef54d1c7ce38c6812ea95e194e2484a usr/local/bin/homegenie/html/locales/en.lingo.json @@ -1068,7 +1067,7 @@ eef54d1c7ce38c6812ea95e194e2484a usr/local/bin/homegenie/html/locales/en.lingo. 8062021f145f40b65e8056d025f7cd9e usr/local/bin/homegenie/html/locales/ru.json 7e82e57fc5165933fee561cd2db247ca usr/local/bin/homegenie/html/locales/en.programs.json c05766eb6d2a9f2f4ad58dd871daf237 usr/local/bin/homegenie/html/locales/nl.lingo.json -923608310376ca67c8a4ea072fd86933 usr/local/bin/homegenie/html/locales/es.lingo.json +f200b98dbe6ed17b4385010fb0aeebe6 usr/local/bin/homegenie/html/locales/es.lingo.json 39c34463667b3dced97128430e7cd3db usr/local/bin/homegenie/html/locales/it.programs.json fe40dc1336800fc7295b9774e1a59d19 usr/local/bin/homegenie/html/locales/it.json d8eb78227b235298401ee02c7eb718f4 usr/local/bin/homegenie/html/locales/fr.programs.json @@ -1079,9 +1078,10 @@ bf7f34b579af119cc98a5eafe954e4bd usr/local/bin/homegenie/html/locales/fr.json a3baca3e83081966c9ab5c7bca2b4869 usr/local/bin/homegenie/html/locales/de.programs.json 200dc71ceec659b49b5dd8432c398cc1 usr/local/bin/homegenie/html/locales/it.lingo.json 85cc6dded2ab2be199aa13ad4a05c581 usr/local/bin/homegenie/html/locales/fr.lingo.json -a15521763af0ef1248a1761b84918658 usr/local/bin/homegenie/html/locales/es.json +3f0b10d7c070f55cb2d62eb418f5273c usr/local/bin/homegenie/html/locales/es.json 86394f5d24edb315adbe84e126a52f37 usr/local/bin/homegenie/html/locales/en.json f9c9526bd2ac283924b383ee8bddfd08 usr/local/bin/homegenie/html/locales/de.json +8cfc3bd70b9fee7a42e8745351c5f684 usr/local/bin/homegenie/html/locales/es.programs.json b059dd0f6967f4e8ba50c9ca728c91b5 usr/local/bin/homegenie/html/css/jquery-ui.min.css a532e218300ea049b21bc1f33cb8cf51 usr/local/bin/homegenie/html/css/jqm-datebox.min.css 42f0b6a6bf3a8318c8c78ad1df18fa24 usr/local/bin/homegenie/html/css/homegenie.css @@ -1452,7 +1452,7 @@ b7ef2bf82f289e532e44a55508979e29 usr/local/bin/homegenie/html/js/api/homegenie. 6daffd0c5b2f3ffe460c7802a241b5ba usr/local/bin/homegenie/html/js/api/homegenie.inc.js 335de8e57ee8ebb51d4a92ea0f633de4 usr/local/bin/homegenie/html/js/api/homegenie.statistics.js 37b97e088cd5685cbf625d6b99e67f32 usr/local/bin/homegenie/html/js/api/homegenie.voicecontrol.js -296fa72b8c677254333b25ed9a38eb69 usr/local/bin/homegenie/html/js/api/homegenie.webapp.js +b6f32cb37a31de8a62eea883067d5f46 usr/local/bin/homegenie/html/js/api/homegenie.webapp.js 17033ca5c512089a6143283c742f6a8e usr/local/bin/homegenie/html/js/api/homegenie.ui.js 447c4a5c72025cfe833e72604adc8bd1 usr/local/bin/homegenie/html/js/api/homegenie.configure.js 91805a1834f1fc9f4925f57a93403d42 usr/local/bin/homegenie/html/js/api/homegenie.control.js @@ -1678,7 +1678,7 @@ e68b5ba5011a20f19c2cf0910bb092fb usr/local/bin/homegenie/html/js/jquery.mobile- 1544ca9f803edff31be0577b9f985853 usr/local/bin/homegenie/html/js/jquery.mobile-1.4.5/jquery.mobile.structure-1.4.5.min.css 23968af605a5881dbb08d87ae1276b52 usr/local/bin/homegenie/html/js/jquery.mobile-1.4.5/jquery.mobile-1.4.5.min.map 0d6a0a1de599d6ae30eaa18451353542 usr/local/bin/homegenie/html/js/jquery.mobile-1.4.5/jquery.mobile.external-png-1.4.5.min.css -7a5aa112f2856cd3bfff946c50e5aab4 usr/local/bin/homegenie/html/index.html +ae7c7f3e3adc27f11ac1ba9a6059a9e9 usr/local/bin/homegenie/html/index.html 50d2d2eb4d8bca9b1fe4aad698474ebf usr/local/bin/homegenie/html/images/halt.png 11e6aed03a9856f09de50c12d6f5379c usr/local/bin/homegenie/html/images/configure.png 55722106e7bdfae3f42816cbc751a6cd usr/local/bin/homegenie/html/images/interfaces/airplay.png @@ -1783,15 +1783,15 @@ b8459e32556b6e692fae8f9ff81817c9 usr/local/bin/homegenie/html/ui/core/popup.cro 40acf64097f759ba725a1afb6f7075b8 usr/local/bin/homegenie/html/ui/core/popup.cronwizard.js 8c62c286d03fd664a54dafcffaeb5fe3 usr/local/bin/homegenie/Raspberry.IO.SerialPeripheralInterface.dll c01449322109e7477c208be018fd45fb usr/local/bin/homegenie/ADDONS.md -88de12a88105d717cf4765238f1eebc8 usr/local/bin/homegenie/startup.sh -ad00c1d70556df43af155ac59ac92a34 usr/local/bin/homegenie/HomeGenie.exe -6f9d85cef9ee6f421441005aab3219a0 usr/local/bin/homegenie/release_info.xml +f616ece797146a9d6395f51d2e24e2f7 usr/local/bin/homegenie/startup.sh +4ef9264902ca39c02d3b84989a0b1bb3 usr/local/bin/homegenie/HomeGenie.exe +81d278b042861d17d3c81c17b01db5dc usr/local/bin/homegenie/release_info.xml 536920e88b28850b8df27484746134f4 usr/local/bin/homegenie/NetClientLib.dll 5405413fff79b8d9c747aa900f60f082 usr/local/bin/homegenie/sqlite3.dll 272aa48b0bfd90305c6c27b4f4538566 usr/local/bin/homegenie/scheduler.xml 3f033fbe348679b9baf41cec2ebc0c1a usr/local/bin/homegenie/groups.xml 61b0c6d8eb2c756355d52df2ef6170c6 usr/local/bin/homegenie/Microsoft.Scripting.dll -8493f4308941e2a6a190b314f5a2e7d2 usr/local/bin/homegenie/homegenie_factory_config.zip +b8704a9c1abd4a676d9c8cf39e994628 usr/local/bin/homegenie/homegenie_factory_config.zip acbb8de3a6a8f53d69957e2607097992 usr/local/bin/homegenie/DEVELOPERS.TXT ae7bbf0f4b96d2a0effd97d69befb47e usr/local/bin/homegenie/CommonMark.dll 93675a8ef36065d0c64fe1bf4fb79902 usr/local/bin/homegenie/IronRuby.Libraries.Yaml.dll