From 3824437d7a95259953717650813500c346c9a709 Mon Sep 17 00:00:00 2001 From: gjbadros Date: Fri, 14 Jun 2019 14:53:42 -0700 Subject: [PATCH] Factor out circuitData() and use it for is{Spa,Pool}Active (#8) --- messages/SLPoolStatusMessage.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/messages/SLPoolStatusMessage.js b/messages/SLPoolStatusMessage.js index 4ca4579..0fc5b10 100755 --- a/messages/SLPoolStatusMessage.js +++ b/messages/SLPoolStatusMessage.js @@ -87,20 +87,21 @@ exports.SLPoolStatusMessage = class SLPoolStatusMessage extends SLMessage { return this.ok === 3; } - isSpaActive() { + circuitData(id) { for (let i = 0; i < this.circuitArray.length; i++) { - if (this.circuitArray[i].id === SPA_CIRCUIT_ID) { - return this.circuitArray[i].state === 1; + if (this.circuitArray[i].id === id) { + return this.circuitArray[i]; } } + return undef; + } + + isSpaActive() { + return this.circuitData(SPA_CIRCUIT_ID).state === 1; } isPoolActive() { - for (let i = 0; i < this.circuitArray.length; i++) { - if (this.circuitArray[i].id === POOL_CIRCUIT_ID) { - return this.circuitArray[i].state === 1; - } - } + return this.circuitData(POOL_CIRCUIT_ID).state === 1; } static getResponseId() {