homebridge-smartsystem 6.4.5 → 6.4.6

package/config.json

@@ -315,7 +315,7 @@
         "masterPort": 5001,
         "name": "<Solar Panels",
         "displayName": "<Solar Panels",
-        "extendedType": 0,
+        "extendedType": 4,
         "active": "N",
         "used": "Y",
         "group": 0
@@ -327,7 +327,7 @@
         "masterPort": 5001,
         "name": ">Cars",
         "displayName": ">Cars",
-        "extendedType": 0,
+        "extendedType": 4,
         "active": "N",
         "used": "Y",
         "group": 0
@@ -339,7 +339,7 @@
         "masterPort": 5001,
         "name": ">Grid",
         "displayName": ">Grid",
-        "extendedType": 0,
+        "extendedType": 4,
         "active": "N",
         "used": "Y",
         "group": 0
@@ -351,7 +351,7 @@
         "masterPort": 5001,
         "name": ">Swimmingpool",
         "displayName": ">Swimmingpool",
-        "extendedType": 0,
+        "extendedType": 4,
         "active": "N",
         "used": "Y",
         "group": 0

package/duotecno/protocol.ts

@@ -268,7 +268,7 @@ export class Unit {
     if (this.type === UnitType.kSwitchingMotor)
       return (((this.value == UnitState.kOpening) && (value == 4)) ||
               ((this.value == UnitState.kClosing) && (value == 5)) ||
-              ((this.value <= UnitState.kOpen) && (value == 3)));
+              ((this.value as number <= UnitState.kOpen) && (value == 3)));
     else
       return this.value == value;
   }
@@ -803,7 +803,7 @@ export const Protocol = {
 
       case UnitType.kInput:
       case UnitType.kMood:
-        if (value < 0)
+        if (value as number < 0)
           return { cmd: Cmd.SetControl, method: 2 }; // short pulse
         else
           return { cmd: Cmd.SetControl, method: 3, value: (value) ? 1 : 0 };  // long event + 0/1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebridge-smartsystem",
   "displayname": "Duotecno Bridge",
-  "version": "6.4.5",
+  "version": "6.4.6",
   "description": "SmartServer (Proxy Websockets to TCP sockets, Smappee MQTT, Duotecno IP Nodes, Homekit interface)",
   "main": "index.js",
   "author": "Johan Coppieters",

package/server/smartapp.js

@@ -881,11 +881,32 @@ class SmartApp extends webapp_1.WebApp {
                 // reponding to  /units/[master ip address:port]/[logical node address]
                 const nodeLogicalAddress = parseInt(context.id);
                 let response = yield this.getNodeInfo(master, nodeLogicalAddress, true);
+                this.adjustUnitsToConfig(response.node);
                 let N = this.sortCopy(response.node, context);
                 return this.ejs("nodeDetail", context, { message: response.message, node: N });
             }
         });
     }
+    adjustUnitsToConfig(node) {
+        // check if units are still in config
+        node.units.forEach(unit => {
+            //console.log("Searching: ", unit.node.master.config.address, unit.node.master.config.port, unit.logicalNodeAddress, unit.logicalAddress)
+            const config = this.system.config.cunits.find(u => {
+                // console.log(u.masterAddress, u.masterPort, u.logicalNodeAddress, u.logicalAddress, ((unit.node.master.hasAddress(u.masterAddress) &&
+                // unit.node.master.hasPort(u.masterPort) && 
+                // (u.logicalNodeAddress == unit.logicalNodeAddress) && 
+                // (u.logicalAddress === unit.logicalAddress))));
+                return (unit.node.master.hasAddress(u.masterAddress) &&
+                    unit.node.master.hasPort(u.masterPort) &&
+                    (u.logicalNodeAddress == unit.logicalNodeAddress) &&
+                    (u.logicalAddress === unit.logicalAddress));
+            });
+            if (config) {
+                unit.extendedType = config.extendedType;
+                unit.name = config.displayName;
+            }
+        });
+    }
     sortCopy(N, context) {
         // only need to re-sort if onAddress is requested, units should always be sorted on name
         const S = context["sortOnAddr"] = context.getParam({ name: "sortOnAddr", type: "string", default: "N" });

package/server/smartapp.ts

@@ -943,11 +943,34 @@ export class SmartApp extends WebApp {
       // reponding to  /units/[master ip address:port]/[logical node address]
       const nodeLogicalAddress = parseInt(context.id);
       let response = await this.getNodeInfo(master, nodeLogicalAddress, true);
+      this.adjustUnitsToConfig(response.node);
       let N = this.sortCopy(response.node, context);
       return this.ejs("nodeDetail", context, { message: response.message, node: N });
     }    
   }
 
+  adjustUnitsToConfig(node: Node) {
+    // check if units are still in config
+    node.units.forEach(unit => {
+      //console.log("Searching: ", unit.node.master.config.address, unit.node.master.config.port, unit.logicalNodeAddress, unit.logicalAddress)
+      const config = this.system.config.cunits.find(u => {
+        // console.log(u.masterAddress, u.masterPort, u.logicalNodeAddress, u.logicalAddress, ((unit.node.master.hasAddress(u.masterAddress) &&
+        // unit.node.master.hasPort(u.masterPort) && 
+        // (u.logicalNodeAddress == unit.logicalNodeAddress) && 
+        // (u.logicalAddress === unit.logicalAddress))));
+
+        return (unit.node.master.hasAddress(u.masterAddress) &&
+                unit.node.master.hasPort(u.masterPort) && 
+                (u.logicalNodeAddress == unit.logicalNodeAddress) && 
+                (u.logicalAddress === unit.logicalAddress));
+      });
+      if (config) {
+        unit.extendedType = config.extendedType;
+        unit.name = config.displayName;
+      }
+    });
+  }
+
 
   sortCopy(N: Node, context: Context): Node {
     // only need to re-sort if onAddress is requested, units should always be sorted on name

package/server/views/nav.ejs

@@ -8,7 +8,7 @@
       <% if (hasP1) { %><li <%= ((request === "power") && (type === "p1")) ? 'class="active"' : '' %></li><a href="/power?type=p1">P1</a></li><% } %>
       <% if (hasShelly) { %><li <%= ((request === "power") && (type === "shelly")) ? 'class="active"' : '' %></li><a href="/power?type=shelly">Shelly PM</a></li><% } %>
       <li <%= (request === "switches") ? 'class="active"' : '' %></li><a href="/switches">Switches</a></li>
-      <li <%= (request === "settings") ? 'class="active"' : '' %></li><a href="/settings">Settings</a></li>
+      <!-- li <%= (request === "settings") ? 'class="active"' : '' %></li><a href="/settings">Settings</a></li -->
     </ul>
   </div>
 </nav>

package/server/views/switch-list.ejs

@@ -23,7 +23,7 @@
         <table>
           <thead>
             <tr>
-              <th>Name</th><th>Plug/Http</th><th>Addr</th><th>State</th>
+              <th>Name</th><th>Plug/Http</th><th>Addr</th><!-- th>State</th -->
             </tr>
           </thead>
     
@@ -33,7 +33,7 @@
                 <td><a href="/switches/edit/<%= inx %>"><%= swtch.name %></a><br><small><%= swtch.type %></small></td>
                 <td><a href="/switches/edit/<%= inx %>"><%= swtch.plug %></a></td>
                 <td><a href="/switches/edit/<%= inx %>"><%= hex(swtch.logicalNodeAddress) %>/<%= hex(swtch.logicalAddress) %></a></td>
-                <td>
+                <!--td>
                   <div class="switch">
                     <label>Off
                       <input name="status_<%= swtch.name %>" <%= (swtch.status) ? 'checked' : '' %>
@@ -41,7 +41,7 @@
                       <span class="lever"></span>On
                     </label>
                   </div>
-                </td>
+                </td -->
               </tr>
             <% } %>
           </tbody>