diff --git a/BaseFiles/Common/html/pages/control/widgets/homegenie/generic/energymonitor.js b/BaseFiles/Common/html/pages/control/widgets/homegenie/generic/energymonitor.js
index cf844ac76..2085c91ff 100644
--- a/BaseFiles/Common/html/pages/control/widgets/homegenie/generic/energymonitor.js
+++ b/BaseFiles/Common/html/pages/control/widgets/homegenie/generic/energymonitor.js
@@ -1,7 +1,7 @@
[{
Name: "Unknown Module",
Author: "Generoso Martello",
- Version: "2015-01-25",
+ Version: "2016-01-10",
GroupName: '',
IconImage: 'pages/control/widgets/homegenie/generic/images/power.png',
@@ -10,10 +10,13 @@
Initialized: false,
Widget: null,
LastDrawStats: new Date(0),
+ _fieldName: 'WattLoad',
+ _fieldDesc: 'Watt Load',
RenderView: function (cuid, module) {
var container = $(cuid);
var widget = this.Widget = container.find('[data-ui-field=widget]');
+ var _this = this;
if (!this.Initialized)
{
this.Widget.find('[data-ui-field=energystats]').qtip({
@@ -33,7 +36,7 @@
fixed: true
}
});
- this.Widget.find('[data-ui-field=energystats]').bind("plothover", function (event, pos, item) {
+ this.Widget.find('[data-ui-field=energystats]').on('plothover', function (event, pos, item) {
// Grab the API reference
var graph = $(this),
api = graph.qtip(),
@@ -55,6 +58,18 @@
api.show(item);
}
});
+ this.Widget.find('[data-ui-field=btn_watt_load]').on('click', function(){
+ _this._fieldName = 'WattLoad';
+ _this._fieldDesc = 'Watt Load';
+ _this.LastDrawStats = new Date();
+ _this.DrawStats('');
+ });
+ this.Widget.find('[data-ui-field=kwcounter]').on('click', function(){
+ _this._fieldName = 'KwCounter';
+ _this._fieldDesc = 'kW Counter';
+ _this.LastDrawStats = new Date();
+ _this.DrawStats('');
+ });
}
// render widget
this.DrawData();
@@ -84,7 +99,7 @@
var showbars = true;
$.ajax({
- url: '/' + HG.WebApp.Data.ServiceKey + '/HomeAutomation.HomeGenie/Config/Modules.StatisticsGet/HomeAutomation.EnergyMonitor/1/EnergyMonitor.KwCounter',
+ url: '/' + HG.WebApp.Data.ServiceKey + '/HomeAutomation.HomeGenie/Config/Modules.StatisticsGet/HomeAutomation.EnergyMonitor/1/EnergyMonitor.'+this._fieldName,
type: 'GET',
dataType: 'json',
success: function (counterData) {
@@ -103,7 +118,7 @@
try {
var dateFormat = dataStore.get('UI.DateFormat');
$.plot(_this.Widget.find('[data-ui-field=energystats]'), [
- { label: 'kW counter ', data: dataSerie, lines: { show: true, lineWidth: 2.0 }, bars: { show: false }, splines: { show: false }, points: { show: true } }
+ { label: _this._fieldDesc+' ', data: dataSerie, lines: { show: true, lineWidth: 2.0 }, bars: { show: false }, splines: { show: false }, points: { show: true } }
],
{
yaxis: {
diff --git a/HISTORY.TXT b/HISTORY.TXT
index 3e4578049..264a3a038 100644
--- a/HISTORY.TXT
+++ b/HISTORY.TXT
@@ -1,6 +1,8 @@
RELEASE HISTORY
-10/01/2015 v1.1-beta.512
+10/01/2016 v1.1-beta.512
+ - Energy Monitor widget now shows Watt load graph as default
+ - Updated Russian and French locales
- Improved crontab input field with autocomplete
- Updated compression library (latest HEAD SharpZipLib from master repo)
diff --git a/HomeGenie/release_info.xml b/HomeGenie/release_info.xml
index 9735836dc..d3a3e6b37 100644
--- a/HomeGenie/release_info.xml
+++ b/HomeGenie/release_info.xml
@@ -3,7 +3,9 @@
HomeGenie
1.1 beta r512
Latest public release.
-
- Fixed compression/decompression issues
- - Improved crontab input field with autocomplete
-
2016-01-09T21:08:12.0000Z
+
- Energy Monitor widget now shows Watt load graph as default
+ - Updated Russian and French locales
+ - Improved crontab input field with autocomplete
+ - Updated compression library (latest HEAD SharpZipLib from master repo)
+
2016-01-10T12:28:21.0000Z
diff --git a/HomeGenie_Linux/Packager/DEBIAN/md5sums b/HomeGenie_Linux/Packager/DEBIAN/md5sums
index d2acc030c..35d153dd3 100644
--- a/HomeGenie_Linux/Packager/DEBIAN/md5sums
+++ b/HomeGenie_Linux/Packager/DEBIAN/md5sums
@@ -1,4 +1,4 @@
-c8164876b6f66616d68387443621510c usr/local/bin/homegenie/ICSharpCode.SharpZipLib.dll
+a154823dd34a4d72116756e39c587edf usr/local/bin/homegenie/ICSharpCode.SharpZipLib.dll
e33483b8ed739cd267f9a27ea266c87e usr/local/bin/homegenie/Raspberry.IO.dll
de34fbe308eccd5e099f49ea0f2501aa usr/local/bin/homegenie/Raspberry.System.dll
513c0ab6c041976fe0bfc13a0c3f1690 usr/local/bin/homegenie/websocket-sharp.dll
@@ -81,7 +81,7 @@ fc3ac6b775aac0663c3dba45fad555d8 usr/local/bin/homegenie/programs/72.dll
479b6c673337a9c1f69cdf15d51e4b8e usr/local/bin/homegenie/programs/73.dll
3d8ccfb7460b2955a448daa8e12c9868 usr/local/bin/homegenie/programs/154.dll
204b1676187410243fecf74e6db72e44 usr/local/bin/homegenie/programs/62.dll
-4255bdde758cab23fd18084cf6225918 usr/local/bin/homegenie/programs/121.dll
+0fcc6d87fb2f2ee8da4a7eb9a1bf7440 usr/local/bin/homegenie/programs/121.dll
d6fbbfa1d3c8be0fdd5b6feb62730742 usr/local/bin/homegenie/programs/505.dll
a8f9e66c1788ac8938f42165edafb08d usr/local/bin/homegenie/programs/133.dll
5b3c03964a86d3d5a0587bbf6a9a0c6f usr/local/bin/homegenie/programs/75.dll
@@ -102,7 +102,7 @@ f8daf8edf5875fe5c27fe958eb73a0c9 usr/local/bin/homegenie/programs/60.dll
43cb7ef0cf6b399415c298eef6ee9dce usr/local/bin/homegenie/programs/39.dll
f85bd266c0d92a420ea12d5835156db8 usr/local/bin/homegenie/programs/7.dll
3bc33fbad015b2ffcbeb04bd03d7a509 usr/local/bin/homegenie/programs/112.dll
-5e2bb26c07036a58334911cf5df3c4bc usr/local/bin/homegenie/programs/36.dll
+f7311f3ccc47f6a5b886fcae58dcd54c usr/local/bin/homegenie/programs/36.dll
8d30c644e6b8659ea656b23f66ce74c4 usr/local/bin/homegenie/programs/74.dll
431a0efc761d95a5fbf73c7d83df5288 usr/local/bin/homegenie/programs/100.dll
ce5fac122de281565d7b024812e4be7c usr/local/bin/homegenie/programs/64.dll
@@ -111,7 +111,7 @@ ce5fac122de281565d7b024812e4be7c usr/local/bin/homegenie/programs/64.dll
c011432509069c3e95d3caec4cafb825 usr/local/bin/homegenie/programs/41.dll
8efb9babdfbfb500e59f0cc1c10d372c usr/local/bin/homegenie/programs/16.dll
6e911e0a393f7d7d6f2de035fa4f883b usr/local/bin/homegenie/Microsoft.Scripting.Metadata.dll
-b734567cebefdc6a138f3bdec1431cf0 usr/local/bin/homegenie/HomeGenie.exe.mdb
+4a3bc5fce126e1837ddb4cb8f6e25b57 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
@@ -127,9 +127,9 @@ cb2955458b620dbf5ed454b5ad1bba50 usr/local/bin/homegenie/Raspberry.IO.Component
d127cd699e15cf5feb4df3cdd34b77df usr/local/bin/homegenie/Raspberry.IO.InterIntegratedCircuit.dll
2074c256e8b7a372e28490a436a8e04d usr/local/bin/homegenie/NLog.dll
1dcf890d5a0ac7fdcd3db320b629a3ca usr/local/bin/homegenie/Raspberry.IO.Components.dll.config
-22fd9c6b2e9223d8d1b2db17426fab20 usr/local/bin/homegenie/HISTORY.TXT
+d1a04106b1f0ba6ff4d2b7f8216030c0 usr/local/bin/homegenie/HISTORY.TXT
3435a8ca2eb89ec7fc13a463590121c0 usr/local/bin/homegenie/README.TXT
-bf3b59d073228c638fd94014afac54dc usr/local/bin/homegenie/programs.xml
+2aacd54c8a3a1aaca7b600435d87200e usr/local/bin/homegenie/programs.xml
58d4389f29365489f41cd547eb1f10ec usr/local/bin/homegenie/modules.xml
a19a8070a77444aafa96d3fbe033c42e usr/local/bin/homegenie/IronRuby.Libraries.dll
456c7d0d3afb06de913ee487f333aadc usr/local/bin/homegenie/Raspberry.IO.Interop.dll
@@ -921,21 +921,22 @@ a60aaef3d6478322e40d935c212219fc usr/local/bin/homegenie/html/pages/control/wid
32658514b753d6605863370ba43374a9 usr/local/bin/homegenie/html/pages/control/widgets/jkUtils/SolarAltitude/images/status/Evening.Civil.End.png
32658514b753d6605863370ba43374a9 usr/local/bin/homegenie/html/pages/control/widgets/jkUtils/SolarAltitude/images/status/Morning.Civil.Start.png
4abaa9f1fc55bd14759a060225e5be44 usr/local/bin/homegenie/html/pages/control/widgets/jkUtils/SolarAltitude/SolarAltitude.html
+b8a592480c7dec897069c785bed72d11 usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/locales/ru.json
647dc81f1c4dce90b21d876fe871a2d0 usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/locales/it.json
-bfa399b29d8d807e23daf682dd219620 usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/locales/fr.json
+ece00aa8ace48cfc55fa84617f5b8a24 usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/locales/fr.json
ab07ee657261ca4353a1a0a352bf4390 usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/locales/en.json
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
1d9ec7635c86602be7e90d364ff91f92 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
6cf0b886b47ef59a3ebc158bb549d00e usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/shutter.html
-2d9652538d90e740b583f1e0f395d260 usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/energymonitor.js
+1523aad609b7b79f9382082e503d7a6e usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/energymonitor.js
0498f64a1329e92dd42721c05fd07334 usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/generic.html
a6722a99e5cd17437a7c180117c5c276 usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/link.js
50b516ae6c8a48d0bbcc78491ebae755 usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/mediareceiver.js
4ad4ab8fce174ddc836bc727969e2d8b usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/doorwindow.js
302d383aac521bee4fa08efebbe4305b usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/sensor.html
-a191e15c7dc04ac92b9cbb8c9c3ae348 usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/energymonitor.html
+d2f3540cd3b24fc4044c6c0715d59b31 usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/energymonitor.html
f2fb0cbfac00c27347e601401267cc8b usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/sensor.js
6ddcf90cc8c332da1113a1116fd111e7 usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/unknown.html
18c3187b8519e028227c0ad439f0d342 usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/generic.js
@@ -1067,7 +1068,7 @@ a095d8cf3014664373f9a53d91c2795a usr/local/bin/homegenie/html/pages/control/wid
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
-f485d3e027e3b4679861d3b7a02e985e usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/timetable.js
+ddab182cf5ad5b4f6c799ed81242f656 usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/timetable.js
a5e51ab675defdb4444683ab64714d63 usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/status.html
7c5362053e37b4aa04d1a4e8ba24624c usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/dimmer.html
24e2c0257c4172ac3b96140b99217ff3 usr/local/bin/homegenie/html/pages/control/widgets/homegenie/generic/securitysystem.html
@@ -1099,9 +1100,9 @@ d0b2a915100661ba5c3e2dd680fdc4fd usr/local/bin/homegenie/html/pages/configure/i
b4d797105002444558521a8445612a9d usr/local/bin/homegenie/html/pages/configure/interfaces/configlet/x10.html
d2ec0dc9bfb03fb7b9fe74ffa6045474 usr/local/bin/homegenie/html/pages/configure/interfaces/configlet/upnp.html
0cbc22d8c8371fe7763c4bfc9445a948 usr/local/bin/homegenie/html/pages/configure/maintenance/main.html
-5610dcca4a9f8ec96677fcc07a6e1f60 usr/local/bin/homegenie/html/pages/configure/maintenance/_maintenance.js
+65657908d50817413f9999a200f377ab usr/local/bin/homegenie/html/pages/configure/maintenance/_maintenance.js
d61a208f5ca3a39213dacd4e67f9b0ed usr/local/bin/homegenie/html/pages/configure/groups/_groupslist.js
-407a60e42428dcc30122850e46a82688 usr/local/bin/homegenie/html/pages/configure/groups/_groupmodules.js
+bada8b979be20bc7079d44af56c33b78 usr/local/bin/homegenie/html/pages/configure/groups/_groupmodules.js
61823179bb78b2328073070c2313e4c6 usr/local/bin/homegenie/html/pages/configure/groups/listgroups.html
22e243abdb9bec9b142803f856d22d97 usr/local/bin/homegenie/html/pages/configure/groups/listmodules.html
312d1463d0b6e5ec6e52ba397dcc3f1b usr/local/bin/homegenie/html/pages/configure/programengine/_groupslist.js
@@ -1123,24 +1124,25 @@ e40e9f3d7c6470e2b2667b794ca3505e usr/local/bin/homegenie/html/pages/configure/w
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
-4976b3c59f98179c4b32fdc7cefc2e24 usr/local/bin/homegenie/html/locales/nl.json
-4d0571f446c975739d0e1edf0345dec1 usr/local/bin/homegenie/html/locales/ru.json
+0935cdace3f69d6cfff0c6c1d5a9d3e5 usr/local/bin/homegenie/html/locales/nl.json
+c00cf89384dc3e1097be3d775f621ea1 usr/local/bin/homegenie/html/locales/ru.json
c1e5548823bcce89f98f81b8f5eff7ef usr/local/bin/homegenie/html/locales/en.programs.json
c05766eb6d2a9f2f4ad58dd871daf237 usr/local/bin/homegenie/html/locales/nl.lingo.json
f200b98dbe6ed17b4385010fb0aeebe6 usr/local/bin/homegenie/html/locales/es.lingo.json
a3661ccef2ce053188574e57816c959f usr/local/bin/homegenie/html/locales/it.programs.json
-85b769ebe3c64c739e0b502594792463 usr/local/bin/homegenie/html/locales/it.json
-c21a4cc21c30c5ddd83df122713962f7 usr/local/bin/homegenie/html/locales/fr.programs.json
-499c24f1a58784b7f8ff57d9a15197d4 usr/local/bin/homegenie/html/locales/fr.json
+d511c125f6998ff2162ad0c579dfc133 usr/local/bin/homegenie/html/locales/it.json
+39202efeb92f6dac83a6b7a4ec482f7d usr/local/bin/homegenie/html/locales/ru.programs.json
+42ae657831fc25ad32a3cd1d49084e92 usr/local/bin/homegenie/html/locales/fr.programs.json
+eaa708159d7a05996945aaaafa8b41d7 usr/local/bin/homegenie/html/locales/fr.json
82999c6df0484bdad6c1d58c3ae7dc52 usr/local/bin/homegenie/html/locales/de.lingo.json
24351c73b38c1df5950b5a75ea8fef46 usr/local/bin/homegenie/html/locales/ru.lingo.json
-d949b1a12fd48e639f2097899ea7918b usr/local/bin/homegenie/html/locales/sv.json
+bb6add29ff6eccd01285f412a3d2100d usr/local/bin/homegenie/html/locales/sv.json
edf7140a95f873d27e69958fb854a750 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
-abd45a3a0b7af89258492158471f1194 usr/local/bin/homegenie/html/locales/es.json
-556bb5ac03cebf1bdc3c6e63a9750870 usr/local/bin/homegenie/html/locales/en.json
-06a847d6c0fefc9d0b7dae5972df6c5f usr/local/bin/homegenie/html/locales/de.json
+c5650baca7c4deda5f1fc288edccceef usr/local/bin/homegenie/html/locales/es.json
+d2734b8a19b9f5b6bb735871e557b66b usr/local/bin/homegenie/html/locales/en.json
+bee75800951f281b794b16f41079a3c8 usr/local/bin/homegenie/html/locales/de.json
aa124fa757aa5d7913cf38b027cc7463 usr/local/bin/homegenie/html/locales/es.programs.json
a4e8c938edacd5e8c55c5441054dcf9a usr/local/bin/homegenie/html/icons.html
c9295ad174c044e178ca1ebacda3d9f6 usr/local/bin/homegenie/html/css/jqm-font-awesome-usvg-upng.css
@@ -2917,7 +2919,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
-597dea16c7f8899862b752a0c951bf02 usr/local/bin/homegenie/html/index.html
+0eecb32a6ecaf7b8f26f6efca3791860 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
@@ -2999,14 +3001,14 @@ b488b97ca1f19753a9f38d1e0144b115 usr/local/bin/homegenie/html/images/event_on.p
f5600a261cadea6c00db1673dac3c36b usr/local/bin/homegenie/html/images/event_off.png
cb46f4b49cf13afbda74f67a5e0c26bb usr/local/bin/homegenie/html/images/protection-on.png
ecaa88f7fa0bf610a5a26cf545dcd3aa usr/local/bin/homegenie/html/blank.html
-a8e8d08e5122275434af37bc411d3ae7 usr/local/bin/homegenie/html/ui/widgets/capture.js
+80a5664bdf9f8a7b2f42c1412bf157f4 usr/local/bin/homegenie/html/ui/widgets/capture.js
b3b7c42b194c185987a8a510548e130a usr/local/bin/homegenie/html/ui/widgets/checkbox.html
41b05804e9884e25f5d58262f0080794 usr/local/bin/homegenie/html/ui/widgets/module.text.js
990a4636c27f2935d4abd0fa06e5e8f4 usr/local/bin/homegenie/html/ui/widgets/checkbox.js
996d8cff6c4716156de2f3addf943972 usr/local/bin/homegenie/html/ui/widgets/text.js
-7d92ebd278b0a37162200d63bcf0c08d usr/local/bin/homegenie/html/ui/widgets/cron.text.html
+d52e38e489e38ca3a4203f757cdc3faf usr/local/bin/homegenie/html/ui/widgets/cron.text.html
1fe774c6c4e793b6ed5d3fdbf81c6348 usr/local/bin/homegenie/html/ui/widgets/store.script.list.js
-eb0d99b164938baf5cc96df39626a6bc usr/local/bin/homegenie/html/ui/widgets/cron.text.js
+dfe8730405370990a0c1e6b4025ba8ff usr/local/bin/homegenie/html/ui/widgets/cron.text.js
fae388069ed7e156c7a7ac1667c4923d usr/local/bin/homegenie/html/ui/widgets/module.text.html
05274e9a3231b4a7f81c4e58c7b73dff usr/local/bin/homegenie/html/ui/widgets/slider.html
5da541e66924a7120ae68c524830f2dd usr/local/bin/homegenie/html/ui/widgets/store.script.html
@@ -3017,21 +3019,21 @@ d55de8eaed546996f4dcc89aa2a7e6f7 usr/local/bin/homegenie/html/ui/widgets/passwo
97ea42f946ccb368dac2a7d5559fa0c5 usr/local/bin/homegenie/html/ui/widgets/timetable.html
56cdda468867d38224da2c61f01b5152 usr/local/bin/homegenie/html/ui/widgets/store.script.list.html
fae388069ed7e156c7a7ac1667c4923d usr/local/bin/homegenie/html/ui/widgets/text.html
-3e2673ae2129a04c904d658db360a262 usr/local/bin/homegenie/html/ui/widgets/capture.html
+ce07e14186da81596585fb8970aa7d80 usr/local/bin/homegenie/html/ui/widgets/capture.html
58a85b81f4bd82bc87fb8ebb22f9ceb1 usr/local/bin/homegenie/html/ui/widgets/timetable.js
b8459e32556b6e692fae8f9ff81817c9 usr/local/bin/homegenie/html/ui/core/popup.cronwizard.html
40acf64097f759ba725a1afb6f7075b8 usr/local/bin/homegenie/html/ui/core/popup.cronwizard.js
9e90aad43d8acc5b45729f2296cb5907 usr/local/bin/homegenie/Raspberry.IO.SerialPeripheralInterface.dll
c01449322109e7477c208be018fd45fb usr/local/bin/homegenie/ADDONS.md
f382a968d978f314e126e0526f569460 usr/local/bin/homegenie/startup.sh
-d7c25866f308b007d0c1c8f69ba3f856 usr/local/bin/homegenie/HomeGenie.exe
-a5c58d485e8ea47199363509c22c9295 usr/local/bin/homegenie/release_info.xml
+0e66c1ba05d3f74971fe1a239411fc94 usr/local/bin/homegenie/HomeGenie.exe
+0f6c6bb95b77e622e617418787e5a7df usr/local/bin/homegenie/release_info.xml
536920e88b28850b8df27484746134f4 usr/local/bin/homegenie/NetClientLib.dll
5405413fff79b8d9c747aa900f60f082 usr/local/bin/homegenie/sqlite3.dll
8b44d53cb2d7afc7ff215bd43df7fc40 usr/local/bin/homegenie/scheduler.xml
ca7296e5c1dc0a5f0c9762733f0fb9b7 usr/local/bin/homegenie/groups.xml
61b0c6d8eb2c756355d52df2ef6170c6 usr/local/bin/homegenie/Microsoft.Scripting.dll
-7e823fb5de98edd9807831edb3b44e32 usr/local/bin/homegenie/homegenie_factory_config.zip
+3b309cc6e7846ec6b6dcbcaedaddea99 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
diff --git a/HomeGenie_Windows/Packager/setup.iss b/HomeGenie_Windows/Packager/setup.iss
index 5ec49748a..e0bcbc204 100644
--- a/HomeGenie_Windows/Packager/setup.iss
+++ b/HomeGenie_Windows/Packager/setup.iss
@@ -4,10 +4,10 @@
[Setup]
AppName=HomeGenie
-AppVerName=HomeGenie 1.1 beta (r511)
+AppVerName=HomeGenie 1.1 beta (r512)
AppPublisher=GenieLabs
AppPublisherURL=http://www.homegenie.it
-AppVersion=1.1 beta (r511)
+AppVersion=1.1 beta (r512)
DefaultDirName={pf}\HomeGenie
DefaultGroupName=HomeGenie
Compression=lzma
@@ -198,8 +198,8 @@ Type: files; Name: "{app}\SQLite.Interop.dll";
;Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}";
[Icons]
-Name: "{group}\HomeGenie 1.1 beta (r511)"; Filename: "{app}\HomeGenieManager.exe"
-Name: "{group}\Uninstall HomeGenie 1.1 beta (r511)"; Filename: "{uninstallexe}"
+Name: "{group}\HomeGenie 1.1 beta (r512)"; Filename: "{app}\HomeGenieManager.exe"
+Name: "{group}\Uninstall HomeGenie 1.1 beta (r512)"; Filename: "{uninstallexe}"
Name: "{commondesktop}\HomeGenie"; Filename: "{app}\HomeGenieManager.exe"
[Run]