iobroker-ucl 1.1.10 → 1.1.12

package/!!!_INSTRUCTIONS_!!!.ts

@@ -1,4 +1,3 @@
-// Current Version: 1.0.63
 
 // ===================================================================================================
 // WORKFLOW nach Änderungen hier in einer TS-Datei:
@@ -16,9 +15,9 @@ npm publish
 docker exec -it iobroker bash
 
 // 5.) Im Docker iobroker container drin das NPM module aktualisieren: (PUTTY)
- npm update iobroker-ucl
+ npm update iobroker-ucl                 (initial installieren mit: npm install iobroker-ucl)
  npm ls --depth=0              (um sicher zu gehen, dass richtige Version auch gezogen wurde)
- npm uninstall iobroker-ucl      Danach: npm install iobroker-ucl            (Manchmal wird in iobroekr die Version incht gezogen warum auch immer)
+ 
 
 // 6.) In iobroker Weboberfläche die Javascript Instance restarten
 

package/main.js

@@ -8,7 +8,7 @@ var _e = require('./zigbeeFunctions.js'), createZigbeeDevice = _e.createZigbeeDe
 var _f = require('./camera.js'), sendToPictureGartenToTelegram = _f.sendToPictureGartenToTelegram, sendToPictureSeiteToTelegram = _f.sendToPictureSeiteToTelegram, sendToPictureHaustuereToTelegram = _f.sendToPictureHaustuereToTelegram, sendToPictureDoorbellToTelegram = _f.sendToPictureDoorbellToTelegram, sendToPictureGarageToTelegram = _f.sendToPictureGarageToTelegram;
 var AlexaInputConverter = require('./alexa.js').AlexaInputConverter;
 var _g = require('./shellyClasses.js'), ShellyLampeWeiss = _g.ShellyLampeWeiss, ShellyDimmerAlexaScheme = _g.ShellyDimmerAlexaScheme, ShellyDimmerTasterScheme = _g.ShellyDimmerTasterScheme, ShellyDimmer = _g.ShellyDimmer, ShellyRGBAlexaScheme = _g.ShellyRGBAlexaScheme, ShellyRGBTasterScheme = _g.ShellyRGBTasterScheme, ShellyLampeRGB = _g.ShellyLampeRGB, ShellySteckdose = _g.ShellySteckdose, ShellyRollladen = _g.ShellyRollladen, ShellySensor = _g.ShellySensor, deviceShellyLampeWeiss = _g.deviceShellyLampeWeiss, deviceShellyDimmer = _g.deviceShellyDimmer, deviceShellyLampeRGB = _g.deviceShellyLampeRGB, deviceShellySteckdose = _g.deviceShellySteckdose, deviceShellyRollladen = _g.deviceShellyRollladen, deviceShellySensor = _g.deviceShellySensor;
-var _h = require('./shellyFunctions.js'), createShellySensor = _h.createShellySensor, createShellyLampeRGB = _h.createShellyLampeRGB, createShellyRollladen = _h.createShellyRollladen, createShellyDimmer = _h.createShellyDimmer, createShellyLampe = _h.createShellyLampe, createShellySteckdose = _h.createShellySteckdose, loadShellyRollladen = _h.loadShellyRollladen, loadShellySensoren = _h.loadShellySensoren, loadShellyDimmer = _h.loadShellyDimmer, loadShellyLampenWeiss = _h.loadShellyLampenWeiss, loadShellySteckdosen = _h.loadShellySteckdosen, loadShellyDevicesAll = _h.loadShellyDevicesAll;
+var _h = require('./shellyFunctions.js'), createShellyDevice = _h.createShellyDevice, createShellySensor = _h.createShellySensor, createShellyLampeRGB = _h.createShellyLampeRGB, createShellyRollladen = _h.createShellyRollladen, createShellyDimmer = _h.createShellyDimmer, createShellyLampe = _h.createShellyLampe, createShellySteckdose = _h.createShellySteckdose, loadShellyRollladen = _h.loadShellyRollladen, loadShellySensoren = _h.loadShellySensoren, loadShellyDimmer = _h.loadShellyDimmer, loadShellyLampenWeiss = _h.loadShellyLampenWeiss, loadShellySteckdosen = _h.loadShellySteckdosen, loadShellyDevicesAll = _h.loadShellyDevicesAll;
 module.exports = {
     // date.ts:
     DateHelper: DateHelper,

package/main.ts

@@ -9,7 +9,7 @@ const { createZigbeeDevice, createZigbeeDosenrelais, createZigbeeLampeRGB, creat
 const { sendToPictureGartenToTelegram, sendToPictureSeiteToTelegram, sendToPictureHaustuereToTelegram, sendToPictureDoorbellToTelegram, sendToPictureGarageToTelegram } = require('./camera.js');
 const { AlexaInputConverter } = require('./alexa.js');
 const { ShellyLampeWeiss, ShellyDimmerAlexaScheme, ShellyDimmerTasterScheme, ShellyDimmer, ShellyRGBAlexaScheme, ShellyRGBTasterScheme, ShellyLampeRGB, ShellySteckdose, ShellyRollladen,ShellySensor, deviceShellyLampeWeiss, deviceShellyDimmer, deviceShellyLampeRGB, deviceShellySteckdose, deviceShellyRollladen, deviceShellySensor } = require('./shellyClasses.js');
-const { createShellySensor, createShellyLampeRGB, createShellyRollladen, createShellyDimmer, createShellyLampe, createShellySteckdose, loadShellyRollladen, loadShellySensoren, loadShellyDimmer, loadShellyLampenWeiss, loadShellySteckdosen, loadShellyDevicesAll } = require('./shellyFunctions.js');
+const { createShellyDevice, createShellySensor, createShellyLampeRGB, createShellyRollladen, createShellyDimmer, createShellyLampe, createShellySteckdose, loadShellyRollladen, loadShellySensoren, loadShellyDimmer, loadShellyLampenWeiss, loadShellySteckdosen, loadShellyDevicesAll } = require('./shellyFunctions.js');
 
 
 module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker-ucl",
-  "version": "1.1.10",
+  "version": "1.1.12",
   "main": "main.js",
     "scripts": {
     "build": "tsc --build",

package/shellyFunctions.js

@@ -83,25 +83,25 @@ function createDatenpunktSingle(adapter, deviceRawId, attributeType, attributeNa
 // Sensor:
 function createShellySensor(adapter, rawId, etage, raum, device, baseState) {
     // Allgemein:
-    this.createShellyDevice(adapter, baseState, etage, raum, device, deviceShellySensor);
+    this.createShellyDevice(adapter, rawId, etage, raum, device, baseState, deviceShellySensor);
 }
 exports.createShellySensor = createShellySensor;
 // Lampe RGB:
 function createShellyLampeRGB(adapter, rawId, etage, raum, device, baseState) {
     // Allgemein:
-    this.createShellyDevice(adapter, baseState, etage, raum, device, deviceShellyLampeRGB);
+    this.createShellyDevice(adapter, rawId, etage, raum, device, baseState, deviceShellyLampeRGB);
 }
 exports.createShellyLampeRGB = createShellyLampeRGB;
 // Rollladen:
 function createShellyRollladen(adapter, rawId, etage, raum, device, baseState) {
     // Allgemein:
-    this.createShellyDevice(adapter, baseState, etage, raum, device, deviceShellyRollladen);
+    this.createShellyDevice(adapter, rawId, etage, raum, device, baseState, deviceShellyRollladen);
 }
 exports.createShellyRollladen = createShellyRollladen;
 // Dimmer:
 function createShellyDimmer(adapter, rawId, etage, raum, device, baseState, alexaSmartNamesForOn, alexaActionNamesForOn, alexaLevelSchemeForOn, alexaSmartNamesForOff, alexaActionNamesForOff, levelScheme1, levelScheme2, levelScheme3, levelScheme4, tasterBooleanOn1, tasterBooleanOn2, tasterBooleanOn3, tasterBooleanOn4, tasterBooleanOff, nachtbeleuchtung, turnOffExitHouseSummer, turnOffExitHouseWinter, turnOnEnterHouseSummer, turnOnEnterHouseWinter) {
     // Allgemein:
-    this.createShellyDevice(adapter, baseState, etage, raum, device, deviceShellyDimmer);
+    this.createShellyDevice(adapter, rawId, etage, raum, device, baseState, deviceShellyDimmer);
     // alexaLevelSchemeForOn:  InstanceType<typeof ShellyDimmerAlexaScheme>
     if (alexaLevelSchemeForOn != null) {
         createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeDimmer_alexaScheme_aktiv, true, deviceShellyDimmer);
@@ -259,7 +259,7 @@ exports.createShellyDimmer = createShellyDimmer;
 // Lampe Weiss:
 function createShellyLampe(adapter, rawId, etage, raum, device, baseState, alexaSmartNamesForOn, alexaActionNamesForOn, alexaSmartNamesForOff, alexaActionNamesForOff, additionalStates4TurnOn, additionalStates4TurnOff, nachtbeleuchtung, turnOffExitHouseSummer, turnOffExitHouseWinter, turnOnEnterHouseSummer, turnOnEnterHouseWinter) {
     // Allgemein:
-    this.createShellyDevice(adapter, baseState, etage, raum, device, deviceShellyLampeWeiss);
+    this.createShellyDevice(adapter, rawId, etage, raum, device, baseState, deviceShellyLampeWeiss);
     // alexaSmartNamesForOn:string[]
     var db_alexaSmartNamesForOn = null;
     alexaSmartNamesForOn.forEach(function (value) {
@@ -349,7 +349,7 @@ exports.createShellyLampe = createShellyLampe;
 // Steckdose:
 function createShellySteckdose(adapter, rawId, etage, raum, device, baseState, channel, alexaSmartNamesForOn, alexaActionNamesForOn, alexaSmartNamesForOff, alexaActionNamesForOff, additionalStates4TurnOn, additionalStates4TurnOff, nachtbeleuchtung, turnOffExitHouseSummer, turnOffExitHouseWinter, turnOnEnterHouseSummer, turnOnEnterHouseWinter) {
     // Allgemein:
-    this.createShellyDevice(adapter, baseState, etage, raum, device, deviceShellySteckdose);
+    this.createShellyDevice(adapter, rawId, etage, raum, device, baseState, deviceShellySteckdose);
     // alexaSmartNamesForOn:string[]
     var db_alexaSmartNamesForOn = null;
     alexaSmartNamesForOn.forEach(function (value) {

package/shellyFunctions.ts

@@ -97,21 +97,21 @@ function createDatenpunktSingle(adapter: any, deviceRawId, attributeType, attrib
 export function createShellySensor(adapter: any, rawId: number,  etage: string, raum: string, device: string, baseState: string) {
 
     // Allgemein:
-    this.createShellyDevice(adapter, baseState, etage, raum, device, deviceShellySensor);
+    this.createShellyDevice(adapter, rawId, etage, raum, device, baseState, deviceShellySensor);
 }
 
 // Lampe RGB:
 export function createShellyLampeRGB(adapter: any, rawId: number,  etage: string, raum: string, device: string, baseState: string) {
 
     // Allgemein:
-    this.createShellyDevice(adapter, baseState, etage, raum, device, deviceShellyLampeRGB);
+    this.createShellyDevice(adapter, rawId, etage, raum, device, baseState, deviceShellyLampeRGB);
 }
 
 // Rollladen:
 export function createShellyRollladen(adapter: any, rawId: number,  etage: string, raum: string, device: string, baseState: string) {
 
     // Allgemein:
-    this.createShellyDevice(adapter, baseState, etage, raum, device, deviceShellyRollladen);
+    this.createShellyDevice(adapter, rawId, etage, raum, device, baseState, deviceShellyRollladen);
 }
 
 // Dimmer:
@@ -125,7 +125,7 @@ export function createShellyDimmer(adapter: any, rawId: number,  etage: string,
         nachtbeleuchtung:boolean, turnOffExitHouseSummer:boolean, turnOffExitHouseWinter:boolean, turnOnEnterHouseSummer:boolean, turnOnEnterHouseWinter:boolean) {
 
     // Allgemein:
-    this.createShellyDevice(adapter, baseState, etage, raum, device, deviceShellyDimmer);
+    this.createShellyDevice(adapter, rawId, etage, raum, device, baseState, deviceShellyDimmer);
 
     // alexaLevelSchemeForOn:  InstanceType<typeof ShellyDimmerAlexaScheme>
     if (alexaLevelSchemeForOn != null) {
@@ -287,7 +287,7 @@ export function createShellyLampe(adapter:any, rawId: number, etage: string, rau
         nachtbeleuchtung:boolean, turnOffExitHouseSummer:boolean, turnOffExitHouseWinter:boolean, turnOnEnterHouseSummer:boolean, turnOnEnterHouseWinter:boolean) {
 
     // Allgemein:
-    this.createShellyDevice(adapter, baseState, etage, raum, device, deviceShellyLampeWeiss);
+    this.createShellyDevice(adapter, rawId, etage, raum, device, baseState, deviceShellyLampeWeiss);
     
     // alexaSmartNamesForOn:string[]
     var db_alexaSmartNamesForOn = null;
@@ -381,7 +381,7 @@ export function createShellySteckdose(adapter:any, rawId: number, etage: string,
         nachtbeleuchtung:boolean, turnOffExitHouseSummer:boolean, turnOffExitHouseWinter:boolean, turnOnEnterHouseSummer:boolean, turnOnEnterHouseWinter:boolean) {
 
     // Allgemein:
-    this.createShellyDevice(adapter, baseState, etage, raum, device, deviceShellySteckdose);
+    this.createShellyDevice(adapter, rawId, etage, raum, device, baseState, deviceShellySteckdose);
     
     // alexaSmartNamesForOn:string[]
     var db_alexaSmartNamesForOn = null;