homebridge-smartsystem 6.3.4 → 6.4.2

package/server/powerbase.ts

@@ -136,37 +136,38 @@ export class PowerBase extends Base {
       // for all bindings
       this.bindings.forEach( b => {
         const power = this.evalPower(b.channel);
-        if (this.significant(power, b.power)) {
-          debug("power", "APPLY to " + b.channel + " = " + b.power + " -> " + power + " for " + b.name + 
-                         " (" + b.logicalNodeAddress + ";" + b.logicalAddress + "): difference: " + Math.abs(b.power - power) + 
-                         " > threshold: 5% =" + Math.abs(b.power * 0.05) + " > threshold: 2% =" + Math.abs(b.power * 0.02));
+        if (this.significant(power, b.value)) {
+          debug("power", "APPLY to " + b.channel + " = " + b.value + " -> " + power + " for " + b.register + 
+                         "): difference: " + Math.abs(b.value - power) + 
+                         " > threshold: 5% =" + Math.abs(b.value * 0.05) + " > threshold: 2% =" + Math.abs(b.value * 0.02));
           this.applyBinding(b, power)
-            .then(value => {
-              b.power = value;
-              // debug("power", "set unit " + b.name + " to " + value);
+            .then(power => {
+              b.value = power;
+              debug("power", "set register " + b.register + " to " + power);
             })
             .catch((e) => err(this.type, e.message || e));
 
         // } else {
-          // debug("power", "DONT to " + b.channel + " = " + b.power + " -> " + power + " for " + b.name + 
-          //                " (" + b.logicalNodeAddress + ";" + b.logicalAddress + "): difference: " + Math.abs(b.power - power) + 
+          // debug("power", "DONT to " + b.channel + " = " + b.power + " -> " + power + " for " + b.register + 
+          //                " : difference: " + Math.abs(b.power - power) + 
           //                " > threshold: 5% =" + Math.abs(b.power * 0.05) + " > threshold: 2% =" + Math.abs(b.power * 0.02));
         }
       });
     }
   }
 
+  
   async applyBinding(binding: Binding, value: number): Promise<number> {
-    const unit = this.system.findUnit(this.system.findMaster(binding.masterAddress, binding.masterPort), 
-                                      binding.logicalNodeAddress, binding.logicalAddress);
-    if (unit) {
-      if (!isNaN(value))
-        await unit.setSensorValue(Math.abs(value));
+    const master = this.system.findMaster(binding.masterAddress, binding.masterPort);
+    if (master) {
+      await master.setRegisterValue(binding.register, value);
       return value;
 
-    } else if ((binding.logicalNodeAddress != 0) || (binding.logicalAddress != 0)) {
-      throw new Error("***** UNIT NOT FOUND for binding value " + value + " to " + binding.masterAddress + " - " + binding.logicalNodeAddress + ";" + binding.logicalAddress + " *****");
-    }
+    } else if ((!binding.masterAddress) || (binding.register)) {
+      throw new Error("***** MASTER NOT FOUND for binding for value " + value + " to " + binding.masterAddress + ":" + binding.masterPort + " - register = " + binding.register + " *****");
+
+    } // else empty binding -> no error 
+
   }
 
 
@@ -284,7 +285,7 @@ export class PowerBase extends Base {
   //
   updateBindings() {
     // sort on channel.
-    this.bindings.sort((a,b) => parseInt(a.channel)-parseInt(b.channel));
+    this.bindings.sort((a,b) => a.register-b.register);
 
     // sanitize and copy all rules into the config
     this.config.bindings = this.bindings.map(b => Sanitizers.bindingConfig(b));

package/server/smartapp.js

@@ -112,6 +112,8 @@ class SmartApp extends webapp_1.WebApp {
     //////////////
     pwOK(context, user, pw) {
         return __awaiter(this, void 0, void 0, function* () {
+            // to bypass user/pw ->
+            //return true;
             this.token = "";
             (0, config_1.setToken)("");
             try {
@@ -329,7 +331,7 @@ class SmartApp extends webapp_1.WebApp {
                     power.updateRule(id, this.scrapeRule(context));
                 }
                 else if (context.action === "save") {
-                    power.updateConfig({ address: context.getParam(kAddress), uid: context.getParam(kUID), addresses: context.getParam(kAddresses), });
+                    power.updateConfig({ address: context.getParam(kAddress), uid: context.getParam(kUID), addresses: context.getParam(kAddresses) });
                 }
                 else if (context.action === "badd") {
                     const binding = power.newBinding();
@@ -357,9 +359,12 @@ class SmartApp extends webapp_1.WebApp {
         });
     }
     scrapeBinding(context) {
-        const binding = this.scrapeUnit(context, "");
-        binding.channel = context.getParam({ name: "channel", type: "string", default: "0" });
-        return binding;
+        context.getMaster("action");
+        const master = this.system.findMaster(context["masterAddress"], context["masterPort"]);
+        const register = context.getParam({ name: "register", type: "integer", default: 0 });
+        const channel = context.getParam({ name: "channel", type: "string", default: "0" });
+        return { masterAddress: context["masterAddress"], masterPort: context["masterPort"],
+            register, channel };
     }
     scrapeAction(context, boundary) {
         const { name, value, masterAddress, masterPort, logicalAddress, logicalNodeAddress } = this.scrapeUnit(context, boundary);
@@ -761,7 +766,7 @@ class SmartApp extends webapp_1.WebApp {
             let message;
             try {
                 if (context.action === "new") {
-                    return this.ejs("masterDetail", context, { config: types_1.Sanitizers.masterConfig(null) });
+                    return this.ejs("masterDetail", context, { config: types_1.Sanitizers.masterConfig(null), registers: [], nodes: [] });
                 }
                 else if (context.action === "list") {
                     return this.ejs("unitList", context, { masters: this.system.masters });
@@ -773,7 +778,7 @@ class SmartApp extends webapp_1.WebApp {
                     context.getMaster("id");
                     const master = this.system.findMaster(context["masterAddress"], context["masterPort"]);
                     if (master)
-                        return this.ejs("masterDetail", context, { nodes: master.nodes, config: master.getConfig() });
+                        return this.ejs("masterDetail", context, { nodes: master.nodes, config: master.getConfig(), registers: master.registers });
                     else
                         message = "Error: Master not found";
                 }

package/server/smartapp.ts

@@ -23,6 +23,7 @@ import { Shelly } from './shelly';
 import { P1 } from './p1';
 import { post } from "../duotecno/api";
 import { setToken } from "../duotecno/config";
+import { PowerBase } from "./powerbase";
 
 const kMaster = {name: "master", type: "string", default: "0.0.0.0:5001"} as const;
 const kAddress = {name: "address", type: "string", default: "0.0.0.0"} as const;
@@ -130,6 +131,9 @@ export class SmartApp extends WebApp {
   // password //
   //////////////
   async pwOK(context: Context, user: string, pw: string): Promise<boolean> {
+    // to bypass user/pw ->
+    //return true;
+
     this.token = "";
     setToken("");
     try {
@@ -331,7 +335,7 @@ export class SmartApp extends WebApp {
     let message: string;
     const id: number = parseInt(context.id);
     const type = context.getParam({name: "type", type: "string", default: "smappee"});
-    const power = this.power[type];
+    const power: PowerBase = this.power[type];
 
     if (!power) {
       return this.error(context, "Power type not implemented", false);
@@ -358,7 +362,7 @@ export class SmartApp extends WebApp {
         power.updateRule( id, this.scrapeRule(context) );
 
       } else if (context.action === "save") {
-        power.updateConfig({address: context.getParam(kAddress), uid: context.getParam(kUID), addresses: context.getParam(kAddresses), });
+        power.updateConfig({address: context.getParam(kAddress), uid: context.getParam(kUID), addresses: context.getParam(kAddresses)});
 
 
       } else if (context.action === "badd") {
@@ -387,11 +391,14 @@ export class SmartApp extends WebApp {
     return this.ejs("power", context, await power.getData(context, ""));
   }
 
-
   scrapeBinding(context: Context): Binding {
-    const binding = <Binding> <unknown> this.scrapeUnit(context, "");
-    binding.channel = context.getParam({name: "channel", type: "string", default: "0"});
-    return binding;
+    context.getMaster("action");
+    const master = this.system.findMaster(context["masterAddress"], context["masterPort"]);
+    const register = context.getParam({ name: "register", type: "integer", default: 0 });
+    const channel = context.getParam({name: "channel", type: "string", default: "0"})
+    
+    return { masterAddress: context["masterAddress"], masterPort: context["masterPort"], 
+             register, channel };
   }
 
   scrapeAction(context: Context, boundary: string): Action {
@@ -824,7 +831,7 @@ export class SmartApp extends WebApp {
     try {
 
       if (context.action === "new") {
-        return this.ejs("masterDetail", context, { config: Sanitizers.masterConfig(null) });
+        return this.ejs("masterDetail", context, { config: Sanitizers.masterConfig(null), registers: [], nodes: [] });
 
       } else if (context.action === "list") {
         return this.ejs("unitList", context, { masters: this.system.masters });
@@ -836,7 +843,7 @@ export class SmartApp extends WebApp {
         context.getMaster("id");
         const master = this.system.findMaster(context["masterAddress"], context["masterPort"]);
         if (master)
-          return this.ejs("masterDetail", context, { nodes: master.nodes, config: master.getConfig() });
+          return this.ejs("masterDetail", context, { nodes: master.nodes, config: master.getConfig(), registers: master.registers });
         else
           message = "Error: Master not found";
 

package/server/somfy.ts

@@ -160,13 +160,15 @@ export async function stop(screen: number): Promise<boolean> {
 // }
   
 busy = true;
+
 setup().then(() => {
   debug("somfy", "gpio package initialized");
   init = true;
   busy = false;
+  
 }).catch((e) => {
-  debug("somfy", "error setting up gpio package - running test mode");
-  debug("somfy", e);
+  debug("somfy", "gpio package not initialized");
+  if (e.code != "EACCES") debug("somfy", e);
   init = false;
   busy = false;
 });

package/server/views/master-detail.ejs

@@ -96,6 +96,22 @@
           </tbody>
         </table>
         <% } %>
+
+        <h1>Registers</h1>
+        <% if (Object.keys(registers).length) { %>
+          <table>
+          <thead>
+            <tr><th>Nr</th><th>Value</th></tr>
+          </thead>
+          <tbody>
+            <% for (let ix in registers) {  %>
+              <tr><td><%= ix %></td><td><%= registers[ix] %></td></tr>
+            <% } %>
+          </tbody>
+        </table>
+        <% } else { %>
+          <p>No registers yet</p>
+        <% } %>
       </form>
       <%- include('/views/footer'); -%>
     </body>

package/server/views/master-list.ejs

@@ -26,6 +26,7 @@
               <th>Address:port</th>
               <th>Nodes</th>
               <th>Action</th>
+              <th>Protocol</th>
             </tr>
           </thead>
     
@@ -36,6 +37,7 @@
               <td><a href="/masters/edit/<%= master.config.address %>:<%= master.config.port %>"><%= master.config.address %></a></td>
               <td><a href="/masters/edit/<%= master.config.address %>:<%= master.config.port %>"><%= master.nodes.length %></a></td>
               <td><a href="/masters/close/<%= master.config.address %>:<%= master.config.port %>">close connection</a></td>
+              <td><a href="/masters/edit/<%= master.config.address %>:<%= master.config.port %>"><%= master.protocol %></a></td>
             </tr>
           <% }} %>
           </tbody>

package/server/views/power-binding.ejs

@@ -46,9 +46,9 @@
     
         <div class="row">
           <div class="input-field col s12">
-            <input placeholder="0" id="unit" name="unit" type="text" 
-                   value="<%= hex(binding.logicalNodeAddress) %>;<%= hex(binding.logicalAddress) %>">
-            <label for="unit">Unit</label>
+            <input placeholder="0" id="register" name="register" type="text" 
+                   value="<%= binding.register %>">
+            <label for="unit">Register</label>
           </div>
         </div>
 

package/server/views/power.ejs

@@ -87,11 +87,11 @@
           <button class="right btn waves-effect waves-light" type="submit" name="action" value="badd">Add Binding</button>
         </h1>
         <table style="width: 75%; min-width: 350px">
-          <tr><th>Id</th><th>Channels</th><th>Power</th><th>Name</th><th>Address</th></tr>
+          <tr><th>Id</th><th>Channels</th><th>Value</th><th>Register</th></tr>
           <% for (let inx in bindings) { const b = bindings[inx] %>
             <tr><th><a href="/power/binding/<%= inx %>?type=<%= type%>">Binding <%= inx %></a></th>
-                <td><%= b.channel %></td><td><%= b.power %>W</td><td><%= b.name %></td>
-                <td><%= hex(b.logicalNodeAddress) %>;<%= hex(b.logicalAddress) %></td></tr>
+                <td><%= b.channel %></td><td><%= b.value %></td>
+                <td><%= b.register %></td></tr>
           <% } %>
         </table>