#6 More fixes

Hoffmation · Nov 14, 2021 · b738cbf · b738cbf
1 parent 2a9503f
commit b738cbf
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/src/models/rooms/RoomSettings/roomDeviceAddingSettings.ts b/src/models/rooms/RoomSettings/roomDeviceAddingSettings.ts
@@ -18,7 +18,7 @@ export class RoomDeviceAddingSettings {
       this.devices[deviceType] = [];
     }
     if (customName === undefined) {
-      customName = `${this.RoomName} ${deviceTypeName}`;
+      customName = `${this.RoomName} ${DeviceType[deviceType]}`;
     }
     this.devices[deviceType][index] = new RoomAddDeviceItem(setID, index, customName);
   }

diff --git a/src/server/devices/Griffe.ts b/src/server/devices/Griffe.ts
@@ -20,8 +20,8 @@ export class Griffe {
 
   public static getAllGriffe(): HmIpGriff[] {
     const griffe: HmIpGriff[] = [];
-    for (const dID in Devices.hmIP) {
-      const d = Devices.hmIP[dID];
+    for (const dID in Devices.alLDevices) {
+      const d = Devices.alLDevices[dID];
       if (d.deviceType === DeviceType.HmIpGriff) {
         griffe.push(d as HmIpGriff);
       }

diff --git a/src/server/devices/Heizgruppen.ts b/src/server/devices/Heizgruppen.ts
@@ -69,8 +69,8 @@ export class Heizgruppen {
 
   public static getAllGruppen(): HmIpHeizgruppe[] {
     const gruppen: HmIpHeizgruppe[] = [];
-    for (const dID in Devices.hmIP) {
-      const d = Devices.hmIP[dID];
+    for (const dID in Devices.alLDevices) {
+      const d = Devices.alLDevices[dID];
       if (d.deviceType === DeviceType.HmIpHeizgruppe) {
         gruppen.push(d as HmIpHeizgruppe);
       }
@@ -79,8 +79,8 @@ export class Heizgruppen {
   }
 
   public static getSpecificGroup(name: string): HmIpHeizgruppe | undefined {
-    for (const dID in Devices.hmIP) {
-      const d = Devices.hmIP[dID];
+    for (const dID in Devices.alLDevices) {
+      const d = Devices.alLDevices[dID];
       if (d.deviceType === DeviceType.HmIpHeizgruppe && d.info.customName === name) {
         return d as HmIpHeizgruppe;
       }

diff --git a/src/server/devices/IoBrokerBaseDevice.ts b/src/server/devices/IoBrokerBaseDevice.ts
@@ -28,7 +28,7 @@ export abstract class IoBrokerBaseDevice {
   }
 
   public room: RoomBase | undefined = undefined;
-  public allDevicesKey: string;
+  public allDevicesKey: string = '';
   protected _ioConnection?: IOBrokerConnection;
 
   protected constructor(protected _info: DeviceInfo, public deviceType: DeviceType) {

diff --git a/src/server/devices/Rollos.ts b/src/server/devices/Rollos.ts
@@ -37,8 +37,8 @@ export class Rolladen {
 
   public static getAllRollos(): HmIpRoll[] {
     const rollos: HmIpRoll[] = [];
-    for (const dID in Devices.hmIP) {
-      const d = Devices.hmIP[dID];
+    for (const dID in Devices.alLDevices) {
+      const d = Devices.alLDevices[dID];
       if (d.deviceType === DeviceType.HmIpRoll) {
         rollos.push(d as HmIpRoll);
       }

diff --git a/src/server/devices/hmIPDevices/hmIpHeizgruppe.ts b/src/server/devices/hmIPDevices/hmIpHeizgruppe.ts
@@ -93,8 +93,8 @@ export class HmIpHeizgruppe extends HmIPDevice {
 
   public getBelongingHeizungen(): HmIpHeizung[] {
     const result: HmIpHeizung[] = [];
-    for (const dID in Devices.hmIP) {
-      const d = Devices.hmIP[dID];
+    for (const dID in Devices.alLDevices) {
+      const d = Devices.alLDevices[dID];
       if (d.deviceType === DeviceType.HmIpHeizung && d.info.room === this.info.room) {
         result.push(d as HmIpHeizung);
       }

diff --git a/src/server/services/Telegram/telegram-Commands.ts b/src/server/services/Telegram/telegram-Commands.ts
@@ -182,8 +182,8 @@ export class TelegramCommands {
         /\/set_vibration_sensitivity/,
         async (m: TelegramBot.Message): Promise<boolean> => {
           if (m.from === undefined) return false;
-          for (const id in Devices.Zigbee) {
-            const d = Devices.Zigbee[id];
+          for (const id in Devices.alLDevices) {
+            const d = Devices.alLDevices[id];
             if (d.deviceType === DeviceType.ZigbeeAquaraVibra) {
               (d as ZigbeeAquaraVibra).setSensitivity(2);
             }
@@ -202,8 +202,8 @@ export class TelegramCommands {
         async (m: TelegramBot.Message): Promise<boolean> => {
           if (m.from === undefined) return false;
           const response: string[] = ['These are the assignments for all buttons'];
-          for (const id in Devices.hmIP) {
-            const d = Devices.hmIP[id];
+          for (const id in Devices.alLDevices) {
+            const d = Devices.alLDevices[id];
             if (d.deviceType === DeviceType.HmIpTaster) {
               response.push((d as HmIpTaster).getTastenAssignment());
             }