iobroker-ucl 1.2.61 → 1.2.63

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/main.js +1 -1
  2. package/main.ts +1 -1
  3. package/package.json +1 -1
  4. package/shellyFunctions.js +9 -2
  5. package/shellyFunctions.ts +12 -2
package/main.js CHANGED
@@ -9,7 +9,7 @@ var _f = require('./camera.js'), sendToPictureGartenToTelegram = _f.sendToPictur
9
9
  var AlexaInputConverter = require('./alexa.js').AlexaInputConverter;
10
10
  var _g = require('./shellyClasses.js'), AbstractShelly = _g.AbstractShelly, 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;
11
11
  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;
12
- console.log("ddd333d");
12
+ console.log("ddd33333d");
13
13
  module.exports = {
14
14
  // date.ts:
15
15
  DateHelper: DateHelper,
package/main.ts CHANGED
@@ -11,7 +11,7 @@ const { AlexaInputConverter } = require('./alexa.js');
11
11
  const { AbstractShelly, ShellyLampeWeiss, ShellyDimmerAlexaScheme, ShellyDimmerTasterScheme, ShellyDimmer, ShellyRGBAlexaScheme, ShellyRGBTasterScheme, ShellyLampeRGB, ShellySteckdose, ShellyRollladen,ShellySensor, deviceShellyLampeWeiss, deviceShellyDimmer, deviceShellyLampeRGB, deviceShellySteckdose, deviceShellyRollladen, deviceShellySensor } = require('./shellyClasses.js');
12
12
  const { createShellyDevice, createShellySensor, createShellyLampeRGB, createShellyRollladen, createShellyDimmer, createShellyLampe, createShellySteckdose, loadShellyRollladen, loadShellySensoren, loadShellyDimmer, loadShellyLampenWeiss, loadShellySteckdosen, loadShellyDevicesAll } = require('./shellyFunctions.js');
13
13
 
14
- console.log("ddd333d");
14
+ console.log("ddd33333d");
15
15
 
16
16
  module.exports = {
17
17
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "iobroker-ucl",
3
- "version": "1.2.61",
3
+ "version": "1.2.63",
4
4
  "main": "main.js",
5
5
  "scripts": {
6
6
  "build": "tsc --build",
package/shellyFunctions.js CHANGED
@@ -61,6 +61,7 @@ var attributeDimmer_tasterScheme_level3 = "tasterScheme3_level";
61
61
  var attributeDimmer_tasterScheme_aktiv4 = "tasterScheme4_aktiv";
62
62
  var attributeDimmer_tasterScheme_name4 = "tasterScheme4_name";
63
63
  var attributeDimmer_tasterScheme_level4 = "tasterScheme4_level";
64
+ var attributeChannel = "channel";
64
65
  function createShellyDevice(adapter, rawId, etage, raum, device, baseState, category) {
65
66
  createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRawID, rawId, category);
66
67
  createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeCategory, category, category);
@@ -258,9 +259,11 @@ function createShellyDimmer(adapter, rawId, etage, raum, device, baseState, alex
258
259
  }
259
260
  exports.createShellyDimmer = createShellyDimmer;
260
261
  // Lampe Weiss:
261
- function createShellyLampe(adapter, rawId, etage, raum, device, baseState, alexaSmartNamesForOn, alexaActionNamesForOn, alexaSmartNamesForOff, alexaActionNamesForOff, additionalStates4TurnOn, additionalStates4TurnOff, nachtbeleuchtung, turnOffExitHouseSummer, turnOffExitHouseWinter, turnOnEnterHouseSummer, turnOnEnterHouseWinter) {
262
+ function createShellyLampe(adapter, rawId, etage, raum, device, baseState, channel, alexaSmartNamesForOn, alexaActionNamesForOn, alexaSmartNamesForOff, alexaActionNamesForOff, additionalStates4TurnOn, additionalStates4TurnOff, nachtbeleuchtung, turnOffExitHouseSummer, turnOffExitHouseWinter, turnOnEnterHouseSummer, turnOnEnterHouseWinter) {
262
263
  // Allgemein:
263
264
  createShellyDevice(adapter, rawId, etage, raum, device, baseState, deviceShellyLampeWeiss);
265
+ // attributeChannel
266
+ createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeChannel, channel, deviceShellyLampeWeiss);
264
267
  // alexaSmartNamesForOn:string[]
265
268
  var db_alexaSmartNamesForOn = null;
266
269
  alexaSmartNamesForOn.forEach(function (value) {
@@ -348,9 +351,11 @@ function createShellyLampe(adapter, rawId, etage, raum, device, baseState, alexa
348
351
  }
349
352
  exports.createShellyLampe = createShellyLampe;
350
353
  // Steckdose:
351
- function createShellySteckdose(adapter, rawId, etage, raum, device, baseState, alexaSmartNamesForOn, alexaActionNamesForOn, alexaSmartNamesForOff, alexaActionNamesForOff, additionalStates4TurnOn, additionalStates4TurnOff, nachtbeleuchtung, turnOffExitHouseSummer, turnOffExitHouseWinter, turnOnEnterHouseSummer, turnOnEnterHouseWinter) {
354
+ function createShellySteckdose(adapter, rawId, etage, raum, device, baseState, channel, alexaSmartNamesForOn, alexaActionNamesForOn, alexaSmartNamesForOff, alexaActionNamesForOff, additionalStates4TurnOn, additionalStates4TurnOff, nachtbeleuchtung, turnOffExitHouseSummer, turnOffExitHouseWinter, turnOnEnterHouseSummer, turnOnEnterHouseWinter) {
352
355
  // Allgemein:
353
356
  createShellyDevice(adapter, rawId, etage, raum, device, baseState, deviceShellySteckdose);
357
+ // attributeChannel
358
+ createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeChannel, channel, deviceShellyLampeWeiss);
354
359
  // alexaSmartNamesForOn:string[]
355
360
  var db_alexaSmartNamesForOn = null;
356
361
  alexaSmartNamesForOn.forEach(function (value) {
@@ -570,6 +575,7 @@ function loadShellyDimmer(adapter) {
570
575
  adapter.getState(datenpunktPraefix + "." + attributeRaum).val, // [2] Raum/Unterbereich (z.B. Wohnzimmer)
571
576
  adapter.getState(datenpunktPraefix + "." + attributeDevice).val, // [3] Device (z.B. Stehlampe)
572
577
  adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [4] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
578
+ adapter.getState(datenpunktPraefix + "." + attributeChannel).val, // [4] Channel
573
579
  toStringArray(adapter.getState(datenpunktPraefix + "." + attribute_AlexaSmartNamesForOn).val), // 08 Alexa-Ein
574
580
  toStringArray(adapter.getState(datenpunktPraefix + "." + attribute_AlexaActionNamesForOn).val), // Alexa-Action-Ein, z.B. "Guten morgen" (Würde auch funktionieren, wenn dies bei [06] eingetragen ist)
575
581
  alexaOnScheme, // 08] A.-Ein-Schem
@@ -605,6 +611,7 @@ function loadShellyLampenWeiss(adapter) {
605
611
  adapter.getState(datenpunktPraefix + "." + attributeRaum).val, // [2] Raum/Unterbereich (z.B. Wohnzimmer)
606
612
  adapter.getState(datenpunktPraefix + "." + attributeDevice).val, // [3] Device (z.B. Stehlampe)
607
613
  adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [4] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
614
+ adapter.getState(datenpunktPraefix + "." + attributeChannel).val, // [4] Channel
608
615
  toStringArray(adapter.getState(datenpunktPraefix + "." + attribute_AlexaSmartNamesForOn).val), // 08 Alexa-Ein
609
616
  toStringArray(adapter.getState(datenpunktPraefix + "." + attribute_AlexaActionNamesForOn).val), // Alexa-Action-Ein, z.B. "Guten morgen" (Würde auch funktionieren, wenn dies bei [06] eingetragen ist)
610
617
  toStringArray(adapter.getState(datenpunktPraefix + "." + attribute_AlexaSmartNamesForOff).val), // 09 Alexa-Aus
package/shellyFunctions.ts CHANGED
@@ -73,6 +73,8 @@ const attributeDimmer_tasterScheme_aktiv4 = "tasterScheme4_aktiv";
73
73
  const attributeDimmer_tasterScheme_name4 = "tasterScheme4_name";
74
74
  const attributeDimmer_tasterScheme_level4 = "tasterScheme4_level";
75
75
 
76
+ const attributeChannel = "channel";
77
+
76
78
  export function createShellyDevice(adapter: any, rawId: number, etage: string, raum: string, device: string, baseState: string, category: string) {
77
79
  createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRawID, rawId, category);
78
80
  createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeCategory, category, category);
@@ -284,13 +286,16 @@ export function createShellyDimmer(adapter: any, rawId: number, etage: string,
284
286
  }
285
287
 
286
288
  // Lampe Weiss:
287
- export function createShellyLampe(adapter:any, rawId: number, etage: string, raum: string, device: string, baseState: string,
289
+ export function createShellyLampe(adapter:any, rawId: number, etage: string, raum: string, device: string, baseState: string, channel: number,
288
290
  alexaSmartNamesForOn:string[], alexaActionNamesForOn:string[], alexaSmartNamesForOff: string[],alexaActionNamesForOff: string[],
289
291
  additionalStates4TurnOn:string[], additionalStates4TurnOff:string[],
290
292
  nachtbeleuchtung:boolean, turnOffExitHouseSummer:boolean, turnOffExitHouseWinter:boolean, turnOnEnterHouseSummer:boolean, turnOnEnterHouseWinter:boolean) {
291
293
 
292
294
  // Allgemein:
293
295
  createShellyDevice(adapter, rawId, etage, raum, device, baseState, deviceShellyLampeWeiss);
296
+
297
+ // attributeChannel
298
+ createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeChannel, channel, deviceShellyLampeWeiss);
294
299
 
295
300
  // alexaSmartNamesForOn:string[]
296
301
  var db_alexaSmartNamesForOn = null;
@@ -379,13 +384,16 @@ export function createShellyLampe(adapter:any, rawId: number, etage: string, rau
379
384
  }
380
385
 
381
386
  // Steckdose:
382
- export function createShellySteckdose(adapter:any, rawId: number, etage: string, raum: string, device: string, baseState: string, alexaSmartNamesForOn:string[],
387
+ export function createShellySteckdose(adapter:any, rawId: number, etage: string, raum: string, device: string, baseState: string, channel: number, alexaSmartNamesForOn:string[],
383
388
  alexaActionNamesForOn:string[], alexaSmartNamesForOff: string[],alexaActionNamesForOff: string[],
384
389
  additionalStates4TurnOn:string[], additionalStates4TurnOff:string[],
385
390
  nachtbeleuchtung:boolean, turnOffExitHouseSummer:boolean, turnOffExitHouseWinter:boolean, turnOnEnterHouseSummer:boolean, turnOnEnterHouseWinter:boolean) {
386
391
 
387
392
  // Allgemein:
388
393
  createShellyDevice(adapter, rawId, etage, raum, device, baseState, deviceShellySteckdose);
394
+
395
+ // attributeChannel
396
+ createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeChannel, channel, deviceShellyLampeWeiss);
389
397
 
390
398
  // alexaSmartNamesForOn:string[]
391
399
  var db_alexaSmartNamesForOn = null;
@@ -651,6 +659,7 @@ export function loadShellyDimmer(adapter: any) {
651
659
  adapter.getState(datenpunktPraefix + "." + attributeRaum).val, // [2] Raum/Unterbereich (z.B. Wohnzimmer)
652
660
  adapter.getState(datenpunktPraefix + "." + attributeDevice).val, // [3] Device (z.B. Stehlampe)
653
661
  adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [4] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
662
+ adapter.getState(datenpunktPraefix + "." + attributeChannel).val, // [4] Channel
654
663
  toStringArray(adapter.getState(datenpunktPraefix + "." + attribute_AlexaSmartNamesForOn).val), // 08 Alexa-Ein
655
664
  toStringArray(adapter.getState(datenpunktPraefix + "." + attribute_AlexaActionNamesForOn).val), // Alexa-Action-Ein, z.B. "Guten morgen" (Würde auch funktionieren, wenn dies bei [06] eingetragen ist)
656
665
  alexaOnScheme, // 08] A.-Ein-Schem
@@ -690,6 +699,7 @@ export function loadShellyLampenWeiss(adapter: any) {
690
699
  adapter.getState(datenpunktPraefix + "." + attributeRaum).val, // [2] Raum/Unterbereich (z.B. Wohnzimmer)
691
700
  adapter.getState(datenpunktPraefix + "." + attributeDevice).val, // [3] Device (z.B. Stehlampe)
692
701
  adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [4] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
702
+ adapter.getState(datenpunktPraefix + "." + attributeChannel).val, // [4] Channel
693
703
  toStringArray(adapter.getState(datenpunktPraefix + "." + attribute_AlexaSmartNamesForOn).val), // 08 Alexa-Ein
694
704
  toStringArray(adapter.getState(datenpunktPraefix + "." + attribute_AlexaActionNamesForOn).val), // Alexa-Action-Ein, z.B. "Guten morgen" (Würde auch funktionieren, wenn dies bei [06] eingetragen ist)
695
705
  toStringArray(adapter.getState(datenpunktPraefix + "." + attribute_AlexaSmartNamesForOff).val), // 09 Alexa-Aus