mtan93/homebridge
1
0
Fork 0
mirror of https://github.com/mtan93/homebridge.git synced 2026-04-14 22:05:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug in alarm state. Was using alarm state instead of mode to translate current state.

Browse Source
This commit is contained in:
rodtoll
2015-10-19 19:38:14 -07:00
parent 00574f60b4
commit 70ec9a8891
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
platforms/isy-js.js
View File

@@ -656,6 +656,7 @@ ISYElkAlarmPanelAccessory.prototype.setAlarmTargetState = function(targetStateHK
ISYElkAlarmPanelAccessory.prototype.translateAlarmCurrentStateToHK = function() { ISYElkAlarmPanelAccessory.prototype.translateAlarmCurrentStateToHK = function() {
var tripState = this.device.getAlarmTripState(); var tripState = this.device.getAlarmTripState();
var sourceAlarmState = this.device.getAlarmState(); var sourceAlarmState = this.device.getAlarmState();
var sourceAlarmMode = this.device.getAlarmMode();
if(tripState >= this.device.ALARM_TRIP_STATE_TRIPPED) { if(tripState >= this.device.ALARM_TRIP_STATE_TRIPPED) {
return Characteristic.SecuritySystemCurrentState.ALARM_TRIGGERED; return Characteristic.SecuritySystemCurrentState.ALARM_TRIGGERED;
@@ -664,14 +665,14 @@ ISYElkAlarmPanelAccessory.prototype.translateAlarmCurrentStateToHK = function()
sourceAlarmState == this.device.ALARM_STATE_READY_TO_ARM_VIOLATION) { sourceAlarmState == this.device.ALARM_STATE_READY_TO_ARM_VIOLATION) {
return Characteristic.SecuritySystemCurrentState.DISARMED; return Characteristic.SecuritySystemCurrentState.DISARMED;
} else { } else {
if(sourceAlarmState == this.device.ALARM_MODE_STAY || sourceAlarmState == this.device.ALARM_MODE_STAY_INSTANT ) { if(sourceAlarmMode == this.device.ALARM_MODE_STAY || sourceAlarmMode == this.device.ALARM_MODE_STAY_INSTANT ) {
return Characteristic.SecuritySystemCurrentState.STAY_ARM; return Characteristic.SecuritySystemCurrentState.STAY_ARM;
} else if(sourceAlarmState == this.device.ALARM_MODE_AWAY || sourceAlarmState == this.device.ALARM_MODE_VACATION) { } else if(sourceAlarmMode == this.device.ALARM_MODE_AWAY || sourceAlarmMode == this.device.ALARM_MODE_VACATION) {
return Characteristic.SecuritySystemCurrentState.AWAY_ARM; return Characteristic.SecuritySystemCurrentState.AWAY_ARM;
} else if(sourceAlarmState == this.device.ALARM_MODE_NIGHT || sourceAlarmState == this.device.ALARM_MODE_NIGHT_INSTANT) { } else if(sourceAlarmMode == this.device.ALARM_MODE_NIGHT || sourceAlarmMode == this.device.ALARM_MODE_NIGHT_INSTANT) {
return Characteristic.SecuritySystemCurrentState.NIGHT_ARM; return Characteristic.SecuritySystemCurrentState.NIGHT_ARM;
} else { } else {
ISYJSDebugMessage(this,"Setting to disarmed because sourceAlarmState is "+sourceAlarmState); ISYJSDebugMessage(this,"Setting to disarmed because sourceAlarmMode is "+sourceAlarmMode);
return Characteristic.SecuritySystemCurrentState.DISARMED; return Characteristic.SecuritySystemCurrentState.DISARMED;
} }
} }