Skip to content

Commit 413a13e

Browse files
genemarsgenemars
committed
v1.1-beta.511
1 parent 29970ba commit 413a13e

9 files changed

Lines changed: 95 additions & 35 deletions

File tree

‎BaseFiles/Common/Common.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9038,6 +9038,9 @@
90389038
<None Include="html\ext\zwave\pepper1db\5254_0100_8371.json">
90399039
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
90409040
</None>
9041+
<None Include="programs\29.dll">
9042+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
9043+
</None>
90419044
</ItemGroup>
90429045
<ItemGroup>
90439046
<Compile Include="dummy.cs" />

‎BaseFiles/Common/homegenie_factory_config.zip‎

275 Bytes
Binary file not shown.

‎BaseFiles/Common/programs.xml‎

Lines changed: 68 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ Program.GoBackground();</ScriptSource>
135135
</ProgramFeature>
136136
</Features>
137137
<ActivationTime xsi:nil="true" />
138-
<TriggerTime>2016-01-05T21:46:50.202498Z</TriggerTime>
138+
<TriggerTime>2016-01-06T00:42:10.069027Z</TriggerTime>
139139
<Type>CSharp</Type>
140140
<IsEnabled>true</IsEnabled>
141141
</ProgramBlock>
@@ -268,7 +268,7 @@ For instructions see: http://developers.meethue.com/gettingstarted.html .</Descr
268268
<Group>Devices and Things</Group>
269269
<Features />
270270
<ActivationTime xsi:nil="true" />
271-
<TriggerTime>2016-01-05T21:46:50.085557Z</TriggerTime>
271+
<TriggerTime>2016-01-06T00:42:09.999407Z</TriggerTime>
272272
<Type>CSharp</Type>
273273
<IsEnabled>true</IsEnabled>
274274
</ProgramBlock>
@@ -450,7 +450,7 @@ To activate this widget specify a valid user &lt;strong&gt;Key&lt;/strong&gt; th
450450
<Group>Weather and Enviroment</Group>
451451
<Features />
452452
<ActivationTime xsi:nil="true" />
453-
<TriggerTime>2016-01-05T21:46:50.407097Z</TriggerTime>
453+
<TriggerTime>2016-01-06T00:42:09.742282Z</TriggerTime>
454454
<Type>CSharp</Type>
455455
<IsEnabled>true</IsEnabled>
456456
</ProgramBlock>
@@ -522,7 +522,7 @@ while (Program.IsEnabled)
522522
</ProgramFeature>
523523
</Features>
524524
<ActivationTime xsi:nil="true" />
525-
<TriggerTime>2016-01-05T21:46:50.209188Z</TriggerTime>
525+
<TriggerTime>2016-01-06T00:42:09.999236Z</TriggerTime>
526526
<Type>CSharp</Type>
527527
<IsEnabled>true</IsEnabled>
528528
</ProgramBlock>
@@ -1138,7 +1138,7 @@ Program.GoBackground();</ScriptSource>
11381138
</ProgramFeature>
11391139
</Features>
11401140
<ActivationTime xsi:nil="true" />
1141-
<TriggerTime>2016-01-05T21:46:50.341951Z</TriggerTime>
1141+
<TriggerTime>2016-01-06T00:42:09.813019Z</TriggerTime>
11421142
<Type>CSharp</Type>
11431143
<IsEnabled>true</IsEnabled>
11441144
</ProgramBlock>
@@ -1185,7 +1185,7 @@ Program.GoBackground();</ScriptSource>
11851185
</ProgramFeature>
11861186
</Features>
11871187
<ActivationTime xsi:nil="true" />
1188-
<TriggerTime>2016-01-05T21:46:50.30898Z</TriggerTime>
1188+
<TriggerTime>2016-01-06T00:42:09.98565Z</TriggerTime>
11891189
<Type>CSharp</Type>
11901190
<IsEnabled>true</IsEnabled>
11911191
</ProgramBlock>
@@ -1534,7 +1534,7 @@ while (Program.IsEnabled)
15341534
</ProgramFeature>
15351535
</Features>
15361536
<ActivationTime xsi:nil="true" />
1537-
<TriggerTime>2016-01-05T21:46:50.04648Z</TriggerTime>
1537+
<TriggerTime>2016-01-06T00:42:09.894307Z</TriggerTime>
15381538
<Type>CSharp</Type>
15391539
<IsEnabled>true</IsEnabled>
15401540
</ProgramBlock>
@@ -1664,7 +1664,7 @@ Program.GoBackground();</ScriptSource>
16641664
</ProgramFeature>
16651665
</Features>
16661666
<ActivationTime xsi:nil="true" />
1667-
<TriggerTime>2016-01-05T21:46:50.312708Z</TriggerTime>
1667+
<TriggerTime>2016-01-06T00:42:09.719893Z</TriggerTime>
16681668
<Type>CSharp</Type>
16691669
<IsEnabled>true</IsEnabled>
16701670
</ProgramBlock>
@@ -1828,7 +1828,7 @@ Program.Run();
18281828
<Group>Messaging and Social</Group>
18291829
<Features />
18301830
<ActivationTime xsi:nil="true" />
1831-
<TriggerTime>2016-01-05T21:46:50.175842Z</TriggerTime>
1831+
<TriggerTime>2016-01-06T00:42:10.027703Z</TriggerTime>
18321832
<Type>CSharp</Type>
18331833
<IsEnabled>true</IsEnabled>
18341834
</ProgramBlock>
@@ -2263,7 +2263,7 @@ energy consumption.</Description>
22632263
<Group>Energy Management</Group>
22642264
<Features />
22652265
<ActivationTime xsi:nil="true" />
2266-
<TriggerTime>2016-01-05T21:46:50.21773Z</TriggerTime>
2266+
<TriggerTime>2016-01-06T00:42:10.031682Z</TriggerTime>
22672267
<Type>CSharp</Type>
22682268
<IsEnabled>true</IsEnabled>
22692269
</ProgramBlock>
@@ -2412,7 +2412,7 @@ It requires that a manufacturer specific get has been issued on the node.</Descr
24122412
<Group>Z-Wave</Group>
24132413
<Features />
24142414
<ActivationTime xsi:nil="true" />
2415-
<TriggerTime>2016-01-05T21:46:50.090024Z</TriggerTime>
2415+
<TriggerTime>2016-01-06T00:42:09.850648Z</TriggerTime>
24162416
<Type>CSharp</Type>
24172417
<IsEnabled>true</IsEnabled>
24182418
</ProgramBlock>
@@ -2662,7 +2662,7 @@ while (Program.IsEnabled)
26622662
</ProgramFeature>
26632663
</Features>
26642664
<ActivationTime xsi:nil="true" />
2665-
<TriggerTime>2016-01-05T21:46:50.298833Z</TriggerTime>
2665+
<TriggerTime>2016-01-06T00:42:09.788687Z</TriggerTime>
26662666
<Type>CSharp</Type>
26672667
<IsEnabled>true</IsEnabled>
26682668
</ProgramBlock>
@@ -6717,13 +6717,13 @@ var GetClosestEvent = new Func&lt;ModuleParameter, DateTime, DateTime&gt;((param
67176717
var closest = hist[hist.Count-1];
67186718
for(int p = hist.Count-1; p &gt;= 0; p--)
67196719
{
6720-
if (date &lt;= hist[p].Timestamp)
6720+
if (date &lt;= hist[p].Timestamp.ToLocalTime())
67216721
{
67226722
break;
67236723
}
67246724
closest = hist[p];
67256725
}
6726-
closestTimestamp = closest.Timestamp;
6726+
closestTimestamp = closest.Timestamp.ToLocalTime();
67276727
} catch { }
67286728
}
67296729
return closestTimestamp;
@@ -7098,9 +7098,59 @@ while (Program.IsEnabled)
70987098
<Name>Timetable</Name>
70997099
<Description>Widget for scheduling thermostats, lights and shutters.</Description>
71007100
<Group>Scheduling</Group>
7101-
<Features />
7102-
<ActivationTime>2016-01-05T21:47:16.831704Z</ActivationTime>
7103-
<TriggerTime xsi:nil="true" />
7101+
<Features>
7102+
<ProgramFeature>
7103+
<FieldType>timetable</FieldType>
7104+
<ForDomains />
7105+
<ForTypes>Light,Switch,Shutter,Dimmer,Thermostat</ForTypes>
7106+
<Property>TimeTable.Weekend</Property>
7107+
<Description>Timetable to use for weekend</Description>
7108+
</ProgramFeature>
7109+
<ProgramFeature>
7110+
<FieldType>timetable</FieldType>
7111+
<ForDomains />
7112+
<ForTypes>Light,Switch,Shutter,Dimmer,Thermostat</ForTypes>
7113+
<Property>TimeTable.Workday</Property>
7114+
<Description>Timetable to use for workday</Description>
7115+
</ProgramFeature>
7116+
<ProgramFeature>
7117+
<FieldType>timetable</FieldType>
7118+
<ForDomains />
7119+
<ForTypes>Light,Switch,Shutter,Dimmer,Thermostat</ForTypes>
7120+
<Property>TimeTable.Holiday</Property>
7121+
<Description>Timetable to use for holiday</Description>
7122+
</ProgramFeature>
7123+
<ProgramFeature>
7124+
<FieldType>timetable</FieldType>
7125+
<ForDomains />
7126+
<ForTypes>Light,Switch,Shutter,Dimmer,Thermostat</ForTypes>
7127+
<Property>TimeTable.Special</Property>
7128+
<Description>Timetable to use for special day</Description>
7129+
</ProgramFeature>
7130+
<ProgramFeature>
7131+
<FieldType>checkbox</FieldType>
7132+
<ForDomains />
7133+
<ForTypes>Light,Switch,Shutter,Dimmer,Thermostat</ForTypes>
7134+
<Property>TimeTable.Enable</Property>
7135+
<Description>Enable Timetable scheduling</Description>
7136+
</ProgramFeature>
7137+
<ProgramFeature>
7138+
<FieldType>checkbox</FieldType>
7139+
<ForDomains />
7140+
<ForTypes>Light,Switch,Shutter,Dimmer,Thermostat</ForTypes>
7141+
<Property>TimeTable.Repeat</Property>
7142+
<Description>Repeat command for the whole duration</Description>
7143+
</ProgramFeature>
7144+
<ProgramFeature>
7145+
<FieldType>checkbox</FieldType>
7146+
<ForDomains />
7147+
<ForTypes>Light,Switch,Shutter,Dimmer,Thermostat</ForTypes>
7148+
<Property>TimeTable.CheckDST</Property>
7149+
<Description>Enable Day Light Saving check</Description>
7150+
</ProgramFeature>
7151+
</Features>
7152+
<ActivationTime>2016-01-06T00:42:41.749703Z</ActivationTime>
7153+
<TriggerTime>2016-01-06T00:42:41.790891Z</TriggerTime>
71047154
<Type>CSharp</Type>
71057155
<IsEnabled>true</IsEnabled>
71067156
</ProgramBlock>
@@ -7813,7 +7863,7 @@ Also it lets you dim last addressed module using Up/Down button which can be def
78137863
</ProgramFeature>
78147864
</Features>
78157865
<ActivationTime xsi:nil="true" />
7816-
<TriggerTime>2016-01-05T21:46:50.390028Z</TriggerTime>
7866+
<TriggerTime>2016-01-06T00:42:10.071808Z</TriggerTime>
78177867
<Type>CSharp</Type>
78187868
<IsEnabled>true</IsEnabled>
78197869
</ProgramBlock>

‎BaseFiles/Common/programs/36.dll‎

0 Bytes
Binary file not shown.

‎HISTORY.TXT‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
RELEASE HISTORY
22

3-
05/01/2016 v1.1-beta.510
3+
06/01/2016 v1.1-beta.511
4+
- Fix archive compression "codepage not supported" bug introduced in r510
5+
- Fix heavy cpu load bug introduced in r510
6+
- Fix TimeTable time offset bug introduced in r510
47
- Faaaster archive compression/decompression using SharpZipLib
58
- Improved TimeTable to support CronTab expressions for program Disable/AutoOff options
69

‎HomeGenie/Automation/Scheduler/SchedulerService.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public void Start()
4949
{
5050
Stop();
5151
serviceChecker = new Timer(CheckScheduledEvents); //, null, 1000, 1000);
52-
serviceChecker.Change(60-DateTime.Now.Second, Timeout.Infinite);
52+
serviceChecker.Change((60-DateTime.Now.Second)*1000, Timeout.Infinite);
5353
}
5454

5555
public void Stop()
@@ -62,7 +62,7 @@ public void Stop()
6262

6363
private void CheckScheduledEvents(object state)
6464
{
65-
serviceChecker.Change(60-DateTime.Now.Second, Timeout.Infinite);
65+
serviceChecker.Change((60-DateTime.Now.Second)*1000, Timeout.Infinite);
6666
var date = DateTime.Now;
6767
for (int i = 0; i < events.Count; i++)
6868
{

‎HomeGenie/release_info.xml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<ReleaseInfo xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
33
<Name>HomeGenie</Name>
4-
<Version>1.1 beta r510</Version>
4+
<Version>1.1 beta r511</Version>
55
<Description>Latest public release.</Description>
6-
<ReleaseNote> - Faaaster archive compression/decompression using SharpZipLib
6+
<ReleaseNote> - Fix archive compression "codepage not supported" bug introduced in r510
7+
- Fix heavy cpu load bug introduced in r510
8+
- Fix TimeTable time offset bug introduced in r510
9+
- Faaaster archive compression/decompression using SharpZipLib
710
- Improved TimeTable to support CronTab expressions for program Disable/AutoOff options</ReleaseNote>
8-
<ReleaseDate>2016-01-05T19:04:31.0000Z</ReleaseDate>
11+
<ReleaseDate>2016-01-06T00:49:18.0000Z</ReleaseDate>
912
</ReleaseInfo>

‎HomeGenie_Linux/Packager/DEBIAN/md5sums‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,11 @@ f8daf8edf5875fe5c27fe958eb73a0c9 usr/local/bin/homegenie/programs/60.dll
9898
2493912eb96ce06300bd63ef3ba9f202 usr/local/bin/homegenie/programs/92.dll
9999
08777573d851c7deff95527e42a38395 usr/local/bin/homegenie/programs/37.dll
100100
8d689700037d663642eb7bcfe57d1c2d usr/local/bin/homegenie/programs/503.dll
101+
123f9a0ac91466923f225e2fa505f002 usr/local/bin/homegenie/programs/29.dll
101102
43cb7ef0cf6b399415c298eef6ee9dce usr/local/bin/homegenie/programs/39.dll
102103
f85bd266c0d92a420ea12d5835156db8 usr/local/bin/homegenie/programs/7.dll
103104
3bc33fbad015b2ffcbeb04bd03d7a509 usr/local/bin/homegenie/programs/112.dll
104-
927f131efd9fd7754a735c1844208e1d usr/local/bin/homegenie/programs/36.dll
105+
5e2bb26c07036a58334911cf5df3c4bc usr/local/bin/homegenie/programs/36.dll
105106
8d30c644e6b8659ea656b23f66ce74c4 usr/local/bin/homegenie/programs/74.dll
106107
431a0efc761d95a5fbf73c7d83df5288 usr/local/bin/homegenie/programs/100.dll
107108
ce5fac122de281565d7b024812e4be7c usr/local/bin/homegenie/programs/64.dll
@@ -110,7 +111,7 @@ ce5fac122de281565d7b024812e4be7c usr/local/bin/homegenie/programs/64.dll
110111
c011432509069c3e95d3caec4cafb825 usr/local/bin/homegenie/programs/41.dll
111112
8efb9babdfbfb500e59f0cc1c10d372c usr/local/bin/homegenie/programs/16.dll
112113
6e911e0a393f7d7d6f2de035fa4f883b usr/local/bin/homegenie/Microsoft.Scripting.Metadata.dll
113-
f40143e78ca58868150629d1525dd2fa usr/local/bin/homegenie/HomeGenie.exe.mdb
114+
b734567cebefdc6a138f3bdec1431cf0 usr/local/bin/homegenie/HomeGenie.exe.mdb
114115
edb4222ca9b4aa24ff7ad7dc5d63ab89 usr/local/bin/homegenie/NetClientLib.dll.mdb
115116
198a54b1a3bba2d5300270ea6f1b9cb5 usr/local/bin/homegenie/Common.Logging.dll
116117
037a39c0e60471e2ad6a155519aabaf8 usr/local/bin/homegenie/Common.dll.mdb
@@ -126,9 +127,9 @@ cb2955458b620dbf5ed454b5ad1bba50 usr/local/bin/homegenie/Raspberry.IO.Component
126127
d127cd699e15cf5feb4df3cdd34b77df usr/local/bin/homegenie/Raspberry.IO.InterIntegratedCircuit.dll
127128
2074c256e8b7a372e28490a436a8e04d usr/local/bin/homegenie/NLog.dll
128129
1dcf890d5a0ac7fdcd3db320b629a3ca usr/local/bin/homegenie/Raspberry.IO.Components.dll.config
129-
88790879bfe97bcf11a72918aa618cbf usr/local/bin/homegenie/HISTORY.TXT
130+
22fd9c6b2e9223d8d1b2db17426fab20 usr/local/bin/homegenie/HISTORY.TXT
130131
3435a8ca2eb89ec7fc13a463590121c0 usr/local/bin/homegenie/README.TXT
131-
a5a8498fe574d1cd98cf17abdcbe0765 usr/local/bin/homegenie/programs.xml
132+
bf3b59d073228c638fd94014afac54dc usr/local/bin/homegenie/programs.xml
132133
58d4389f29365489f41cd547eb1f10ec usr/local/bin/homegenie/modules.xml
133134
a19a8070a77444aafa96d3fbe033c42e usr/local/bin/homegenie/IronRuby.Libraries.dll
134135
456c7d0d3afb06de913ee487f333aadc usr/local/bin/homegenie/Raspberry.IO.Interop.dll
@@ -3023,14 +3024,14 @@ b8459e32556b6e692fae8f9ff81817c9 usr/local/bin/homegenie/html/ui/core/popup.cro
30233024
9e90aad43d8acc5b45729f2296cb5907 usr/local/bin/homegenie/Raspberry.IO.SerialPeripheralInterface.dll
30243025
c01449322109e7477c208be018fd45fb usr/local/bin/homegenie/ADDONS.md
30253026
f382a968d978f314e126e0526f569460 usr/local/bin/homegenie/startup.sh
3026-
7ea87ebb73047cd3b1475c20fbeb3595 usr/local/bin/homegenie/HomeGenie.exe
3027-
c6f7cd5b599a677a259fd96b3a616140 usr/local/bin/homegenie/release_info.xml
3027+
d7c25866f308b007d0c1c8f69ba3f856 usr/local/bin/homegenie/HomeGenie.exe
3028+
a5c58d485e8ea47199363509c22c9295 usr/local/bin/homegenie/release_info.xml
30283029
536920e88b28850b8df27484746134f4 usr/local/bin/homegenie/NetClientLib.dll
30293030
5405413fff79b8d9c747aa900f60f082 usr/local/bin/homegenie/sqlite3.dll
30303031
8b44d53cb2d7afc7ff215bd43df7fc40 usr/local/bin/homegenie/scheduler.xml
30313032
ca7296e5c1dc0a5f0c9762733f0fb9b7 usr/local/bin/homegenie/groups.xml
30323033
61b0c6d8eb2c756355d52df2ef6170c6 usr/local/bin/homegenie/Microsoft.Scripting.dll
3033-
2840b33b8eea1818ccba12584c195a72 usr/local/bin/homegenie/homegenie_factory_config.zip
3034+
7e823fb5de98edd9807831edb3b44e32 usr/local/bin/homegenie/homegenie_factory_config.zip
30343035
acbb8de3a6a8f53d69957e2607097992 usr/local/bin/homegenie/DEVELOPERS.TXT
30353036
ae7bbf0f4b96d2a0effd97d69befb47e usr/local/bin/homegenie/CommonMark.dll
30363037
93675a8ef36065d0c64fe1bf4fb79902 usr/local/bin/homegenie/IronRuby.Libraries.Yaml.dll

‎HomeGenie_Windows/Packager/setup.iss‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
[Setup]
66
AppName=HomeGenie
7-
AppVerName=HomeGenie 1.1 beta (r510)
7+
AppVerName=HomeGenie 1.1 beta (r511)
88
AppPublisher=GenieLabs
99
AppPublisherURL=http://www.homegenie.it
10-
AppVersion=1.1 beta (r510)
10+
AppVersion=1.1 beta (r511)
1111
DefaultDirName={pf}\HomeGenie
1212
DefaultGroupName=HomeGenie
1313
Compression=lzma
@@ -198,8 +198,8 @@ Type: files; Name: "{app}\SQLite.Interop.dll";
198198
;Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}";
199199

200200
[Icons]
201-
Name: "{group}\HomeGenie 1.1 beta (r510)"; Filename: "{app}\HomeGenieManager.exe"
202-
Name: "{group}\Uninstall HomeGenie 1.1 beta (r510)"; Filename: "{uninstallexe}"
201+
Name: "{group}\HomeGenie 1.1 beta (r511)"; Filename: "{app}\HomeGenieManager.exe"
202+
Name: "{group}\Uninstall HomeGenie 1.1 beta (r511)"; Filename: "{uninstallexe}"
203203
Name: "{commondesktop}\HomeGenie"; Filename: "{app}\HomeGenieManager.exe"
204204

205205
[Run]

0 commit comments

Comments
 (0)