iobroker-ucl 1.1.57 → 1.1.58

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/package.json +1 -1
  2. package/shellyClasses.js +6 -2
  3. package/shellyClasses.ts +11 -6
  4. package/shellyFunctions.js +0 -15
  5. package/shellyFunctions.ts +7 -17
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "iobroker-ucl",
3
- "version": "1.1.57",
3
+ "version": "1.1.58",
4
4
  "main": "main.js",
5
5
  "scripts": {
6
6
  "build": "tsc --build",
package/shellyClasses.js CHANGED
@@ -373,8 +373,8 @@ var ShellyDimmer = /** @class */ (function (_super) {
373
373
  __extends(ShellyDimmer, _super);
374
374
  function ShellyDimmer(adapter, id, etage, raum, device, baseState, alexaSmartNamesForOn, alexaActionNamesForOn, alexaLevelSchemeForOn, alexaSmartNamesForOff, alexaActionNamesForOff, levelSchemes, tasterBooleanOn, tasterBooleanOff, nachtbeleuchtung, turnOffExitHouseSummer, turnOffExitHouseWinter, turnOnEnterHouseSummer, turnOnEnterHouseWinter) {
375
375
  var _this = _super.call(this, adapter, id, etage, raum, device, baseState) || this;
376
- console.log("here: " + alexaLevelSchemeForOn);
377
- console.log("here: " + alexaLevelSchemeForOn.getAlexaName());
376
+ adapter.log("here: " + alexaLevelSchemeForOn);
377
+ adapter.log("here: " + alexaLevelSchemeForOn.getAlexaName());
378
378
  _this.alexaSmartNamesForOn = alexaSmartNamesForOn;
379
379
  _this.alexaSmartNamesForOff = alexaSmartNamesForOff;
380
380
  _this.alexaActionNamesForOn = alexaActionNamesForOn;
@@ -388,11 +388,15 @@ var ShellyDimmer = /** @class */ (function (_super) {
388
388
  _this.tasterBooleanOn = tasterBooleanOn;
389
389
  _this.levelSchemes = levelSchemes;
390
390
  _this.tasterBooleanOff = tasterBooleanOff;
391
+ adapter.log("1111ff" + _this.alexaLevelSchemeForOn);
391
392
  if (_this.alexaLevelSchemeForOn != null) {
393
+ adapter.log("1111a");
392
394
  if (_this.alexaLevelSchemeForOn.getAlexaName() != null) {
395
+ adapter.log("1111b");
393
396
  _this.createState(_this.alexaLevelSchemeForOn.getAlexaName());
394
397
  }
395
398
  _this.alexaLevelSchemeForOn.setDevice(_this);
399
+ adapter.log("1111c");
396
400
  }
397
401
  _this.tasterBooleanOn.forEach(function (tasterScheme) {
398
402
  if (tasterScheme.getTasterBooleanOnName() != null) {
package/shellyClasses.ts CHANGED
@@ -438,13 +438,15 @@ export class ShellyDimmer extends AbstractShelly {
438
438
 
439
439
  constructor(adapter:any, id: number, etage: string, raum: string, device: string, baseState: string,
440
440
  alexaSmartNamesForOn:string[], alexaActionNamesForOn:string[], alexaLevelSchemeForOn: ShellyDimmerAlexaScheme,
441
- alexaSmartNamesForOff: string[], alexaActionNamesForOff: string[], levelSchemes: ShellyDimmerAlexaScheme[], tasterBooleanOn: ShellyDimmerTasterScheme[],
442
- tasterBooleanOff: string[],nachtbeleuchtung:boolean, turnOffExitHouseSummer:boolean, turnOffExitHouseWinter:boolean, turnOnEnterHouseSummer:boolean, turnOnEnterHouseWinter:boolean) {
441
+ alexaSmartNamesForOff: string[], alexaActionNamesForOff: string[], levelSchemes: ShellyDimmerAlexaScheme[],
442
+ tasterBooleanOn: ShellyDimmerTasterScheme[],
443
+ tasterBooleanOff: string[],nachtbeleuchtung:boolean, turnOffExitHouseSummer:boolean, turnOffExitHouseWinter:boolean,
444
+ turnOnEnterHouseSummer:boolean, turnOnEnterHouseWinter:boolean) {
443
445
  super(adapter, id, etage, raum, device, baseState);
444
446
 
445
447
 
446
- console.log("here: " + alexaLevelSchemeForOn);
447
- console.log("here: " + alexaLevelSchemeForOn.getAlexaName());
448
+ adapter.log("here: " + alexaLevelSchemeForOn);
449
+ adapter.log("here: " + alexaLevelSchemeForOn.getAlexaName());
448
450
 
449
451
  this.alexaSmartNamesForOn = alexaSmartNamesForOn;
450
452
  this.alexaSmartNamesForOff = alexaSmartNamesForOff;
@@ -461,12 +463,15 @@ export class ShellyDimmer extends AbstractShelly {
461
463
  this.tasterBooleanOn = tasterBooleanOn;
462
464
  this.levelSchemes = levelSchemes;
463
465
  this.tasterBooleanOff = tasterBooleanOff;
464
-
466
+ adapter.log("1111ff" + this.alexaLevelSchemeForOn);
465
467
  if (this.alexaLevelSchemeForOn != null) {
468
+ adapter.log("1111a");
466
469
  if (this.alexaLevelSchemeForOn.getAlexaName() != null) {
470
+ adapter.log("1111b");
467
471
  this.createState(this.alexaLevelSchemeForOn.getAlexaName());
468
472
  }
469
- this.alexaLevelSchemeForOn.setDevice(this);
473
+ this.alexaLevelSchemeForOn.setDevice(this);
474
+ adapter.log("1111c");
470
475
  }
471
476
  this.tasterBooleanOn.forEach(tasterScheme => {
472
477
  if (tasterScheme.getTasterBooleanOnName() != null) {
package/shellyFunctions.js CHANGED
@@ -506,28 +506,20 @@ export function loadShellyLampenRGB(adapter: any) {
506
506
  }*/
507
507
  var cacheDimmerArray = null;
508
508
  function loadShellyDimmer(adapter) {
509
- adapter.log("loadShellyDimmer do it!!!!");
510
509
  if (cacheDimmerArray != null) {
511
- adapter.log("loadShellyDimmer do it!!!!_a");
512
510
  return cacheDimmerArray;
513
511
  }
514
- adapter.log("loadShellyDimmer do it!!!!_b");
515
512
  // @ts-ignore
516
513
  cacheDimmerArray = [];
517
- adapter.log("loadShellyDimmer do it!!!!_c");
518
514
  adapter.$('state[id=0_userdata.0.devices.shelly.*.*.category]').each(function (datenpunktKey) {
519
- adapter.log("loadShellyDimmer do it!!!!_d");
520
515
  var datenpunktPraefix = datenpunktKey.replaceAll(".category", "");
521
- adapter.log("loadShellyDimmer do it!!!!_e: " + adapter.getState(datenpunktKey).val + " ---- " + deviceShellyDimmer);
522
516
  if (adapter.getState(datenpunktKey).val == deviceShellyDimmer) {
523
- adapter.log("loadShellyDimmer do it!!!!_f");
524
517
  // Einschalt-Scheme:
525
518
  var alexaOnScheme = null;
526
519
  if (adapter.getState(datenpunktPraefix + "." + attributeDimmer_alexaScheme_aktiv).val == true) {
527
520
  // @ts-ignore
528
521
  alexaOnScheme = new ShellyDimmerAlexaScheme(null, adapter.getState(datenpunktPraefix + "." + attributeDimmer_alexaScheme_level).val);
529
522
  }
530
- adapter.log("loadShellyDimmer do it!!!!_f1");
531
523
  // Weitere Schemes als Array:
532
524
  var schemeArray = [];
533
525
  // alexaScheme1: InstanceType<typeof ShellyDimmerAlexaScheme>
@@ -535,25 +527,21 @@ function loadShellyDimmer(adapter) {
535
527
  // @ts-ignore
536
528
  schemeArray.push(new ShellyDimmerAlexaScheme(adapter.getState(datenpunktPraefix + "." + attributeDimmer_alexaScheme_name1).val, adapter.getState(datenpunktPraefix + "." + attributeDimmer_alexaScheme_level1).val));
537
529
  }
538
- adapter.log("loadShellyDimmer do it!!!!_f2");
539
530
  // alexaScheme2: InstanceType<typeof ShellyDimmerAlexaScheme>
540
531
  if (adapter.getState(datenpunktPraefix + "." + attributeDimmer_alexaScheme_aktiv2).val == true) {
541
532
  // @ts-ignore
542
533
  schemeArray.push(new ShellyDimmerAlexaScheme(adapter.getState(datenpunktPraefix + "." + attributeDimmer_alexaScheme_name2).val, adapter.getState(datenpunktPraefix + "." + attributeDimmer_alexaScheme_level2).val));
543
534
  }
544
- adapter.log("loadShellyDimmer do it!!!!_f3");
545
535
  // alexaScheme3: InstanceType<typeof ShellyDimmerAlexaScheme>
546
536
  if (adapter.getState(datenpunktPraefix + "." + attributeDimmer_alexaScheme_aktiv3).val == true) {
547
537
  // @ts-ignore
548
538
  schemeArray.push(new ShellyDimmerAlexaScheme(adapter.getState(datenpunktPraefix + "." + attributeDimmer_alexaScheme_name3).val, adapter.getState(datenpunktPraefix + "." + attributeDimmer_alexaScheme_level3).val));
549
539
  }
550
- adapter.log("loadShellyDimmer do it!!!!_f4");
551
540
  // alexaScheme4: InstanceType<typeof ShellyDimmerAlexaScheme>
552
541
  if (adapter.getState(datenpunktPraefix + "." + attributeDimmer_alexaScheme_aktiv4).val == true) {
553
542
  // @ts-ignore
554
543
  schemeArray.push(new ShellyDimmerAlexaScheme(adapter.getState(datenpunktPraefix + "." + attributeDimmer_alexaScheme_name4).val, adapter.getState(datenpunktPraefix + "." + attributeDimmer_alexaScheme_level4).val));
555
544
  }
556
- adapter.log("loadShellyDimmer do it!!!!_f5");
557
545
  // Weitere Schemes als Array:
558
546
  var tasterSchemeArray = [];
559
547
  // tasterScheme1: InstanceType<typeof ShellyDimmerTasterScheme>
@@ -561,13 +549,11 @@ function loadShellyDimmer(adapter) {
561
549
  // @ts-ignore
562
550
  tasterSchemeArray.push(new ShellyDimmerTasterScheme(adapter.getState(datenpunktPraefix + "." + attributeDimmer_tasterScheme_name1).val, adapter.getState(datenpunktPraefix + "." + attributeDimmer_tasterScheme_level1).val));
563
551
  }
564
- adapter.log("loadShellyDimmer do it!!!!_f6");
565
552
  // tasterScheme2: InstanceType<typeof ShellyDimmerTasterScheme>
566
553
  if (adapter.getState(datenpunktPraefix + "." + attributeDimmer_tasterScheme_aktiv2).val == true) {
567
554
  // @ts-ignore
568
555
  tasterSchemeArray.push(new ShellyDimmerTasterScheme(adapter.getState(datenpunktPraefix + "." + attributeDimmer_tasterScheme_name2).val, adapter.getState(datenpunktPraefix + "." + attributeDimmer_tasterScheme_level2).val));
569
556
  }
570
- adapter.log("loadShellyDimmer do it!!!!_f7");
571
557
  // tasterScheme3: InstanceType<typeof ShellyDimmerTasterScheme>
572
558
  if (adapter.getState(datenpunktPraefix + "." + attributeDimmer_tasterScheme_aktiv3).val == true) {
573
559
  // @ts-ignore
@@ -578,7 +564,6 @@ function loadShellyDimmer(adapter) {
578
564
  // @ts-ignore
579
565
  tasterSchemeArray.push(new ShellyDimmerTasterScheme(adapter.getState(datenpunktPraefix + "." + attributeDimmer_tasterScheme_name4).val, adapter.getState(datenpunktPraefix + "." + attributeDimmer_tasterScheme_level4).val));
580
566
  }
581
- adapter.log(">>> Dimmer inside: " + datenpunktKey);
582
567
  // @ts-ignore
583
568
  cacheDimmerArray.push(new ShellyDimmer(adapter, adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
584
569
  adapter.getState(datenpunktPraefix + "." + attributeEtage).val, // [1] Etage/Bereich (z.B. EG)
package/shellyFunctions.ts CHANGED
@@ -546,23 +546,16 @@ export function loadShellyLampenRGB(adapter: any) {
546
546
 
547
547
  var cacheDimmerArray = null;
548
548
  export function loadShellyDimmer(adapter: any) {
549
- adapter.log("loadShellyDimmer do it!!!!");
550
549
  if (cacheDimmerArray != null) {
551
- adapter.log("loadShellyDimmer do it!!!!_a");
552
550
  return cacheDimmerArray;
553
551
  }
554
- adapter.log("loadShellyDimmer do it!!!!_b");
555
552
 
556
553
  // @ts-ignore
557
554
  cacheDimmerArray = [];
558
- adapter.log("loadShellyDimmer do it!!!!_c");
559
-
560
555
  adapter.$('state[id=0_userdata.0.devices.shelly.*.*.category]').each(datenpunktKey => {
561
- adapter.log("loadShellyDimmer do it!!!!_d");
562
556
  var datenpunktPraefix = datenpunktKey.replaceAll(".category", "");
563
- adapter.log("loadShellyDimmer do it!!!!_e: " + adapter.getState(datenpunktKey).val + " ---- " + deviceShellyDimmer);
564
557
  if (adapter.getState(datenpunktKey).val == deviceShellyDimmer) {
565
- adapter.log("loadShellyDimmer do it!!!!_f");
558
+
566
559
 
567
560
  // Einschalt-Scheme:
568
561
  var alexaOnScheme = null;
@@ -572,7 +565,6 @@ export function loadShellyDimmer(adapter: any) {
572
565
  adapter.getState(datenpunktPraefix + "." + attributeDimmer_alexaScheme_level ).val
573
566
  );
574
567
  }
575
- adapter.log("loadShellyDimmer do it!!!!_f1");
576
568
 
577
569
  // Weitere Schemes als Array:
578
570
  var schemeArray = [];
@@ -585,7 +577,7 @@ export function loadShellyDimmer(adapter: any) {
585
577
  adapter.getState(datenpunktPraefix + "." + attributeDimmer_alexaScheme_level1).val
586
578
  ));
587
579
  }
588
- adapter.log("loadShellyDimmer do it!!!!_f2");
580
+
589
581
  // alexaScheme2: InstanceType<typeof ShellyDimmerAlexaScheme>
590
582
  if (adapter.getState(datenpunktPraefix + "." + attributeDimmer_alexaScheme_aktiv2 ).val == true) {
591
583
  // @ts-ignore
@@ -594,7 +586,7 @@ export function loadShellyDimmer(adapter: any) {
594
586
  adapter.getState(datenpunktPraefix + "." + attributeDimmer_alexaScheme_level2).val
595
587
  ));
596
588
  }
597
- adapter.log("loadShellyDimmer do it!!!!_f3");
589
+
598
590
  // alexaScheme3: InstanceType<typeof ShellyDimmerAlexaScheme>
599
591
  if (adapter.getState(datenpunktPraefix + "." + attributeDimmer_alexaScheme_aktiv3 ).val == true) {
600
592
  // @ts-ignore
@@ -603,7 +595,7 @@ export function loadShellyDimmer(adapter: any) {
603
595
  adapter.getState(datenpunktPraefix + "." + attributeDimmer_alexaScheme_level3).val
604
596
  ));
605
597
  }
606
- adapter.log("loadShellyDimmer do it!!!!_f4");
598
+
607
599
  // alexaScheme4: InstanceType<typeof ShellyDimmerAlexaScheme>
608
600
  if (adapter.getState(datenpunktPraefix + "." + attributeDimmer_alexaScheme_aktiv4 ).val == true) {
609
601
  // @ts-ignore
@@ -612,7 +604,7 @@ export function loadShellyDimmer(adapter: any) {
612
604
  adapter.getState(datenpunktPraefix + "." + attributeDimmer_alexaScheme_level4).val
613
605
  ));
614
606
  }
615
- adapter.log("loadShellyDimmer do it!!!!_f5");
607
+
616
608
  // Weitere Schemes als Array:
617
609
  var tasterSchemeArray = [];
618
610
 
@@ -624,7 +616,7 @@ export function loadShellyDimmer(adapter: any) {
624
616
  adapter.getState(datenpunktPraefix + "." + attributeDimmer_tasterScheme_level1).val
625
617
  ));
626
618
  }
627
- adapter.log("loadShellyDimmer do it!!!!_f6");
619
+
628
620
  // tasterScheme2: InstanceType<typeof ShellyDimmerTasterScheme>
629
621
  if (adapter.getState(datenpunktPraefix + "." + attributeDimmer_tasterScheme_aktiv2 ).val == true) {
630
622
  // @ts-ignore
@@ -633,7 +625,7 @@ export function loadShellyDimmer(adapter: any) {
633
625
  adapter.getState(datenpunktPraefix + "." + attributeDimmer_tasterScheme_level2).val
634
626
  ));
635
627
  }
636
- adapter.log("loadShellyDimmer do it!!!!_f7");
628
+
637
629
  // tasterScheme3: InstanceType<typeof ShellyDimmerTasterScheme>
638
630
  if (adapter.getState(datenpunktPraefix + "." + attributeDimmer_tasterScheme_aktiv3 ).val == true) {
639
631
  // @ts-ignore
@@ -652,8 +644,6 @@ export function loadShellyDimmer(adapter: any) {
652
644
  ));
653
645
  }
654
646
 
655
- adapter.log(">>> Dimmer inside: " + datenpunktKey);
656
-
657
647
  // @ts-ignore
658
648
  cacheDimmerArray.push(new ShellyDimmer(adapter,
659
649
  adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")