v1.4.0-beta.60

- Fixes *Shutter* widget calibration and level issues #470
genielabs · Oct 8, 2023 · f136f5e · f136f5e
1 parent 53a58a1
commit f136f5e
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 21 deletions.
diff --git a/assets/build/all/app/assets/i18n/en.json b/assets/build/all/app/assets/i18n/en.json
@@ -40,6 +40,7 @@
   "enter_description": "Enter description",
   "path": "Path",
   "enter_path": "Enter path",
+  "enter_number": "Enter number",
   "type": "Type",
   "group": "Group",
   "groups": "Groups",

diff --git a/assets/build/all/app/assets/i18n/it.json b/assets/build/all/app/assets/i18n/it.json
@@ -40,6 +40,7 @@
   "enter_description": "Inserire descrizione",
   "path": "Percorso",
   "enter_path": "Inserire percorso",
+  "enter_number": "Inserire numero",
   "type": "Tipo",
   "group": "Gruppo",
   "groups": "Gruppi",

diff --git a/assets/build/all/app/assets/i18n/zwave/en.json b/assets/build/all/app/assets/i18n/zwave/en.json
@@ -58,5 +58,15 @@
     "missing handler":
         "Missing handler",
     "refresh_ports_button":
-        "Refresh ports list"
+        "Refresh ports list",
+    "calibration":
+        "Calibration",
+    "calibrate":
+        "Calibrate",
+    "edit_calibration_parameter":
+        "Edit calibration parameter number",
+    "calibration_parameter_not_set":
+        "Calibration parameter number is not set",
+    "calibration_parameter_number":
+        "Parameter number (see device manual)"
 }
diff --git a/assets/build/all/app/assets/i18n/zwave/it.json b/assets/build/all/app/assets/i18n/zwave/it.json
@@ -58,5 +58,15 @@
     "missing handler":
         "Gestore mancante",
     "refresh_ports_button":
-        "Aggiorna elenco porte"
+        "Aggiorna elenco porte",
+    "calibration":
+        "Calibrazione",
+    "calibrate":
+        "Calibra",
+    "edit_calibration_parameter":
+        "Modifica numero parametro calibrazione",
+    "calibration_parameter_not_set":
+        "Numero parametro per la calibrazione non impostato",
+    "calibration_parameter_number":
+        "Numero parametro (vedi manuale dispositivo)"
 }
diff --git a/assets/build/all/app/index.html b/assets/build/all/app/index.html
@@ -56,6 +56,6 @@
 
   </div>
 
-<script src="runtime.b92e2ca178ebbf4a.js" type="module"></script><script src="polyfills.a360d6e45b80c065.js" type="module"></script><script src="scripts.0dcb4f0a61221c18.js" defer></script><script src="main.655de9d4f0ce042b.js" type="module"></script>
+<script src="runtime.b92e2ca178ebbf4a.js" type="module"></script><script src="polyfills.a360d6e45b80c065.js" type="module"></script><script src="scripts.0dcb4f0a61221c18.js" defer></script><script src="main.941e5c375c9a5099.js" type="module"></script>
 
 </body></html>
diff --git a/...ts/build/all/app/main.655de9d4f0ce042b.js → ...ts/build/all/app/main.941e5c375c9a5099.js b/...ts/build/all/app/main.655de9d4f0ce042b.js → ...ts/build/all/app/main.941e5c375c9a5099.js
diff --git a/assets/build/all/app/ngsw.json b/assets/build/all/app/ngsw.json
@@ -1,6 +1,6 @@
 {
   "configVersion": 1,
-  "timestamp": 1696666772933,
+  "timestamp": 1696764044136,
   "index": "/app/index.html",
   "assetGroups": [
     {
@@ -15,7 +15,7 @@
         "/app/613.16b9c52c0ae74833.js",
         "/app/859.0f150be9c99a6b5a.js",
         "/app/index.html",
-        "/app/main.655de9d4f0ce042b.js",
+        "/app/main.941e5c375c9a5099.js",
         "/app/manifest.webmanifest",
         "/app/polyfills.a360d6e45b80c065.js",
         "/app/runtime.b92e2ca178ebbf4a.js",
@@ -444,18 +444,18 @@
     "/app/assets/fonts/Roboto-Latin-300.woff": "fec6225507c70951797db15985fe0bf87195d6ee",
     "/app/assets/fonts/Roboto-Latin-400.woff": "fec6225507c70951797db15985fe0bf87195d6ee",
     "/app/assets/fonts/Roboto-Latin-500.woff": "7416b5d46c615d2786a604d71d334b605d41cc73",
-    "/app/assets/i18n/en.json": "2c102d1542c09ccfc2345de7627fbd5bde485ff4",
+    "/app/assets/i18n/en.json": "7b8c1483aff99283392e63621ca654477b7778ac",
     "/app/assets/i18n/homegenie/en.json": "6649ad3f42798cb72c0786ddc23190ed6cfbf3d7",
     "/app/assets/i18n/homegenie/it.json": "5f382a852cd94571d6511f2e79ca2c7f43ed98fd",
-    "/app/assets/i18n/it.json": "5417c8b3739e34282dc2d1424c31d94aea2a79ff",
+    "/app/assets/i18n/it.json": "ca28e2cbd55046a4c8ccc2fab22c7bb30f35fc25",
     "/app/assets/i18n/module/en.json": "bd1f58f6eeb2e8213bc5dbe316d1252db8aa436f",
     "/app/assets/i18n/module/it.json": "35c4ef9b17591c0ef0283317a3f226c666d908f9",
     "/app/assets/i18n/widgets/en.json": "81775f6536411948d4d4c6e054a768a21793ab24",
     "/app/assets/i18n/widgets/it.json": "6435f9a7978c18e24fc8d79db404ac4d190fb50a",
     "/app/assets/i18n/zigbee/en.json": "3353db6fb123f979e1811a724026886a9993fe14",
     "/app/assets/i18n/zigbee/it.json": "03f70a9d47a2b485aa1e753fae5b9fbb81d33389",
-    "/app/assets/i18n/zwave/en.json": "b332b89faadd3f25ad7fc0e7fc743041d982dbfe",
-    "/app/assets/i18n/zwave/it.json": "6cff993979f623acc3cda6c9bab75cc6e3cfd76f",
+    "/app/assets/i18n/zwave/en.json": "e79242f65ce354e2ae65c4641e9de041ccf1af55",
+    "/app/assets/i18n/zwave/it.json": "386a6acaf3c84730ce537e2e2cc08f3952c68e61",
     "/app/assets/icons/android-launchericon-144-144.png": "7b5606458da08ff62eda32b536455390a341bae4",
     "/app/assets/icons/android-launchericon-192-192.png": "b42ea60b440912bc6e8cedbe0db827c2f3c4b58d",
     "/app/assets/icons/android-launchericon-512-512.png": "a5f0e791030ccbf03637580d154c3e602c2a529e",
@@ -759,8 +759,8 @@
     "/app/assets/widgets/weather/images_alt/thunder.svg": "2ace7038dfd663330cecc350d680ef08206d62ff",
     "/app/assets/widgets/weather/images_alt/weather.svg": "c719c09048977fd40688272316b35ddf1bdf89e8",
     "/app/assets/workers/typings-worker.js": "8df10d867c12d36cdebfb7e16caacd0020db301f",
-    "/app/index.html": "1d859a888ebf28f2d18f740954cb5871c3be08ba",
-    "/app/main.655de9d4f0ce042b.js": "f62ba561fe4a1a379fdbd7622ba1282a1549cfa3",
+    "/app/index.html": "4478ae5894357cf5dcfeaf55cc1192524247a69b",
+    "/app/main.941e5c375c9a5099.js": "771db3d698485ce3c32e34bdaa404fbc5fbf9f2c",
     "/app/manifest.webmanifest": "d47bb07a495e27ddf072f8702df373f79b4eb183",
     "/app/polyfills.a360d6e45b80c065.js": "f317e1a3e4bb6a84068c7e1845a2ce8b2f956ee7",
     "/app/runtime.b92e2ca178ebbf4a.js": "b50d841a4c50d466c34aab3267d3fb4afe87dede",

diff --git a/assets/build/all/data/packages/homegenie/homegenie-home/package.json b/assets/build/all/data/packages/homegenie/homegenie-home/package.json
@@ -1 +1 @@
-{"repository":"homegenie","id":"homegenie-home","version":"1.0.0","description":"Common smart-home pack","programs":[{"repository":"homegenie","packageId":"homegenie-home","packageVersion":"1.0.0","hid":"81","id":"energy-monitor","required":true,"version":"1.0.2","checksum":"A1306295F508BE98DDF77F671BB495AE","installed":false},{"repository":"homegenie","packageId":"homegenie-home","packageVersion":"1.0.0","hid":"82","id":"energy-saving-mode","required":false,"version":"1.0.1","checksum":"2D5D06DBA4DE7F33BD2790472D167C69","installed":false},{"repository":"homegenie","packageId":"homegenie-home","packageVersion":"1.0.0","hid":"7","id":"group-lights-off","required":true,"version":"1.0.1","checksum":"836B2BD639734437FB1B54B23167B863","installed":false},{"repository":"homegenie","packageId":"homegenie-home","packageVersion":"1.0.0","hid":"6","id":"group-lights-on","required":true,"version":"1.0.1","checksum":"B6CA8C96005C4755733B5660D1031247","installed":false},{"repository":"homegenie","packageId":"homegenie-home","packageVersion":"1.0.0","hid":"27","id":"knx-client","required":false,"version":"1.0.1","checksum":"076B23980AA39814E0DDDD8B83D306A7","installed":false},{"repository":"homegenie","packageId":"homegenie-home","packageVersion":"1.0.0","hid":"26","id":"philips-hue-bridge","required":false,"version":"1.0.1","checksum":"23192414D258639D4A3331C918322549","installed":false},{"repository":"homegenie","packageId":"homegenie-home","packageVersion":"1.0.0","hid":"90","id":"security-alarm-system","required":true,"version":"1.0.1","checksum":"143756F2490B4D36496A87B92DDC33A7","installed":false},{"repository":"homegenie","packageId":"homegenie-home","packageVersion":"1.0.0","hid":"145","id":"smart-device","required":true,"version":"1.0.2","checksum":"780B640438C9E7438A505478A660358D","installed":false},{"repository":"homegenie","packageId":"homegenie-home","packageVersion":"1.0.0","hid":"78","id":"smart-thermostat","required":true,"version":"1.0.1","checksum":"2E07C9427156338C2D0A061686058442","installed":false},{"repository":"homegenie","packageId":"homegenie-home","packageVersion":"1.0.0","hid":"8","id":"sunrise-colors-scenario","required":false,"version":"1.0.1","checksum":"BA5FAC8461CABF3C9B12B3B467F03E19","installed":false},{"repository":"homegenie","packageId":"homegenie-home","packageVersion":"1.0.0","hid":"30","id":"wemo","required":false,"version":"1.0.1","checksum":"3ABAA7AD2F1CC7B496C3C4F76122F0BF","installed":false},{"repository":"homegenie","packageId":"homegenie-base","packageVersion":"1.0.0","hid":"95","id":"events-logging","required":true,"version":"1.0.1","checksum":"45CFE6FF025BD92488BBDBE491C4C98D","installed":false},{"repository":"homegenie","packageId":"homegenie-base","packageVersion":"1.0.0","hid":"34","id":"openweathermap","required":true,"version":"1.0.1","checksum":"F93D3B0AEC9971C1C79D70FDE007888B","installed":false},{"repository":"homegenie","packageId":"homegenie-base","packageVersion":"1.0.0","hid":"505","id":"remote-control","required":true,"version":"1.0.1","checksum":"BDF7FC5E982D8A588267A989636AA6B6","installed":false}],"modules":null,"groups":[{"repository":null,"packageId":null,"packageVersion":null,"hid":"Dashboard","id":"0","required":false,"version":"0","checksum":null,"installed":false},{"repository":null,"packageId":null,"packageVersion":null,"hid":"Color Lights","id":"0","required":false,"version":"0","checksum":null,"installed":false}],"schedules":[{"repository":null,"packageId":null,"packageVersion":null,"hid":"Behavior.SensorTimeout","id":"0","required":false,"version":"0","checksum":null,"installed":false},{"repository":null,"packageId":null,"packageVersion":null,"hid":"Holidays.Summer","id":"0","required":false,"version":"0","checksum":null,"installed":false},{"repository":null,"packageId":null,"packageVersion":null,"hid":"Holidays.Winter","id":"0","required":false,"version":"0","checksum":null,"installed":false},{"repository":null,"packageId":null,"packageVersion":null,"hid":"Lights.Outdoor.On","id":"0","required":false,"version":"0","checksum":null,"installed":false},{"repository":null,"packageId":null,"packageVersion":null,"hid":"Thermostat.Cool","id":"0","required":false,"version":"0","checksum":null,"installed":false},{"repository":null,"packageId":null,"packageVersion":null,"hid":"Thermostat.Cool.Economy","id":"0","required":false,"version":"0","checksum":null,"installed":false},{"repository":null,"packageId":null,"packageVersion":null,"hid":"Thermostat.Heat","id":"0","required":false,"version":"0","checksum":null,"installed":false},{"repository":null,"packageId":null,"packageVersion":null,"hid":"Thermostat.Heat.Economy","id":"0","required":false,"version":"0","checksum":null,"installed":false}]}
+{"repository":"homegenie","id":"homegenie-home","version":"1.0.0","description":"Common smart-home pack","programs":[{"repository":"homegenie","packageId":"homegenie-home","packageVersion":"1.0.0","hid":"81","id":"energy-monitor","required":true,"version":"1.0.2","checksum":"A1306295F508BE98DDF77F671BB495AE","installed":false},{"repository":"homegenie","packageId":"homegenie-home","packageVersion":"1.0.0","hid":"82","id":"energy-saving-mode","required":false,"version":"1.0.1","checksum":"2D5D06DBA4DE7F33BD2790472D167C69","installed":false},{"repository":"homegenie","packageId":"homegenie-home","packageVersion":"1.0.0","hid":"7","id":"group-lights-off","required":true,"version":"1.0.1","checksum":"836B2BD639734437FB1B54B23167B863","installed":false},{"repository":"homegenie","packageId":"homegenie-home","packageVersion":"1.0.0","hid":"6","id":"group-lights-on","required":true,"version":"1.0.1","checksum":"B6CA8C96005C4755733B5660D1031247","installed":false},{"repository":"homegenie","packageId":"homegenie-home","packageVersion":"1.0.0","hid":"27","id":"knx-client","required":false,"version":"1.0.1","checksum":"076B23980AA39814E0DDDD8B83D306A7","installed":false},{"repository":"homegenie","packageId":"homegenie-home","packageVersion":"1.0.0","hid":"26","id":"philips-hue-bridge","required":false,"version":"1.0.2","checksum":"085015A81EDA88B1EB73413C5212B558","installed":false},{"repository":"homegenie","packageId":"homegenie-home","packageVersion":"1.0.0","hid":"90","id":"security-alarm-system","required":true,"version":"1.0.1","checksum":"143756F2490B4D36496A87B92DDC33A7","installed":false},{"repository":"homegenie","packageId":"homegenie-home","packageVersion":"1.0.0","hid":"145","id":"smart-device","required":true,"version":"1.0.2","checksum":"780B640438C9E7438A505478A660358D","installed":false},{"repository":"homegenie","packageId":"homegenie-home","packageVersion":"1.0.0","hid":"78","id":"smart-thermostat","required":true,"version":"1.0.1","checksum":"2E07C9427156338C2D0A061686058442","installed":false},{"repository":"homegenie","packageId":"homegenie-home","packageVersion":"1.0.0","hid":"8","id":"sunrise-colors-scenario","required":false,"version":"1.0.1","checksum":"BA5FAC8461CABF3C9B12B3B467F03E19","installed":false},{"repository":"homegenie","packageId":"homegenie-home","packageVersion":"1.0.0","hid":"30","id":"wemo","required":false,"version":"1.0.1","checksum":"3ABAA7AD2F1CC7B496C3C4F76122F0BF","installed":false},{"repository":"homegenie","packageId":"homegenie-base","packageVersion":"1.0.0","hid":"95","id":"events-logging","required":true,"version":"1.0.1","checksum":"45CFE6FF025BD92488BBDBE491C4C98D","installed":false},{"repository":"homegenie","packageId":"homegenie-base","packageVersion":"1.0.0","hid":"34","id":"openweathermap","required":true,"version":"1.0.1","checksum":"F93D3B0AEC9971C1C79D70FDE007888B","installed":false},{"repository":"homegenie","packageId":"homegenie-base","packageVersion":"1.0.0","hid":"505","id":"remote-control","required":true,"version":"1.0.1","checksum":"BDF7FC5E982D8A588267A989636AA6B6","installed":false}],"modules":null,"groups":[{"repository":null,"packageId":null,"packageVersion":null,"hid":"Dashboard","id":"0","required":false,"version":"0","checksum":null,"installed":false},{"repository":null,"packageId":null,"packageVersion":null,"hid":"Color Lights","id":"0","required":false,"version":"0","checksum":null,"installed":false}],"schedules":[{"repository":null,"packageId":null,"packageVersion":null,"hid":"Behavior.SensorTimeout","id":"0","required":false,"version":"0","checksum":null,"installed":false},{"repository":null,"packageId":null,"packageVersion":null,"hid":"Holidays.Summer","id":"0","required":false,"version":"0","checksum":null,"installed":false},{"repository":null,"packageId":null,"packageVersion":null,"hid":"Holidays.Winter","id":"0","required":false,"version":"0","checksum":null,"installed":false},{"repository":null,"packageId":null,"packageVersion":null,"hid":"Lights.Outdoor.On","id":"0","required":false,"version":"0","checksum":null,"installed":false},{"repository":null,"packageId":null,"packageVersion":null,"hid":"Thermostat.Cool","id":"0","required":false,"version":"0","checksum":null,"installed":false},{"repository":null,"packageId":null,"packageVersion":null,"hid":"Thermostat.Cool.Economy","id":"0","required":false,"version":"0","checksum":null,"installed":false},{"repository":null,"packageId":null,"packageVersion":null,"hid":"Thermostat.Heat","id":"0","required":false,"version":"0","checksum":null,"installed":false},{"repository":null,"packageId":null,"packageVersion":null,"hid":"Thermostat.Heat.Economy","id":"0","required":false,"version":"0","checksum":null,"installed":false}]}
diff --git a/assets/build/all/data/packages/homegenie/homegenie-home/programs.xml b/assets/build/all/data/packages/homegenie/homegenie-home/programs.xml
@@ -515,7 +515,9 @@ When.ModuleParameterChanged((module, property) =&gt; {
 
 Program.Run();
 </ScriptSetup>
-    <ScriptSource>Func&lt;string, string, bool&gt; bridgeApiCall = (string lightnum, string jsonargs) =&gt;
+    <ScriptSource>var accessLock = new object();
+
+Func&lt;string, string, bool&gt; bridgeApiCall = (string lightnum, string jsonargs) =&gt;
 {
   if (Program.Option("BridgeAddress").Value == "" || Program.Option("BridgeAddress").Value.EndsWith("?"))
   {
@@ -524,7 +526,12 @@ Program.Run();
   string webserviceurl = "http://" +
     Program.Option("BridgeAddress").Value + "/api/" +
     Program.Option("BridgeUsername").Value + "/lights/" + lightnum + "/state";
-  Program.RunAsyncTask(() =&gt; Net.WebService(webserviceurl).Put( jsonargs ).Call());
+  Program.RunAsyncTask(() =&gt; {
+    lock(accessLock)
+    {
+      Net.WebService(webserviceurl).Put( jsonargs ).Call();
+    }
+  });
   return true;
 };
 
@@ -589,14 +596,14 @@ Api.Handle("HomeAutomation.PhilipsHue", ( args ) =&gt; {
       case "Control.ColorHsb":
         string[] values = parameter.Split(',');
         double transition = 5;
-        if (values.Length &gt; 3) transition = ((int)(double.Parse(values[3]) * 10));
+        if (values.Length &gt; 3) transition = ((int)(double.Parse(values[3], CultureInfo.InvariantCulture) * 10));
         module.Emit("Status.Level", (double.Parse(values[2], CultureInfo.InvariantCulture)).ToString());
         module.Emit("Status.ColorHsb", parameter);
         bridgeApiCall(lightNumber, "{ \"on\" : true" +
                       ", \"hue\" : " + (int)(double.Parse(values[0], CultureInfo.InvariantCulture) * 65536) +
                       ", \"sat\" : " + (int)(double.Parse(values[1], CultureInfo.InvariantCulture) * 255) +
                       ", \"bri\" : " + (int)(double.Parse(values[2], CultureInfo.InvariantCulture) * 255) +
-                      ", \"transitiontime\" : " + transition.ToString() +  "}");
+                      ", \"transitiontime\" : " + transition.ToString(CultureInfo.InvariantCulture) +  "}");
         break;
       // eg. http://&lt;hg_address&gt;/api/HomeAutomation.PhilipsHue/&lt;light_number&gt;/Control.Alert/Long
       case "Control.Alert":
@@ -618,16 +625,16 @@ Api.Handle("HomeAutomation.PhilipsHue", ( args ) =&gt; {
 Program.GoBackground();
 </ScriptSource>
     <ScriptContext />
-    <ScriptErrors />
+    <ScriptErrors>[]</ScriptErrors>
     <Data />
     <PackageInfo>
       <Repository>homegenie</Repository>
       <PackageId>homegenie-home</PackageId>
       <PackageVersion>1.0.0</PackageVersion>
       <Id>philips-hue-bridge</Id>
-      <Version>1.0.1</Version>
+      <Version>1.0.2</Version>
       <Required>false</Required>
-      <Checksum>23192414D258639D4A3331C918322549</Checksum>
+      <Checksum>085015A81EDA88B1EB73413C5212B558</Checksum>
     </PackageInfo>
     <Domain>HomeAutomation.HomeGenie.Automation</Domain>
     <Address>26</Address>
@@ -1026,7 +1033,7 @@ const string SMART_DEVICE_SWITCH_OFF_TIMEOUT = "HomeGenie.SmartLights.SwitchOffT
 
 const string SMART_DEVICE_LAST_EVENT = "HomeGenie.SmartLights.LastEvent";
 </ScriptContext>
-    <ScriptErrors>[]</ScriptErrors>
+    <ScriptErrors />
     <Data />
     <PackageInfo>
       <Repository>homegenie</Repository>