@@ -172,7 +172,7 @@ export class ADTPulseAccessory {
172
172
// Set the "AccessoryInformation" characteristics.
173
173
this . #services. Information
174
174
. setCharacteristic ( this . #characteristic. Identify , false )
175
- . setCharacteristic ( this . #characteristic. Manufacturer , manufacturer ?? 'ADT ' )
175
+ . setCharacteristic ( this . #characteristic. Manufacturer , manufacturer ?? 'N/A ' )
176
176
. setCharacteristic ( this . #characteristic. Model , model ?? 'N/A' )
177
177
. setCharacteristic ( this . #characteristic. Name , name )
178
178
. setCharacteristic ( this . #characteristic. SerialNumber , serial ?? 'N/A' )
@@ -626,7 +626,11 @@ export class ADTPulseAccessory {
626
626
627
627
// Find the state for "Security System Alarm Type" (optional characteristic).
628
628
if ( mode === 'alarmType' ) {
629
- if ( isPanelAlarmActive ( panelStatuses , this . #config?. options . includes ( 'ignoreSensorProblemStatus' ) ?? false ) ) {
629
+ if ( isPanelAlarmActive (
630
+ panelStatuses ,
631
+ this . #state. data . orbSecurityButtons ,
632
+ this . #config?. options . includes ( 'ignoreSensorProblemStatus' ) ?? false ,
633
+ ) ) {
630
634
return 1 ;
631
635
}
632
636
@@ -662,7 +666,11 @@ export class ADTPulseAccessory {
662
666
switch ( true ) {
663
667
case mode === 'current' && this . #activity. isBusy && this . #activity. setCurrentValue !== null :
664
668
return this . #activity. setCurrentValue ;
665
- case mode === 'current' && isPanelAlarmActive ( panelStatuses , this . #config?. options . includes ( 'ignoreSensorProblemStatus' ) ?? false ) :
669
+ case mode === 'current' && isPanelAlarmActive (
670
+ panelStatuses ,
671
+ this . #state. data . orbSecurityButtons ,
672
+ this . #config?. options . includes ( 'ignoreSensorProblemStatus' ) ?? false ,
673
+ ) :
666
674
return this . #characteristic. SecuritySystemCurrentState . ALARM_TRIGGERED ;
667
675
case mode === 'current' && panelStates . includes ( 'Armed Stay' ) :
668
676
return this . #characteristic. SecuritySystemCurrentState . STAY_ARM ;
@@ -748,7 +756,11 @@ export class ADTPulseAccessory {
748
756
}
749
757
750
758
// Only show as "On" if alarm is ringing.
751
- return isPanelAlarmActive ( panelStatuses , this . #config?. options . includes ( 'ignoreSensorProblemStatus' ) ?? false ) ;
759
+ return isPanelAlarmActive (
760
+ panelStatuses ,
761
+ this . #state. data . orbSecurityButtons ,
762
+ this . #config?. options . includes ( 'ignoreSensorProblemStatus' ) ?? false ,
763
+ ) ;
752
764
}
753
765
754
766
/**
@@ -798,7 +810,11 @@ export class ADTPulseAccessory {
798
810
const { panelStates } = this . #state. data . panelStatus ;
799
811
800
812
const condensedPanelStates = condensePanelStates ( this . #characteristic, panelStates ) ;
801
- const isAlarmActive = isPanelAlarmActive ( this . #state. data . panelStatus . panelStatuses , this . #config?. options . includes ( 'ignoreSensorProblemStatus' ) ?? false ) ;
813
+ const isAlarmActive = isPanelAlarmActive (
814
+ this . #state. data . panelStatus . panelStatuses ,
815
+ this . #state. data . orbSecurityButtons ,
816
+ this . #config?. options . includes ( 'ignoreSensorProblemStatus' ) ?? false ,
817
+ ) ;
802
818
803
819
// If panel status cannot be found or most likely "Status Unavailable".
804
820
if ( condensedPanelStates === undefined ) {
@@ -937,7 +953,11 @@ export class ADTPulseAccessory {
937
953
const { panelStates } = this . #state. data . panelStatus ;
938
954
939
955
const condensedPanelStates = condensePanelStates ( this . #characteristic, panelStates ) ;
940
- const isAlarmActive = isPanelAlarmActive ( this . #state. data . panelStatus . panelStatuses , this . #config?. options . includes ( 'ignoreSensorProblemStatus' ) ?? false ) ;
956
+ const isAlarmActive = isPanelAlarmActive (
957
+ this . #state. data . panelStatus . panelStatuses ,
958
+ this . #state. data . orbSecurityButtons ,
959
+ this . #config?. options . includes ( 'ignoreSensorProblemStatus' ) ?? false ,
960
+ ) ;
941
961
942
962
// If panel status cannot be found or most likely "Status Unavailable".
943
963
if ( condensedPanelStates === undefined ) {
0 commit comments