v1.1-beta.511

genielabs · Jan 6, 2016 · 413a13e · 413a13e
1 parent 29970ba
commit 413a13e
Show file tree

Hide file tree

Showing 9 changed files with 95 additions and 35 deletions.
diff --git a/BaseFiles/Common/Common.csproj b/BaseFiles/Common/Common.csproj
@@ -9038,6 +9038,9 @@
     <None Include="html\ext\zwave\pepper1db\5254_0100_8371.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="programs\29.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="dummy.cs" />

diff --git a/BaseFiles/Common/homegenie_factory_config.zip b/BaseFiles/Common/homegenie_factory_config.zip
diff --git a/BaseFiles/Common/programs.xml b/BaseFiles/Common/programs.xml
@@ -135,7 +135,7 @@ Program.GoBackground();</ScriptSource>
       </ProgramFeature>
     </Features>
     <ActivationTime xsi:nil="true" />
-    <TriggerTime>2016-01-05T21:46:50.202498Z</TriggerTime>
+    <TriggerTime>2016-01-06T00:42:10.069027Z</TriggerTime>
     <Type>CSharp</Type>
     <IsEnabled>true</IsEnabled>
   </ProgramBlock>
@@ -268,7 +268,7 @@ For instructions see: http://developers.meethue.com/gettingstarted.html .</Descr
     <Group>Devices and Things</Group>
     <Features />
     <ActivationTime xsi:nil="true" />
-    <TriggerTime>2016-01-05T21:46:50.085557Z</TriggerTime>
+    <TriggerTime>2016-01-06T00:42:09.999407Z</TriggerTime>
     <Type>CSharp</Type>
     <IsEnabled>true</IsEnabled>
   </ProgramBlock>
@@ -450,7 +450,7 @@ To activate this widget specify a valid user &lt;strong&gt;Key&lt;/strong&gt; th
     <Group>Weather and Enviroment</Group>
     <Features />
     <ActivationTime xsi:nil="true" />
-    <TriggerTime>2016-01-05T21:46:50.407097Z</TriggerTime>
+    <TriggerTime>2016-01-06T00:42:09.742282Z</TriggerTime>
     <Type>CSharp</Type>
     <IsEnabled>true</IsEnabled>
   </ProgramBlock>
@@ -522,7 +522,7 @@ while (Program.IsEnabled)
       </ProgramFeature>
     </Features>
     <ActivationTime xsi:nil="true" />
-    <TriggerTime>2016-01-05T21:46:50.209188Z</TriggerTime>
+    <TriggerTime>2016-01-06T00:42:09.999236Z</TriggerTime>
     <Type>CSharp</Type>
     <IsEnabled>true</IsEnabled>
   </ProgramBlock>
@@ -1138,7 +1138,7 @@ Program.GoBackground();</ScriptSource>
       </ProgramFeature>
     </Features>
     <ActivationTime xsi:nil="true" />
-    <TriggerTime>2016-01-05T21:46:50.341951Z</TriggerTime>
+    <TriggerTime>2016-01-06T00:42:09.813019Z</TriggerTime>
     <Type>CSharp</Type>
     <IsEnabled>true</IsEnabled>
   </ProgramBlock>
@@ -1185,7 +1185,7 @@ Program.GoBackground();</ScriptSource>
       </ProgramFeature>
     </Features>
     <ActivationTime xsi:nil="true" />
-    <TriggerTime>2016-01-05T21:46:50.30898Z</TriggerTime>
+    <TriggerTime>2016-01-06T00:42:09.98565Z</TriggerTime>
     <Type>CSharp</Type>
     <IsEnabled>true</IsEnabled>
   </ProgramBlock>
@@ -1534,7 +1534,7 @@ while (Program.IsEnabled)
       </ProgramFeature>
     </Features>
     <ActivationTime xsi:nil="true" />
-    <TriggerTime>2016-01-05T21:46:50.04648Z</TriggerTime>
+    <TriggerTime>2016-01-06T00:42:09.894307Z</TriggerTime>
     <Type>CSharp</Type>
     <IsEnabled>true</IsEnabled>
   </ProgramBlock>
@@ -1664,7 +1664,7 @@ Program.GoBackground();</ScriptSource>
       </ProgramFeature>
     </Features>
     <ActivationTime xsi:nil="true" />
-    <TriggerTime>2016-01-05T21:46:50.312708Z</TriggerTime>
+    <TriggerTime>2016-01-06T00:42:09.719893Z</TriggerTime>
     <Type>CSharp</Type>
     <IsEnabled>true</IsEnabled>
   </ProgramBlock>
@@ -1828,7 +1828,7 @@ Program.Run();
     <Group>Messaging and Social</Group>
     <Features />
     <ActivationTime xsi:nil="true" />
-    <TriggerTime>2016-01-05T21:46:50.175842Z</TriggerTime>
+    <TriggerTime>2016-01-06T00:42:10.027703Z</TriggerTime>
     <Type>CSharp</Type>
     <IsEnabled>true</IsEnabled>
   </ProgramBlock>
@@ -2263,7 +2263,7 @@ energy consumption.</Description>
     <Group>Energy Management</Group>
     <Features />
     <ActivationTime xsi:nil="true" />
-    <TriggerTime>2016-01-05T21:46:50.21773Z</TriggerTime>
+    <TriggerTime>2016-01-06T00:42:10.031682Z</TriggerTime>
     <Type>CSharp</Type>
     <IsEnabled>true</IsEnabled>
   </ProgramBlock>
@@ -2412,7 +2412,7 @@ It requires that a manufacturer specific get has been issued on the node.</Descr
     <Group>Z-Wave</Group>
     <Features />
     <ActivationTime xsi:nil="true" />
-    <TriggerTime>2016-01-05T21:46:50.090024Z</TriggerTime>
+    <TriggerTime>2016-01-06T00:42:09.850648Z</TriggerTime>
     <Type>CSharp</Type>
     <IsEnabled>true</IsEnabled>
   </ProgramBlock>
@@ -2662,7 +2662,7 @@ while (Program.IsEnabled)
       </ProgramFeature>
     </Features>
     <ActivationTime xsi:nil="true" />
-    <TriggerTime>2016-01-05T21:46:50.298833Z</TriggerTime>
+    <TriggerTime>2016-01-06T00:42:09.788687Z</TriggerTime>
     <Type>CSharp</Type>
     <IsEnabled>true</IsEnabled>
   </ProgramBlock>
@@ -6717,13 +6717,13 @@ var GetClosestEvent = new Func&lt;ModuleParameter, DateTime, DateTime&gt;((param
       var closest = hist[hist.Count-1];
       for(int p = hist.Count-1; p &gt;= 0; p--)
       {
-        if (date &lt;= hist[p].Timestamp)
+        if (date &lt;= hist[p].Timestamp.ToLocalTime())
         {
           break;
         }
         closest = hist[p];
       }
-      closestTimestamp = closest.Timestamp;
+      closestTimestamp = closest.Timestamp.ToLocalTime();
     } catch { }
   }
   return closestTimestamp;
@@ -7098,9 +7098,59 @@ while (Program.IsEnabled)
     <Name>Timetable</Name>
     <Description>Widget for scheduling thermostats, lights and shutters.</Description>
     <Group>Scheduling</Group>
-    <Features />
-    <ActivationTime>2016-01-05T21:47:16.831704Z</ActivationTime>
-    <TriggerTime xsi:nil="true" />
+    <Features>
+      <ProgramFeature>
+        <FieldType>timetable</FieldType>
+        <ForDomains />
+        <ForTypes>Light,Switch,Shutter,Dimmer,Thermostat</ForTypes>
+        <Property>TimeTable.Weekend</Property>
+        <Description>Timetable to use for weekend</Description>
+      </ProgramFeature>
+      <ProgramFeature>
+        <FieldType>timetable</FieldType>
+        <ForDomains />
+        <ForTypes>Light,Switch,Shutter,Dimmer,Thermostat</ForTypes>
+        <Property>TimeTable.Workday</Property>
+        <Description>Timetable to use for workday</Description>
+      </ProgramFeature>
+      <ProgramFeature>
+        <FieldType>timetable</FieldType>
+        <ForDomains />
+        <ForTypes>Light,Switch,Shutter,Dimmer,Thermostat</ForTypes>
+        <Property>TimeTable.Holiday</Property>
+        <Description>Timetable to use for holiday</Description>
+      </ProgramFeature>
+      <ProgramFeature>
+        <FieldType>timetable</FieldType>
+        <ForDomains />
+        <ForTypes>Light,Switch,Shutter,Dimmer,Thermostat</ForTypes>
+        <Property>TimeTable.Special</Property>
+        <Description>Timetable to use for special day</Description>
+      </ProgramFeature>
+      <ProgramFeature>
+        <FieldType>checkbox</FieldType>
+        <ForDomains />
+        <ForTypes>Light,Switch,Shutter,Dimmer,Thermostat</ForTypes>
+        <Property>TimeTable.Enable</Property>
+        <Description>Enable Timetable scheduling</Description>
+      </ProgramFeature>
+      <ProgramFeature>
+        <FieldType>checkbox</FieldType>
+        <ForDomains />
+        <ForTypes>Light,Switch,Shutter,Dimmer,Thermostat</ForTypes>
+        <Property>TimeTable.Repeat</Property>
+        <Description>Repeat command for the whole duration</Description>
+      </ProgramFeature>
+      <ProgramFeature>
+        <FieldType>checkbox</FieldType>
+        <ForDomains />
+        <ForTypes>Light,Switch,Shutter,Dimmer,Thermostat</ForTypes>
+        <Property>TimeTable.CheckDST</Property>
+        <Description>Enable Day Light Saving check</Description>
+      </ProgramFeature>
+    </Features>
+    <ActivationTime>2016-01-06T00:42:41.749703Z</ActivationTime>
+    <TriggerTime>2016-01-06T00:42:41.790891Z</TriggerTime>
     <Type>CSharp</Type>
     <IsEnabled>true</IsEnabled>
   </ProgramBlock>
@@ -7813,7 +7863,7 @@ Also it lets you dim last addressed module using Up/Down button which can be def
       </ProgramFeature>
     </Features>
     <ActivationTime xsi:nil="true" />
-    <TriggerTime>2016-01-05T21:46:50.390028Z</TriggerTime>
+    <TriggerTime>2016-01-06T00:42:10.071808Z</TriggerTime>
     <Type>CSharp</Type>
     <IsEnabled>true</IsEnabled>
   </ProgramBlock>

diff --git a/BaseFiles/Common/programs/36.dll b/BaseFiles/Common/programs/36.dll
diff --git a/HISTORY.TXT b/HISTORY.TXT
@@ -1,6 +1,9 @@
 RELEASE HISTORY
 
-05/01/2016 v1.1-beta.510
+06/01/2016 v1.1-beta.511
+    - Fix archive compression "codepage not supported" bug introduced in r510
+    - Fix heavy cpu load bug introduced in r510
+    - Fix TimeTable time offset bug introduced in r510
     - Faaaster archive compression/decompression using SharpZipLib
     - Improved TimeTable to support CronTab expressions for program Disable/AutoOff options
 

diff --git a/HomeGenie/Automation/Scheduler/SchedulerService.cs b/HomeGenie/Automation/Scheduler/SchedulerService.cs
@@ -49,7 +49,7 @@ public void Start()
         {
             Stop();
             serviceChecker = new Timer(CheckScheduledEvents); //, null, 1000, 1000);
-            serviceChecker.Change(60-DateTime.Now.Second, Timeout.Infinite);
+            serviceChecker.Change((60-DateTime.Now.Second)*1000, Timeout.Infinite);
         }
 
         public void Stop()
@@ -62,7 +62,7 @@ public void Stop()
 
         private void CheckScheduledEvents(object state)
         {
-            serviceChecker.Change(60-DateTime.Now.Second, Timeout.Infinite);
+            serviceChecker.Change((60-DateTime.Now.Second)*1000, Timeout.Infinite);
             var date = DateTime.Now;
             for (int i = 0; i < events.Count; i++)
             {

diff --git a/HomeGenie/release_info.xml b/HomeGenie/release_info.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ReleaseInfo xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <Name>HomeGenie</Name>
-  <Version>1.1 beta r510</Version>
+  <Version>1.1 beta r511</Version>
   <Description>Latest public release.</Description>
-  <ReleaseNote>   - Faaaster archive compression/decompression using SharpZipLib
+  <ReleaseNote>   - Fix archive compression "codepage not supported" bug introduced in r510
+  - Fix heavy cpu load bug introduced in r510
+  - Fix TimeTable time offset bug introduced in r510
+  - Faaaster archive compression/decompression using SharpZipLib
   - Improved TimeTable to support CronTab expressions for program Disable/AutoOff options</ReleaseNote>
-  <ReleaseDate>2016-01-05T19:04:31.0000Z</ReleaseDate>
+  <ReleaseDate>2016-01-06T00:49:18.0000Z</ReleaseDate>
 </ReleaseInfo>
diff --git a/HomeGenie_Linux/Packager/DEBIAN/md5sums b/HomeGenie_Linux/Packager/DEBIAN/md5sums
@@ -98,10 +98,11 @@ f8daf8edf5875fe5c27fe958eb73a0c9  usr/local/bin/homegenie/programs/60.dll
 2493912eb96ce06300bd63ef3ba9f202  usr/local/bin/homegenie/programs/92.dll
 08777573d851c7deff95527e42a38395  usr/local/bin/homegenie/programs/37.dll
 8d689700037d663642eb7bcfe57d1c2d  usr/local/bin/homegenie/programs/503.dll
+123f9a0ac91466923f225e2fa505f002  usr/local/bin/homegenie/programs/29.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
-927f131efd9fd7754a735c1844208e1d  usr/local/bin/homegenie/programs/36.dll
+5e2bb26c07036a58334911cf5df3c4bc  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
@@ -110,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
-f40143e78ca58868150629d1525dd2fa  usr/local/bin/homegenie/HomeGenie.exe.mdb
+b734567cebefdc6a138f3bdec1431cf0  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
@@ -126,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
-88790879bfe97bcf11a72918aa618cbf  usr/local/bin/homegenie/HISTORY.TXT
+22fd9c6b2e9223d8d1b2db17426fab20  usr/local/bin/homegenie/HISTORY.TXT
 3435a8ca2eb89ec7fc13a463590121c0  usr/local/bin/homegenie/README.TXT
-a5a8498fe574d1cd98cf17abdcbe0765  usr/local/bin/homegenie/programs.xml
+bf3b59d073228c638fd94014afac54dc  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
@@ -3023,14 +3024,14 @@ b8459e32556b6e692fae8f9ff81817c9  usr/local/bin/homegenie/html/ui/core/popup.cro
 9e90aad43d8acc5b45729f2296cb5907  usr/local/bin/homegenie/Raspberry.IO.SerialPeripheralInterface.dll
 c01449322109e7477c208be018fd45fb  usr/local/bin/homegenie/ADDONS.md
 f382a968d978f314e126e0526f569460  usr/local/bin/homegenie/startup.sh
-7ea87ebb73047cd3b1475c20fbeb3595  usr/local/bin/homegenie/HomeGenie.exe
-c6f7cd5b599a677a259fd96b3a616140  usr/local/bin/homegenie/release_info.xml
+d7c25866f308b007d0c1c8f69ba3f856  usr/local/bin/homegenie/HomeGenie.exe
+a5c58d485e8ea47199363509c22c9295  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
-2840b33b8eea1818ccba12584c195a72  usr/local/bin/homegenie/homegenie_factory_config.zip
+7e823fb5de98edd9807831edb3b44e32  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
@@ -4,10 +4,10 @@
 
 [Setup]
 AppName=HomeGenie
-AppVerName=HomeGenie 1.1 beta (r510)
+AppVerName=HomeGenie 1.1 beta (r511)
 AppPublisher=GenieLabs
 AppPublisherURL=http://www.homegenie.it
-AppVersion=1.1 beta (r510)
+AppVersion=1.1 beta (r511)
 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 (r510)"; Filename: "{app}\HomeGenieManager.exe"
-Name: "{group}\Uninstall HomeGenie 1.1 beta (r510)"; Filename: "{uninstallexe}"
+Name: "{group}\HomeGenie 1.1 beta (r511)"; Filename: "{app}\HomeGenieManager.exe"
+Name: "{group}\Uninstall HomeGenie 1.1 beta (r511)"; Filename: "{uninstallexe}"
 Name: "{commondesktop}\HomeGenie"; Filename: "{app}\HomeGenieManager.exe"
 
 [Run]