homebridge-smartsystem 6.8.11 → 6.8.13

package/README.md

@@ -540,170 +540,62 @@ add a file called "ssh" to the boot partition of the sd card
 touch /Volumes/boot/ssh
 ```
 
-later: ssh pi@192.168.99.97 / pw=raspberry
 
-or, if you can access a terminal:
-sudo raspi-config
-  -> enable ssh
-  -> boot to cmdline
-
-if you want a private key on the machine
-```
-mkdir ~/.ssh
-chmod 755 ~/.ssh
-cat ~/id_rsa.pub >>  ~/.ssh/authorized_keys
-chmod 644 ~/.ssh/authorized_keys
-rm ~/id_rsa.pub
-```
-
-### other stuff
-if needed a wifi connection can be made too, add a file "wpa_supplicant.conf" to the boot partition of the sd card
-example content:
-```
-ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=netdev
-update_config=1
-
-network={ 
-ssid="MySSID" 
-psk="MyPassword" 
-}
-```
-
-
-### dns server
-If you need a dns server:
-```
-sudo vi /etc/network/interfaces
-```
-Add at end: dns-nameservers 8.8.4.4 8.8.8.8
-  => reboot
-```
-shutdown -r now
-```
-
-### nodejs (65Mb)
-Depends on version of Raspberry:
-```
-uname -a  => ARM7 of ARM8
-```
-
-### 1a - nodejs  - ARM7
-```
-wget https://nodejs.org/dist/v12.16.1/node-v12.16.1-linux-armv7l.tar.xz
-cd /opt
-sudo tar -xJvf ~/node-v12.16.1-linux-armv7l.tar.xz
-rm -f ~/node-v12.16.1-linux-armv7l.tar.xz
-sudo ln -s /opt/node-v12.16.1-linux-armv7l /opt/node
-sudo ln -s /opt/node/bin/node /usr/bin/node
-sudo ln -s /opt/node/bin/npm /usr/bin/npm
-sudo apt-get install -y git
-cd ~
-```
-
-### 1b - nodejs  - ARM8
-```
-sudo rm -f /opt/node
-curl -sL https://deb.nodesource.com/setup_14.x | sudo -E bash -
-sudo apt-get install -y nodejs
-sudo npm install -g npm
-sudo apt-get install -y git
-cd ~
-```
-
-## New v2.0 All in one script
-```
-## old systems remove
-sudo npm -g remove pm2
-sudo rm -f /usr/bin/pm2
-
-sudo npm -g remove homebridge
-sudo rm -f /usr/bin/homebridge
-
-sudo npm -g remove mqtt
-sudo rm -f /usr/bin/mqtt
-
-## clean up
-sudo apt autoremove
-
-
-## start intstall: node, npm, git
-cd ~
-sudo rm -f /opt/node
-curl -sL https://deb.nodesource.com/setup_14.x | sudo -E bash -
-sudo apt-get install -y nodejs
-sudo npm install -g npm
-sudo apt-get install -y git
-
-
-### install: homebridge
-sudo npm install -g --force --unsafe-perm homebridge
-### install mqtt
-sudo npm install -g --force mqtt
-
-### install: smartsystem
-rm -rf smartsocket
-git clone https://github.com/jcoppieters/smartsocket.git
-cd smartsocket
-git checkout v2.0
-npm install
-
-### config smartsystem
-rm -rf /home/pi/.homebridge
-mkdir -p /home/pi/.homebridge
-cp ~/smartsocket/config.homebridge.json ~/.homebridge/config.json
-cd ~/smartsocket
-sudo ln -sf /home/pi/smartsocket/ /usr/lib/node_modules/homebridge-system  # install the plugin via a link
-cd ~
-
-### install pm2 - process mgr
-sudo npm install -g --force pm2
-
-### IF NEEDED COPY OLD configs
-cp -v duotecno/*.json smartsocket/
-
-### start the system and save for reboots
-cd ~/smartsocket
-pm2 start homebridge
-pm2 save
-pm2 startup | grep "sudo" | bash
 
-```
-
-## New v2.0 Update script 
-
-#!/bin/bash
-# save current config files
-cd ~/duotecno
-mkdir -p backup/temp
-mv config.*.json backup/temp/
-git pull
-git fetch
-git reset --hard origin/v2.0
-cp -f backup/temp/config.*.json .
-mv backup/temp backup/backup_`date +"%Y-%m-%d_%H:%M"`
-npm install
-#
-pm2 restart homebridge
-
-
-### testing smappee
-find uuid ->
-```
-mqtt sub -t 'servicelocation/#' -h '192.168.99.2' -v
-```
-
-add uuid ->
-```
-mqtt sub -t 'servicelocation/9c46e636-e946-4af7-9000-5cd03c57a4ee/#' -h '192.168.99.2' -v
-```
-
-### test it:
-```
-cd ~/duotecno
-DEBUG=* homebridge -D
-```
-
-### shutdown the machine and make a copy
-```
-sudo shutdown -h now
-```
+## Install Shelly gen 1 plugin
+
+sudo vi /var/lib/homebridge/node_modules/homebridge-shelly/util/custom-characteristics.js
+        perms: ["ev","pr"], //Perms.READ, Perms.NOTIFY],
+
+sudo vi /var/lib/homebridge/node_modules/homebridge-shelly/accessories/lightbulbs.js
+      return 5; //Accessory.Categories.LIGHTBULB
+
+sudo vi /var/lib/homebridge/node_modules/homebridge-shelly/accessories/switches.js 
+      return 8; //Accessory.Categories.SWITCH
+
+switches.js:      return 8; //Accessory.Categories.SWITCH -> 8
+lightbulbs.js:      return 5; //Accessory.Categories.LIGHTBULB -> 5  (4x)
+
+base.js:      return Accessory.Categories.OTHER -> 1
+doors.js:      return Accessory.Categories.DOOR -> 12
+garage-door-openers.js:      return Accessory.Categories.GARAGE_DOOR_OPENER -> 4
+outlets.js:      return Accessory.Categories.OUTLET -> 7
+sensors.js:      return Accessory.Categories.SENSOR -> 10 (4x)
+valves.js:      return Accessory.Categories.FAUCET -> 29
+window-coverings.js:      return Accessory.Categories.WINDOW_COVERING -> 14
+windows.js:      return Accessory.Categories.WINDOW -> 13
+
+## OR
+sudo vi /usr/lib/node_modules/homebridge/node_modules/hap-nodejs/dist/lib/Accessory.js
+
+add:
+Accessory.Categories = {
+  OTHER: 1,
+  BRIDGE: 2,
+  FAN: 3,
+  GARAGE_DOOR_OPENER: 4,
+  LIGHTBULB: 5,
+  DOOR_LOCK: 6,
+  OUTLET: 7,
+  SWITCH: 8,
+  THERMOSTAT: 9,
+  SENSOR: 10,
+  SECURITY_SYSTEM: 11,
+  DOOR: 12,
+  WINDOW: 13,
+  WINDOW_COVERING: 14,
+  PROGRAMMABLE_SWITCH: 15,
+  RANGE_EXTENDER: 16,
+  IP_CAMERA: 17,
+  VIDEO_DOORBELL: 18,
+  AIR_PURIFIER: 19,
+  HEATER: 20,
+  AIR_CONDITIONER: 21,
+  HUMIDIFIER: 22,
+  DEHUMIDIFIER: 23,
+  SPRINKLER: 28,
+  FAUCET: 29,
+  SHOWER_HEAD: 30,
+  TELEVISION: 31,
+  TARGET_CONTROLLER: 32
+};

package/accessories/door.js

@@ -49,6 +49,7 @@ const windowcovering_1 = require("./windowcovering");
 class Door extends windowcovering_1.WindowCovering {
     constructor(homebridge, unit) {
         super(homebridge, unit);
+        this.targetState = this.homebridge.Characteristic.CurrentDoorState.OPEN;
     }
     getAccessoryServices() {
         // DoorOpener needs authentication

package/accessories/door.ts

@@ -50,7 +50,7 @@ import { API } from "homebridge";
 
 
 export class Door extends WindowCovering {
-  targetState;
+  targetState = this.homebridge.Characteristic.CurrentDoorState.OPEN
 
   constructor(homebridge: API, unit: Unit) {
     super(homebridge, unit);

package/accessories/garagedoor.js

@@ -13,6 +13,7 @@ const accessory_1 = require("./accessory");
 class GarageDoor extends accessory_1.Accessory {
     constructor(homebridge, unit) {
         super(homebridge, unit);
+        this.targetState = this.homebridge.Characteristic.CurrentDoorState.STOPPED;
     }
     getAccessoryServices() {
         // GarageDoorOpener needs authentication

package/accessories/garagedoor.ts

@@ -1,4 +1,4 @@
-import { API } from "homebridge";
+import { API, Characteristic } from "homebridge";
 import { Unit } from "../duotecno/protocol";
 import { UnitMotorCmd, UnitState } from "../duotecno/types";
 import { log } from "../duotecno/logger";
@@ -14,7 +14,7 @@ import { Accessory } from "./accessory";
 
 
 export class GarageDoor extends Accessory {
-  targetState;
+  targetState = this.homebridge.Characteristic.CurrentDoorState.STOPPED;
 
   constructor(homebridge: API, unit: Unit) {
     super(homebridge, unit);

package/accessories/lock.js

@@ -14,7 +14,7 @@ const accessory_1 = require("./accessory");
 class Lock extends accessory_1.Accessory {
     constructor(homebridge, unit) {
         super(homebridge, unit);
-        this.targetState = 1; // locked
+        this.targetState = this.homebridge.Characteristic.CurrentDoorState.CLOSED; // locked
         (0, logger_1.log)("accessory", "created Lock -> " + unit.getDescription());
         // set default for Unlocked to Locked
         if (this.unit.getType() === types_1.UnitExtendedType.kUnlocker)
@@ -47,10 +47,10 @@ class Lock extends accessory_1.Accessory {
                 // always set to "locked" after sending the request.
                 this.unit.resetTimer = setTimeout(() => {
                     (0, logger_1.log)("accessory", "Autolock for an unlocker after 2 secs of " + this.unit.getDescription());
-                    this.targetState = 1;
-                    this.me.getCharacteristic(this.homebridge.Characteristic.LockTargetState).updateValue(1);
+                    this.targetState = this.homebridge.Characteristic.CurrentDoorState.CLOSED;
+                    this.me.getCharacteristic(this.homebridge.Characteristic.LockTargetState).updateValue(this.targetState);
                     this.unit.status = 1;
-                    this.me.getCharacteristic(this.homebridge.Characteristic.LockCurrentState).updateValue(1);
+                    this.me.getCharacteristic(this.homebridge.Characteristic.LockCurrentState).updateValue(this.targetState);
                 }, 2000);
             }
             next();

package/accessories/lock.ts

@@ -15,7 +15,7 @@ import { Accessory } from "./accessory";
 
 
 export class Lock extends Accessory {
-  targetState = 1; // locked
+  targetState = this.homebridge.Characteristic.CurrentDoorState.CLOSED; // locked
 
   constructor(homebridge: API, unit: Unit) {
     super(homebridge, unit);
@@ -62,10 +62,10 @@ export class Lock extends Accessory {
           // always set to "locked" after sending the request.
           this.unit.resetTimer = setTimeout(() => {
             log("accessory", "Autolock for an unlocker after 2 secs of " + this.unit.getDescription())
-            this.targetState = 1;
-            this.me.getCharacteristic(this.homebridge.Characteristic.LockTargetState).updateValue(1);
+            this.targetState = this.homebridge.Characteristic.CurrentDoorState.CLOSED;
+            this.me.getCharacteristic(this.homebridge.Characteristic.LockTargetState).updateValue(this.targetState);
             this.unit.status = 1;
-            this.me.getCharacteristic(this.homebridge.Characteristic.LockCurrentState).updateValue(1);
+            this.me.getCharacteristic(this.homebridge.Characteristic.LockCurrentState).updateValue(this.targetState);
           }, 2000);
         }
       

package/accessories/windowcovering.js

@@ -58,7 +58,7 @@ const logger_1 = require("../duotecno/logger");
 class WindowCovering extends accessory_1.Accessory {
     constructor(homebridge, unit) {
         super(homebridge, unit);
-        this.targetState = 0; // down or closed by default ??
+        this.targetState = this.homebridge.Characteristic.CurrentDoorState.OPEN;
     }
     getAccessoryServices() {
         const covering = this.makeService(this.homebridge.Service.WindowCovering);

package/accessories/windowcovering.ts

@@ -58,12 +58,10 @@ import { API } from "homebridge";
 
 
 export class WindowCovering extends Accessory {
-  targetState;
+  targetState = this.homebridge.Characteristic.CurrentDoorState.OPEN;
 
   constructor(homebridge: API, unit: Unit) {
     super(homebridge, unit);
-    this.targetState = 0; // down or closed by default ??
-
   }
 
   getAccessoryServices() {

package/package.json

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