homebridge-smartsystem 6.8.0 → 6.8.3

package/README.md

@@ -301,8 +301,12 @@ Homebridge UI version
 - 3: do dimmers/up-downs
 - 4: better up-down values to and from HB
 
+
 ### v6.8.0 - 08/07/2025
 - 0: first version including the proxy
+- 1: max/min values for hbValues
+- 2: HB up/down -> don't respond to motor unit's, only macro
+- 3: remember request before the login kicked in (and redirect to that one, once the login was succesful)
 
 ## Hardware 
 A Raspberry Pi that connects to a Duotecno IP Node 

package/config.json

@@ -194,42 +194,6 @@
         "type": "httpdim",
         "plug": "http://192.168.0.96/light/0?brightness=$&turn=#"
       },
-      {
-        "logicalNodeAddress": 252,
-        "logicalAddress": 105,
-        "masterAddress": "192.168.0.97",
-        "masterPort": 5001,
-        "name": "Screen Salon Top",
-        "displayName": "Screen Salon Top",
-        "extendedType": 0,
-        "nomacro": "N",
-        "nostop": "N",
-        "unitName": "Salon Top",
-        "value": 0,
-        "data": "",
-        "header": "",
-        "method": "GET",
-        "type": "somfy",
-        "plug": "1"
-      },
-      {
-        "logicalNodeAddress": 252,
-        "logicalAddress": 104,
-        "masterAddress": "192.168.0.97",
-        "masterPort": 5001,
-        "name": "Screen Tim small",
-        "displayName": "Screen Tim small",
-        "extendedType": 0,
-        "nomacro": "N",
-        "nostop": "Y",
-        "unitName": "Tim Small",
-        "value": 0,
-        "data": "",
-        "header": "",
-        "method": "GET",
-        "type": "httpupdown",
-        "plug": "2"
-      },
       {
         "logicalNodeAddress": 16,
         "logicalAddress": 35,
@@ -254,8 +218,8 @@
     "password": "GMTecno",
     "links": [
       {
-        "logicalNodeAddress": 3,
-        "logicalAddress": 30,
+        "logicalNodeAddress": 252,
+        "logicalAddress": 104,
         "masterAddress": "192.168.0.97",
         "masterPort": 5001,
         "name": "unit",
@@ -269,7 +233,9 @@
           "TargetPosition",
           "ObstructionDetected"
         ],
-        "type": "accessory"
+        "type": "accessory",
+        "max": 100,
+        "min": 0
       }
     ]
   },
@@ -304,7 +270,7 @@
         "masterPort": 5001,
         "name": "<Solar Panels",
         "displayName": "<Solar Panels",
-        "extendedType": 4,
+        "extendedType": 0,
         "active": "N",
         "used": "Y",
         "group": 0
@@ -316,7 +282,7 @@
         "masterPort": 5001,
         "name": ">Cars",
         "displayName": ">Cars",
-        "extendedType": 4,
+        "extendedType": 0,
         "active": "N",
         "used": "Y",
         "group": 0
@@ -328,7 +294,7 @@
         "masterPort": 5001,
         "name": ">Grid",
         "displayName": ">Grid",
-        "extendedType": 4,
+        "extendedType": 0,
         "active": "N",
         "used": "Y",
         "group": 0
@@ -340,11 +306,23 @@
         "masterPort": 5001,
         "name": ">Swimmingpool",
         "displayName": ">Swimmingpool",
-        "extendedType": 4,
+        "extendedType": 0,
         "active": "N",
         "used": "Y",
         "group": 0
       },
+      {
+        "logicalNodeAddress": 252,
+        "logicalAddress": 104,
+        "masterAddress": "192.168.0.97",
+        "masterPort": 5001,
+        "name": "Tim Small",
+        "displayName": "Tim Small",
+        "extendedType": 8,
+        "active": "Y",
+        "used": "Y",
+        "group": 0
+      },
       {
         "logicalNodeAddress": 252,
         "logicalAddress": 7,
@@ -365,7 +343,7 @@
         "name": "Garage $",
         "displayName": "Garage ",
         "extendedType": 8,
-        "active": "N",
+        "active": "Y",
         "used": "Y",
         "group": 0
       },
@@ -376,7 +354,7 @@
         "masterPort": 5001,
         "name": "2|Dimmer",
         "displayName": "Somfy Dimmer",
-        "extendedType": 0,
+        "extendedType": 1,
         "active": "Y",
         "used": "Y",
         "group": 0
@@ -388,7 +366,7 @@
         "masterPort": 5001,
         "name": "Blue LED",
         "displayName": "Blue LED",
-        "extendedType": 0,
+        "extendedType": 1,
         "active": "N",
         "used": "Y",
         "group": 0
@@ -400,7 +378,7 @@
         "masterPort": 5001,
         "name": "Red LED",
         "displayName": "Red LED",
-        "extendedType": 0,
+        "extendedType": 1,
         "active": "N",
         "used": "Y",
         "group": 0

package/duotecno/logger.js

@@ -15,7 +15,7 @@ var LogLevel;
 exports.logSettings = {
     "*": LogLevel.log,
     "master": LogLevel.log,
-    "protocol": LogLevel.debug,
+    "protocol": LogLevel.noLog,
     "webapp": LogLevel.log,
     "p1": LogLevel.log,
     "shelly": LogLevel.log,

package/duotecno/logger.ts

@@ -10,7 +10,7 @@ export enum LogLevel { noLog = 0, log = 1, debug = 2 };
 export const logSettings = {
   "*": LogLevel.log,
   "master": LogLevel.log,
-  "protocol": LogLevel.debug,
+  "protocol": LogLevel.noLog,
   "webapp": LogLevel.log,
   "p1": LogLevel.log,
   "shelly": LogLevel.log,

package/duotecno/protocol.js

@@ -790,6 +790,7 @@ exports.Protocol = {
         }
         else if (next.cmd === Rec.Motor) {
             // motor -> boolean/status
+            // [38,0,252,104,8,0,0]
             // 0 = stopped, 1 stopped/down, 2 = stopped/up, 3 = busy/down, 4 = busy/up
             unit.status = next.message[6];
             unit.value = next.message[6];
@@ -800,7 +801,8 @@ exports.Protocol = {
             // = EV_UNITMACROCOMMANDO
             // examples: On 50%: [69,0,NodeAddress,UnitAddress,6,1,0,50]
             //           Off:    [69,0,NodeAddress,UnitAddress,6,0,0,0] -> don't touch dimmer value
-            // STATUS
+            // unit_type_duoswitch -> Event = 32, state 0, 1, 2 
+            // STATUS (Event: 7 = dimmer, 5 = switch, on = 1, off = 0)
             if (((next.message[4] == 7) || (next.message[4] == 5)) && (next.message[5] == 1)) {
                 // PIR ON -- override status value with "2" (our PIR ON)
                 unit.status = 2;
@@ -815,6 +817,13 @@ exports.Protocol = {
                 (next.message[4] === 11)) {
                 unit.value = this.makeWord(next.message, 6);
             }
+            else if (next.message[4] === 32) {
+                // unit_type_duoswitch -> Event = 32 
+                // [69,0,252,104,32,2,0,0]
+                // state = 0 -> stop, state = 1 -> up, state = 2 -> down
+                unit.value = 10 + next.message[5];
+                unit.status = next.message[5];
+            }
             (0, logger_1.debug)("protocol", "received status - macro -> value=" + unit.value + " / status=" + unit.status);
             kind = "M";
         }

package/duotecno/protocol.ts

@@ -913,6 +913,7 @@ export const Protocol = {
 
     } else if (next.cmd === Rec.Motor) {
       // motor -> boolean/status
+      // [38,0,252,104,8,0,0]
       // 0 = stopped, 1 stopped/down, 2 = stopped/up, 3 = busy/down, 4 = busy/up
       unit.status = next.message[6];
       unit.value = next.message[6];
@@ -923,8 +924,9 @@ export const Protocol = {
       // = EV_UNITMACROCOMMANDO
       // examples: On 50%: [69,0,NodeAddress,UnitAddress,6,1,0,50]
       //           Off:    [69,0,NodeAddress,UnitAddress,6,0,0,0] -> don't touch dimmer value
+      // unit_type_duoswitch -> Event = 32, state 0, 1, 2 
 
-      // STATUS
+      // STATUS (Event: 7 = dimmer, 5 = switch, on = 1, off = 0)
       if (((next.message[4] == 7) || (next.message[4] == 5)) && (next.message[5] == 1)) {
         // PIR ON -- override status value with "2" (our PIR ON)
         unit.status = 2;
@@ -939,6 +941,13 @@ export const Protocol = {
       if ((((next.message[4] === 1) || (next.message[4] === 6) || (next.message[4] === 7)) && (next.message[5] === 1)) || 
           (next.message[4] === 11)) {
         unit.value = this.makeWord(next.message, 6);
+
+      } else if (next.message[4] === 32) {
+        // unit_type_duoswitch -> Event = 32 
+        // [69,0,252,104,32,2,0,0]
+        // state = 0 -> stop, state = 1 -> up, state = 2 -> down
+        unit.value = 10 + next.message[5];
+        unit.status = next.message[5];
       }
       
       debug("protocol", "received status - macro -> value=" + unit.value + " / status=" + unit.status);

package/duotecno/types.js

@@ -154,7 +154,7 @@ var LinkType;
     LinkType["kNoType"] = "";
     LinkType["kAccessory"] = "accessory";
 })(LinkType = exports.LinkType || (exports.LinkType = {}));
-exports.kEmptyLink = Object.assign(Object.assign({}, exports.kEmptyUnit), { type: LinkType.kAccessory, accName: "acc", accId: "", accService: [] });
+exports.kEmptyLink = Object.assign(Object.assign({}, exports.kEmptyUnit), { type: LinkType.kNoType, max: 100, min: 0, accName: "acc", accId: "", accService: [] });
 exports.kEmptyBinding = {
     channel: "0", masterAddress: "0.0.0.0", masterPort: 5001, register: 0
 };
@@ -301,7 +301,9 @@ exports.Sanitizers = {
         link.accId = aLink.accId || "";
         link.accName = aLink.accName || "";
         link.accService = aLink.accService || [];
-        link.type = aLink.type || LinkType.kNoType;
+        link.type = aLink.type || exports.kEmptyLink.type;
+        link.max = aLink.max || exports.kEmptyLink.max;
+        link.min = aLink.min || exports.kEmptyLink.min;
         return link;
     },
     switchConfig: function (aSwitch) {

package/duotecno/types.ts

@@ -269,13 +269,15 @@ export interface Link extends UnitDef{
   accId: string;
   accService: Array<string>; // e.g. ["On", "Brightness"], ["TargetPosition", "CurrentPosition", ...]
   type: LinkType;
+  max?: number;
+  min?: number;
   unit?: Unit;
   dtValue?: number | boolean | string;
   hbValue?: number | boolean | string
 }
 
 export const kEmptyLink: Link = { 
-  ...kEmptyUnit, type: LinkType.kAccessory, accName: "acc", accId: "", accService: []
+  ...kEmptyUnit, type: LinkType.kNoType, max: 100, min: 0, accName: "acc", accId: "", accService: []
 };
 
 
@@ -519,7 +521,9 @@ export const Sanitizers = {
     link.accId = aLink.accId || "";
     link.accName = aLink.accName || "";
     link.accService = aLink.accService || [];
-    link.type = aLink.type || LinkType.kNoType;
+    link.type = aLink.type || kEmptyLink.type;
+    link.max = aLink.max || kEmptyLink.max;
+    link.min = aLink.min || kEmptyLink.min;
     return link;
   },
 

package/package.json

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

package/server/HB.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hbUnsubscribe = exports.hbSubscribe = exports.hbGetValue = exports.hbSetState = exports.dt2hbvalue = exports.hb2dtvalue = exports.hbLogin = exports.hbAccessories = exports.hbService = exports.hbName = void 0;
+exports.hbUnsubscribe = exports.hbSubscribe = exports.hbStop = exports.hbGetValue = exports.hbSetState = exports.dt2hbvalue = exports.hb2dtvalue = exports.hbLogin = exports.hbAccessories = exports.hbService = exports.hbName = void 0;
 const logger_1 = require("../duotecno/logger");
 const HA_API_1 = require("./HA-API");
 let gAccessories = [];
@@ -173,14 +173,15 @@ function hbLoad(value, service) {
             return (value) ? 100 : 0;
         }
         else if (typeof value === "number") {
-            if (value <= 2) {
+            value = Math.round(value);
+            if (value <= 1) {
                 return 0;
             }
-            else if (value >= 98) {
+            else if (value >= 99) {
                 return 100;
             }
             else {
-                return Math.round(value);
+                return value;
             }
         }
     }
@@ -217,16 +218,31 @@ function hb2dtvalue(unit, value) {
     return { dtTarget, dtValue };
 }
 exports.hb2dtvalue = hb2dtvalue;
-function dt2hbvalue(unit, dontChangeValue) {
-    let value = (typeof unit.value === "boolean") ? (unit.value ? 100 : 0) : Math.round(unit.value);
-    // status Motor: 0 = stopped, 1 stopped/down, 2 = stopped/up, 3 = busy/down, 4 = busy/up
-    if (unit.isUpDown())
-        return ((value === 1) || (value === 3)) ? 0 : ((value === 2) || (value === 4)) ? 100 : dontChangeValue;
-    if (unit.isDimmer())
-        return (value <= 2) ? 0 : (value >= 99) ? 100 : value;
-    if (unit.isSwitch() || unit.isMood())
-        return (value) ? 1 : 0;
-    return value;
+function dt2hbvalue(unit, dontChangeValue, min, max) {
+    // tunr into (rounded) number
+    let value = (typeof unit.value === "boolean") ? (unit.value ? max : min) : Math.round(unit.value);
+    // Virtual motor: state = 0 -> stop, state = 1 -> up, state = 2 -> down
+    // Real motor: 0 = stopped, 1 stopped/down, 2 = stopped/up, 3 = busy/down, 4 = busy/up
+    if (unit.isUpDown()) {
+        // don't send status of real motor
+        return (value == 10) ? -1 : // stop       [ virtual ]
+            (value == 11) ? max : // up         [ virtual ]
+                (value == 12) ? min : undefined; // down       [ virtual ]
+        // return ((value === 1) || (value === 3)) ? min :    // down       [ motor ]
+        //         ((value === 2) || (value === 4)) ? max :   // up         [ motor ]
+        //         (value == 0) ? dontChangeValue :           // no change  [ motor ]
+        //         (value == 10) ? -1 :                       // stop       [ virtual ]
+        //         (value == 11) ? max : min;                 // up/down    [ virtual ]
+    }
+    else if (unit.isDimmer()) {
+        return (value <= 1) ? 0 : (value >= 99) ? 100 : value;
+    }
+    else if (unit.isSwitch() || unit.isMood()) {
+        return (value) ? max : min;
+    }
+    else {
+        return value;
+    }
 }
 exports.dt2hbvalue = dt2hbvalue;
 function hbValue(data, service) {
@@ -276,6 +292,28 @@ function hbGetValue(server, id, service, token) {
     });
 }
 exports.hbGetValue = hbGetValue;
+function hbStop(server, id, service, token) {
+    return __awaiter(this, void 0, void 0, function* () {
+        // does not exist, but we'll do a getCurrentPosition + setTargetPosition to this value
+        const respBody = yield (0, HA_API_1.httpRequest)(server + "/api/accessories/" + id, 'GET', "", HA_API_1.ContentType.json, {
+            Authorization: 'Bearer ' + token
+        });
+        if (respBody && respBody.error) {
+            (0, logger_1.log)("HB", "hbGetState: " + id + " -> error: " + JSON.stringify(respBody));
+            return undefined;
+        }
+        else if (respBody && respBody.values) {
+            (0, logger_1.log)("HB", "hbStop GetState: " + id + " -> " + JSON.stringify(respBody.values));
+            const data = { value: respBody.values.CurrentPosition, characteristicType: "TargetPosition" };
+            (0, logger_1.log)("HB", "hbStop SetState: " + id + " -> " + JSON.stringify(data));
+            yield (0, HA_API_1.httpRequest)(server + "/api/accessories/" + id, 'PUT', JSON.stringify(data), HA_API_1.ContentType.json, {
+                Authorization: 'Bearer ' + token
+            });
+            return hbValue(respBody.values, service);
+        }
+    });
+}
+exports.hbStop = hbStop;
 function hbSubscribe(callback) {
     if (timer) {
         clearInterval(timer);

package/server/HB.ts

@@ -177,12 +177,13 @@ function hbLoad(value: number | boolean, service: Array<string>): Record<string,
     if (typeof value === "boolean") {
       return (value) ? 100 : 0;
     } else if (typeof value === "number") {
-      if (value <= 2) {
+      value = Math.round(value);
+      if (value <= 1) {
         return 0;
-      } else if (value >= 98) {
+      } else if (value >= 99) {
         return 100;  
       } else {
-        return Math.round(value);
+        return value;
       }
     }
   }
@@ -223,16 +224,32 @@ export function hb2dtvalue(unit: Unit, value: number | boolean): {dtValue: numbe
   return {dtTarget, dtValue};
 }
 
-export function dt2hbvalue(unit: Unit, dontChangeValue: number): number {
-  let value = (typeof unit.value === "boolean") ? (unit.value ? 100 : 0) : Math.round(unit.value);
+export function dt2hbvalue(unit: Unit, dontChangeValue: number, min: number, max: number): number {
+  // tunr into (rounded) number
+  let value = (typeof unit.value === "boolean") ? (unit.value ? max : min) : Math.round(unit.value);
 
-  // status Motor: 0 = stopped, 1 stopped/down, 2 = stopped/up, 3 = busy/down, 4 = busy/up
-  if (unit.isUpDown()) return ((value === 1) || (value === 3)) ? 0 : ((value === 2) || (value === 4)) ? 100 : dontChangeValue;
-
-  if (unit.isDimmer()) return (value <= 2) ? 0 : (value >= 99) ? 100 : value;
-  if (unit.isSwitch() || unit.isMood()) return (value) ? 1 : 0;
+  // Virtual motor: state = 0 -> stop, state = 1 -> up, state = 2 -> down
+  // Real motor: 0 = stopped, 1 stopped/down, 2 = stopped/up, 3 = busy/down, 4 = busy/up
+  if (unit.isUpDown()) {
+    // don't send status of real motor
+    return (value == 10) ? -1 :                       // stop       [ virtual ]
+           (value == 11) ? max :                     // up         [ virtual ]
+           (value == 12) ? min : undefined;          // down       [ virtual ]
+    // return ((value === 1) || (value === 3)) ? min :    // down       [ motor ]
+    //         ((value === 2) || (value === 4)) ? max :   // up         [ motor ]
+    //         (value == 0) ? dontChangeValue :           // no change  [ motor ]
+    //         (value == 10) ? -1 :                       // stop       [ virtual ]
+    //         (value == 11) ? max : min;                 // up/down    [ virtual ]
+
+  } else if (unit.isDimmer()) {
+    return (value <= 1) ? 0 : (value >= 99) ? 100 : value;
+
+  } else if (unit.isSwitch() || unit.isMood()) {
+    return (value) ? max : min;
 
-  return value;
+  } else {
+    return value;
+  }
 }
 
 function hbValue(data: Record<string, any>, service: Array<string>): number {
@@ -282,6 +299,28 @@ export async function hbGetValue(server: string, id: string, service: Array<stri
    };
 }
 
+export async function hbStop(server: string, id: string, service: Array<string>, token: string) : Promise<number | undefined> {
+  // does not exist, but we'll do a getCurrentPosition + setTargetPosition to this value
+  const respBody = await httpRequest(server + "/api/accessories/"+id, 'GET', "", ContentType.json, {
+    Authorization: 'Bearer ' + token
+  });
+  if (respBody && respBody.error) {
+    log("HB", "hbGetState: " + id + " -> error: " + JSON.stringify(respBody));
+    return undefined;
+
+  } else if (respBody && respBody.values) {
+    log("HB", "hbStop GetState: " + id + " -> " + JSON.stringify(respBody.values));
+
+    const data = {value: respBody.values.CurrentPosition, characteristicType: "TargetPosition"};
+    log("HB", "hbStop SetState: " + id + " -> " + JSON.stringify(data));
+
+    await httpRequest(server + "/api/accessories/"+id, 'PUT', JSON.stringify(data), ContentType.json, {
+      Authorization: 'Bearer ' + token
+    });
+    return hbValue(respBody.values, service);
+  }
+}
+
 export function hbSubscribe(callback) {
   if (timer) {
     clearInterval(timer);

package/server/smartapp.js

@@ -460,14 +460,22 @@ class SmartApp extends webapp_1.WebApp {
             (0, logger_1.debug)("smartapp", "Received DT value from unit: " + u.getDisplayName() + " -> " + u.value + " / " + u.status + " from unit");
             for (const link of this.links) {
                 if (u.isUnit(link.masterAddress, link.masterPort, link.logicalNodeAddress, link.logicalAddress)) {
-                    const hbValue = (0, HB_1.dt2hbvalue)(u, link.hbValue);
-                    if ((typeof hbValue != "undefined") && (hbValue !== link.hbValue)) {
-                        (0, logger_1.log)("smartapp", "-> Setting HB value for accessory: " + link.accName + " to " + hbValue + " of Duotecno unit: " + u.getDisplayName() + " with value " + u.value);
-                        link.hbValue = hbValue;
-                        yield (0, HB_1.hbSetState)(this.config.apiHost + ":" + this.config.apiPort, link.accId, link.accService, hbValue, this.token);
-                    }
-                    else {
-                        (0, logger_1.debug)("smartapp", "-> No change for accessory: " + link.accName + " to " + u.value + " / " + u.status);
+                    const hbValue = (0, HB_1.dt2hbvalue)(u, link.hbValue, link.min, link.max);
+                    if (typeof hbValue != "undefined") {
+                        if (hbValue === -1) {
+                            (0, logger_1.log)("smartapp", "-> Virtual unit send 'stop' for accessory: " + link.accName + " of Duotecno unit: " + u.getDisplayName());
+                            const val = yield (0, HB_1.hbStop)(this.config.apiHost + ":" + this.config.apiPort, link.accId, link.accService, this.token);
+                            if (typeof val != "undefined")
+                                link.hbValue = val;
+                        }
+                        else if (hbValue !== link.hbValue) {
+                            (0, logger_1.log)("smartapp", "-> Setting HB value for accessory: " + link.accName + " to " + hbValue + " of Duotecno unit: " + u.getDisplayName() + " with value " + u.value);
+                            link.hbValue = hbValue;
+                            yield (0, HB_1.hbSetState)(this.config.apiHost + ":" + this.config.apiPort, link.accId, link.accService, hbValue, this.token);
+                        }
+                        else {
+                            (0, logger_1.debug)("smartapp", "-> No change for accessory: " + link.accName + " to " + u.value + " / " + u.status);
+                        }
                     }
                 }
             }
@@ -504,7 +512,7 @@ class SmartApp extends webapp_1.WebApp {
             let message;
             try {
                 if (context.action === "add") {
-                    this.links.push(types_1.kEmptyLink);
+                    this.links.push(Object.assign(Object.assign({}, types_1.kEmptyLink), { type: types_1.LinkType.kAccessory }));
                     inx = this.links.length - 1;
                     return this.ejs("linkDetail", context, { link: this.links[inx], id: inx,
                         masters: this.system.masters, accessories, units });
@@ -536,11 +544,15 @@ class SmartApp extends webapp_1.WebApp {
         // for now only accessory links.
         const stype = context.getParam({ name: "type", type: "string", default: types_1.LinkType.kAccessory });
         const name = context.getParam({ name: "name", type: "string", default: "--" });
+        // max & min values
+        const min = context.getParam({ name: "min", type: "integer", default: 0 });
+        const max = context.getParam({ name: "max", type: "integer", default: 100 });
         // uniqiue id for the accessory
         const accId = context.getParam({ name: "accId", type: "string", default: "" });
         const accName = (0, HB_1.hbName)(accId);
         const accService = (0, HB_1.hbService)(accId);
-        return { accId, accName, accService, name, masterAddress, masterPort, logicalAddress, logicalNodeAddress, type: stype };
+        return { accId, accName, accService, name, masterAddress, masterPort, logicalAddress, logicalNodeAddress, type: stype, min, max };
+        ;
     }
     updateLink(inx, link) {
         if ((inx >= 0) && (inx < this.links.length)) {

package/server/smartapp.ts

@@ -22,7 +22,7 @@ import { Shelly } from './shelly';
 import { P1 } from './p1';
 import { setToken } from "../duotecno/config";
 import { PowerBase } from "./powerbase";
-import { dt2hbvalue, hb2dtvalue, hbAccessories, hbGetValue, hbLogin, hbName, hbService, hbSetState, hbSubscribe } from "./HB";
+import { dt2hbvalue, hb2dtvalue, hbAccessories, hbGetValue, hbLogin, hbName, hbService, hbSetState, hbStop, hbSubscribe } from "./HB";
 import { httpRequest, ContentType } from "./HA-API";
 import { cleanStart, kEmptyProxy, ProxyConfig, setProxyConfig } from "./proxy";
 
@@ -279,7 +279,7 @@ export class SmartApp extends WebApp {
 
     } else if (context.action === "restart") {
       cleanStart(true);
-      
+
     } else {
       // just show the proxy config
     }
@@ -515,15 +515,22 @@ export class SmartApp extends WebApp {
     debug("smartapp", "Received DT value from unit: " + u.getDisplayName() + " -> " + u.value + " / " + u.status + " from unit");
     for (const link of this.links) {
       if (u.isUnit(link.masterAddress, link.masterPort, link.logicalNodeAddress, link.logicalAddress)) {
-        const hbValue = dt2hbvalue(u, link.hbValue as number);
-
-        if ((typeof hbValue != "undefined") && (hbValue !== link.hbValue)) {
-          log("smartapp", "-> Setting HB value for accessory: " + link.accName + " to " + hbValue + " of Duotecno unit: " + u.getDisplayName() + " with value " + u.value);
-          link.hbValue = hbValue;
-          await hbSetState(this.config.apiHost +":"+ this.config.apiPort, link.accId, link.accService, hbValue, this.token);
-
-        } else {
-          debug("smartapp", "-> No change for accessory: " + link.accName + " to " + u.value + " / " + u.status);
+        const hbValue = dt2hbvalue(u, link.hbValue as number, link.min, link.max);
+
+        if (typeof hbValue != "undefined") {
+          if (hbValue === -1) {
+            log("smartapp", "-> Virtual unit send 'stop' for accessory: " + link.accName + " of Duotecno unit: " + u.getDisplayName());
+            const val = await hbStop(this.config.apiHost +":"+ this.config.apiPort, link.accId, link.accService, this.token);
+            if (typeof val != "undefined") link.hbValue = val;
+            
+          } else if (hbValue !== link.hbValue) {
+            log("smartapp", "-> Setting HB value for accessory: " + link.accName + " to " + hbValue + " of Duotecno unit: " + u.getDisplayName() + " with value " + u.value);
+            link.hbValue = hbValue;
+            await hbSetState(this.config.apiHost +":"+ this.config.apiPort, link.accId, link.accService, hbValue, this.token);
+
+          } else {
+            debug("smartapp", "-> No change for accessory: " + link.accName + " to " + u.value + " / " + u.status);
+          }
         }
       }
     };
@@ -559,7 +566,7 @@ export class SmartApp extends WebApp {
     let message: string;
     try {
       if (context.action === "add") {
-        this.links.push(kEmptyLink);
+        this.links.push({...kEmptyLink, type: LinkType.kAccessory});
         inx = this.links.length-1;
         return this.ejs("linkDetail", context, { link: this.links[inx], id: inx,
                                                  masters: this.system.masters, accessories, units });
@@ -594,11 +601,15 @@ export class SmartApp extends WebApp {
     const stype = context.getParam({name: "type", type: "string", default: LinkType.kAccessory });
     const name = context.getParam({name: "name", type: "string", default: "--" });
 
+    // max & min values
+    const min = context.getParam({name: "min", type: "integer", default: 0 });
+    const max = context.getParam({name: "max", type: "integer", default: 100 });
+
     // uniqiue id for the accessory
     const accId = context.getParam({name: "accId", type: "string", default: "" });
     const accName = hbName(accId);
     const accService = hbService(accId);
-    return { accId, accName, accService, name, masterAddress, masterPort, logicalAddress, logicalNodeAddress, type: stype };
+    return { accId, accName, accService, name, masterAddress, masterPort, logicalAddress, logicalNodeAddress, type: stype, min, max};;
   }
 
   updateLink(inx: number, link: Link) {

package/server/views/link-details.ejs

@@ -66,8 +66,6 @@
             </select>
             <label for="unitSelector">or Pick a unit</label>
           </div>
-
-          </div>
         </div>
 
         <div class="row">
@@ -89,6 +87,18 @@
           </div>
         </div>
 
+        <div class="row">
+          <div class="input-field col s4">
+            <label for="min">Off value</label>
+            <input placeholder="0" id="min" name="min" type="text" value="<%= link.min %>">
+          </div>
+
+          <div class="input-field col s4">
+            <label for="max">On value</label>
+            <input placeholder="0" id="mx" name="max" type="text" value="<%= link.max %>">
+          </div>
+        </div>
+
       </form>
       <%- include('/views/footer'); -%>
 

package/server/webapp.js

@@ -20,7 +20,7 @@ const url = require("url");
 const qs = require("querystring");
 const base_1 = require("./base");
 const types = require("../duotecno/types");
-const LogLevel = require("../duotecno/logger");
+const logger = require("../duotecno/logger");
 const logger_1 = require("../duotecno/logger");
 const child_process_1 = require("child_process");
 ;
@@ -310,9 +310,10 @@ class WebApp extends base_1.Base {
     doServe(req, res) {
         return __awaiter(this, void 0, void 0, function* () {
             const context = yield this.parseRequest(req, res);
+            let prevRequest = "";
             try {
                 if (this.needsLogin(context)) {
-                    LogLevel.debug("webapp", "checking ticket: " + context.cookies["DTicket"] + " = " + this.token + " for " + context.request + "/" + context.action + " => " + (context.cookies["DTicket"] == this.token));
+                    logger.debug("webapp", "checking ticket: " + context.cookies["DTicket"] + " = " + this.token + " for " + context.request + "/" + context.action + " => " + (context.cookies["DTicket"] == this.token));
                     // if a password is set, check if the tickets is valid, if not: redirect to login page
                     if (!this.token || (context.cookies["DTicket"] != this.token)) {
                         context.request = "login";
@@ -320,6 +321,10 @@ class WebApp extends base_1.Base {
                     }
                 }
                 const httpResult = yield this.doRequest(context);
+                // see if we can go to the original request...
+                if ((context.request === "login") && (context.path != "/login")) {
+                    httpResult.header = Object.assign(Object.assign({}, httpResult.header), { "Set-Cookie": "DPath=" + context.path });
+                }
                 return httpResult;
             }
             catch (e) {
@@ -393,10 +398,11 @@ class WebApp extends base_1.Base {
             const pw = context.getParam({ name: "password", type: "string" });
             const user = context.getParam({ name: "user", type: "string" });
             if (yield this.pwOK(context, user, pw)) {
-                return this.redirect("/", { "Set-Cookie": "DTicket=" + this.token });
+                const path = context.getCookie("DPath") || "/";
+                return this.redirect(path, { "Set-Cookie": "DTicket=" + this.token });
             }
             else {
-                return this.ejs("login", context, { message: "authentication failed" }, { "Set-Cookie": "DTicket=x" });
+                return this.ejs("login", context, { message: "authentication failed", user }, { "Set-Cookie": "DTicket=x" });
             }
         });
     }

package/server/webapp.ts

@@ -9,7 +9,7 @@ import * as url from "url";
 import * as qs from "querystring";
 import { Base } from './base';
 import * as types from "../duotecno/types";
-import * as LogLevel from "../duotecno/logger";
+import * as logger from "../duotecno/logger";
 import { log } from "../duotecno/logger";
 import { exec } from "child_process";
 
@@ -372,15 +372,20 @@ export class WebApp extends Base {
 
   async doServe(req: http.IncomingMessage, res: http.ServerResponse): Promise<HttpResponse> {
     const context = await this.parseRequest(req, res);
+    let prevRequest = "";
     try {
       if (this.needsLogin(context)) {
-        LogLevel.debug("webapp", "checking ticket: " + context.cookies["DTicket"] + " = " + this.token + " for " + context.request+"/"+context.action + " => " + (context.cookies["DTicket"] == this.token));
+        logger.debug("webapp", "checking ticket: " + context.cookies["DTicket"] + " = " + this.token + " for " + context.request+"/"+context.action + " => " + (context.cookies["DTicket"] == this.token));
         // if a password is set, check if the tickets is valid, if not: redirect to login page
         if (!this.token || (context.cookies["DTicket"] != this.token)) {
           context.request = "login"; context.action = "";
         }
       }
       const httpResult = await this.doRequest(context);
+      // see if we can go to the original request...
+      if ((context.request === "login") && (context.path != "/login")) {
+        httpResult.header = {...httpResult.header, "Set-Cookie": "DPath="+context.path};
+      }
       return httpResult;
 
     } catch (e) {
@@ -452,10 +457,11 @@ export class WebApp extends Base {
     const user = context.getParam({name: "user", type: "string"});
 
     if (await this.pwOK(context, user, pw)) {
-      return this.redirect("/", {"Set-Cookie": "DTicket="+this.token});
+      const path = context.getCookie("DPath") || "/"
+      return this.redirect(path, {"Set-Cookie": "DTicket="+this.token});
 
     } else {
-      return this.ejs("login", context, {message: "authentication failed"}, {"Set-Cookie": "DTicket=x"});
+      return this.ejs("login", context, {message: "authentication failed", user}, {"Set-Cookie": "DTicket=x"});
     }
   }
   async doLogout(context: Context): Promise<HttpResponse> {