Merge pull request #117 from Palmke/familynames

Forward Alarm Arm Delay Event
bropat · Jul 30, 2022 · 5bc60d2 · 5bc60d2
2 parents f3fb0b9 + 9ac12eb
commit 5bc60d2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/src/lib/forward.ts b/src/lib/forward.ts
@@ -459,9 +459,6 @@ export class EventForwarder {
                     case CommandType.CMD_INDOOR_ROTATE:
                         command = DeviceCommand.panAndTilt;
                         break;
-                    case CommandType.CMD_INDOOR_PAN_CALIBRATION:
-                        command = DeviceCommand.calibrate;
-                        break;
                     case CommandType.CMD_SET_DEVS_TONE_FILE:
                         command = DeviceCommand.triggerAlarm;
                         break;
@@ -529,11 +526,19 @@ export class EventForwarder {
         station.on("alarm armed event", (station: Station) => {
             this.forwardEvent({
                 source: "station",
-                event: StationEvent.alarmDelayEvent,
+                event: StationEvent.alarmArmedEvent,
                 serialNumber: station.getSerial()
             }, 11);
         });
 
+        station.on("alarm arm delay event", (station: Station, armDelay: number) => {
+            this.forwardEvent({
+                source: "station",
+                event: StationEvent.alarmArmDelayEvent,
+                serialNumber: station.getSerial(),
+                armDelay: armDelay
+            }, 11);
+        });
     }
 
     private setupDevice(device: Device): void {

diff --git a/src/lib/station/event.ts b/src/lib/station/event.ts
@@ -14,6 +14,7 @@ export enum StationEvent {
     alarmEvent = "alarm event",
     alarmDelayEvent = "alarm delay event",
     alarmArmedEvent = "alarm armed event",
+    alarmArmDelayEvent = "alarm arm delay event",
 }
 
 export interface OutgoingEventStationBase extends OutgoingBaseEvent {
@@ -99,6 +100,13 @@ export interface OutgoingEventStationAlarmArmedEvent extends OutgoingEventStatio
     serialNumber: string;
 }
 
+export interface OutgoingEventStationAlarmArmDelayEvent extends OutgoingEventStationBase {
+    source: "station";
+    event: StationEvent.alarmArmDelayEvent;
+    serialNumber: string;
+    armDelay: number;
+}
+
 export type OutgoingEventStation =
   | OutgoingEventStationAdded
   | OutgoingEventStationRemoved
@@ -110,4 +118,5 @@ export type OutgoingEventStation =
   | OutgoingEventStationPropertyChanged
   | OutgoingEventStationAlarmEvent
   | OutgoingEventStationAlarmDelayEvent
-  | OutgoingEventStationAlarmArmedEvent;
+  | OutgoingEventStationAlarmArmedEvent
+  | OutgoingEventStationAlarmArmDelayEvent;