Skip to content

Commit

Permalink
Error correction
Browse files Browse the repository at this point in the history
  • Loading branch information
markxroberts authored Nov 19, 2023
1 parent 1bdae72 commit c261d31
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/lib/risco-mqtt-local.ts
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ export function riscoMqttHomeAssistant(userConfig: RiscoMQTTConfig) {
let reconnecting = false;
let awaitPartitionReady = false;
let partitionDetail;
let partitionStatus;
let partitionReadyStatus;

if (!config.mqtt?.url) throw new Error('[RML] MQTT url option is required');

Expand Down Expand Up @@ -390,7 +390,7 @@ export function riscoMqttHomeAssistant(userConfig: RiscoMQTTConfig) {
case 'disarmed':
return await panel.disarmPart(partId);
case 'armed_home':
if (partitionStatus[partId]) {
if (partitionReadyStatus[partId]) {
logger.info(`Partition ${partId} ready, sending arm command`)
return await panel.armHome(partId);
} else {
Expand All @@ -407,7 +407,7 @@ export function riscoMqttHomeAssistant(userConfig: RiscoMQTTConfig) {
logger.info(`${error}`)
}
case 'armed_group':
if (partitionStatus[partId]) {
if (partitionReadyStatus[partId]) {
logger.info(`Partition ${partId} ready, sending arm command`)
return await panel.armGroup(partId, group);
} else {
Expand Down Expand Up @@ -882,7 +882,7 @@ export function riscoMqttHomeAssistant(userConfig: RiscoMQTTConfig) {

for (const partition of activePartitions(panel.partitions)) {

partitionStatus[partition.Id] = partition.Ready
partitionReadyStatus[partition.Id] = partition.Ready
logger.debug(`Partition status on ${partition.Id} is ${partition.Ready}`)

const partitionConf = cloneDeep(config.partitions.default);
Expand Down Expand Up @@ -1225,12 +1225,12 @@ export function riscoMqttHomeAssistant(userConfig: RiscoMQTTConfig) {
publishPartitionStatus(panel.partitions.byId(Id));
if (awaitPartitionReady && ['Ready'].includes(EventStr)) {
logger.info(`Partition ${Id} now ready, so sending arming command.`)
partitionStatus[Id] = true
partitionReadyStatus[Id] = true
clearTimeout(partitionwait);
changeAlarmStatus(partitionDetail.type, partitionDetail.partId);
awaitPartitionReady = false
} else {
partitionStatus[Id] = false;
partitionReadyStatus[Id] = false;
partitionwait = setTimeout(() => awaitPartitionReady = false, 30000)
logger.info(`Arming command timed out on partition ${Id}`)
}
Expand Down

0 comments on commit c261d31

Please sign in to comment.