From ed8a36c9ac741439c2907d9ae10cc7a35f8acb03 Mon Sep 17 00:00:00 2001 From: tyranno Date: Sat, 7 Sep 2024 21:06:38 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EC=AA=BC=EA=BC=AC=20=EB=B6=80=ED=8C=85?= =?UTF-8?q?=ED=9B=84=20=EC=84=BC=EC=84=9C=20=EC=9D=B8=EC=A7=80=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/modules/choco.js | 11 ++++++++++- app/modules/choco2.js | 9 +++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/app/modules/choco.js b/app/modules/choco.js index 4befe1515..71ce0e80f 100644 --- a/app/modules/choco.js +++ b/app/modules/choco.js @@ -307,11 +307,20 @@ class Choco extends BaseModule { * @param {*} handler */ requestRemoteData(handler) { + //sensor데이터는 상태가 바뀔때 전송한다. + if ( + _.isEmpty(this.previousSensorData) || + !_.isEqual(this.previousSensorData, this.sensorData) + ) { + handler.write('sensorData', this.sensorData); + this.previousSensorData = _.cloneDeep(this.sensorData); + } + if (this.executeCmd.processing === 'done') { this.log('requestRemoteData done', this.executeCmd.id); handler.write('msg_id', this.executeCmd.id); - handler.write('sensorData', this.sensorData); + // handler.write('sensorData', this.sensorData); this.executeCmd.id = ''; this.executeCmd.processing = 'none'; diff --git a/app/modules/choco2.js b/app/modules/choco2.js index 4befe1515..5cdb36157 100644 --- a/app/modules/choco2.js +++ b/app/modules/choco2.js @@ -307,6 +307,15 @@ class Choco extends BaseModule { * @param {*} handler */ requestRemoteData(handler) { + //sensor데이터는 상태가 바뀔때 전송한다. + if ( + _.isEmpty(this.previousSensorData) || + !_.isEqual(this.previousSensorData, this.sensorData) + ) { + handler.write('sensorData', this.sensorData); + this.previousSensorData = _.cloneDeep(this.sensorData); + } + if (this.executeCmd.processing === 'done') { this.log('requestRemoteData done', this.executeCmd.id); From 191cf4c2f55161561c1783205214798c528ac85f Mon Sep 17 00:00:00 2001 From: tyranno Date: Sat, 7 Sep 2024 21:27:31 +0900 Subject: [PATCH 2/3] =?UTF-8?q?Revert=20"=EC=AA=BC=EA=BC=AC=20=EB=B6=80?= =?UTF-8?q?=ED=8C=85=ED=9B=84=20=EC=84=BC=EC=84=9C=20=EC=9D=B8=EC=A7=80=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=20=EA=B0=9C=EC=84=A0"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit ed8a36c9ac741439c2907d9ae10cc7a35f8acb03. --- app/modules/choco.js | 11 +---------- app/modules/choco2.js | 9 --------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/app/modules/choco.js b/app/modules/choco.js index 71ce0e80f..4befe1515 100644 --- a/app/modules/choco.js +++ b/app/modules/choco.js @@ -307,20 +307,11 @@ class Choco extends BaseModule { * @param {*} handler */ requestRemoteData(handler) { - //sensor데이터는 상태가 바뀔때 전송한다. - if ( - _.isEmpty(this.previousSensorData) || - !_.isEqual(this.previousSensorData, this.sensorData) - ) { - handler.write('sensorData', this.sensorData); - this.previousSensorData = _.cloneDeep(this.sensorData); - } - if (this.executeCmd.processing === 'done') { this.log('requestRemoteData done', this.executeCmd.id); handler.write('msg_id', this.executeCmd.id); - // handler.write('sensorData', this.sensorData); + handler.write('sensorData', this.sensorData); this.executeCmd.id = ''; this.executeCmd.processing = 'none'; diff --git a/app/modules/choco2.js b/app/modules/choco2.js index 5cdb36157..4befe1515 100644 --- a/app/modules/choco2.js +++ b/app/modules/choco2.js @@ -307,15 +307,6 @@ class Choco extends BaseModule { * @param {*} handler */ requestRemoteData(handler) { - //sensor데이터는 상태가 바뀔때 전송한다. - if ( - _.isEmpty(this.previousSensorData) || - !_.isEqual(this.previousSensorData, this.sensorData) - ) { - handler.write('sensorData', this.sensorData); - this.previousSensorData = _.cloneDeep(this.sensorData); - } - if (this.executeCmd.processing === 'done') { this.log('requestRemoteData done', this.executeCmd.id); From 9ac4f528ea0381b659fbd95e29e4427b68dcc34d Mon Sep 17 00:00:00 2001 From: tyranno Date: Sat, 7 Sep 2024 21:30:06 +0900 Subject: [PATCH 3/3] =?UTF-8?q?"=EC=AA=BC=EA=BC=AC=20=EB=B6=80=ED=8C=85?= =?UTF-8?q?=ED=9B=84=20=EC=84=BC=EC=84=9C=20=EC=9D=B8=EC=A7=80=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=20=EA=B0=9C=EC=84=A0"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/modules/choco.js | 11 ++++++++++- app/modules/choco2.js | 13 +++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/app/modules/choco.js b/app/modules/choco.js index 4befe1515..2c67acbcf 100644 --- a/app/modules/choco.js +++ b/app/modules/choco.js @@ -307,11 +307,20 @@ class Choco extends BaseModule { * @param {*} handler */ requestRemoteData(handler) { + //sensor데이터는 상태가 바뀔때 전송한다. + if ( + _.isEmpty(this.previousSensorData) || + !_.isEqual(this.previousSensorData, this.sensorData) + ) { + handler.write('sensorData', this.sensorData); + this.previousSensorData = _.cloneDeep(this.sensorData); + } + if (this.executeCmd.processing === 'done') { this.log('requestRemoteData done', this.executeCmd.id); handler.write('msg_id', this.executeCmd.id); - handler.write('sensorData', this.sensorData); + //handler.write('sensorData', this.sensorData); this.executeCmd.id = ''; this.executeCmd.processing = 'none'; diff --git a/app/modules/choco2.js b/app/modules/choco2.js index 4befe1515..4806e93ea 100644 --- a/app/modules/choco2.js +++ b/app/modules/choco2.js @@ -307,17 +307,26 @@ class Choco extends BaseModule { * @param {*} handler */ requestRemoteData(handler) { + //sensor데이터는 상태가 바뀔때 전송한다. + if ( + _.isEmpty(this.previousSensorData) || + !_.isEqual(this.previousSensorData, this.sensorData) + ) { + handler.write('sensorData', this.sensorData); + this.previousSensorData = _.cloneDeep(this.sensorData); + } + if (this.executeCmd.processing === 'done') { this.log('requestRemoteData done', this.executeCmd.id); handler.write('msg_id', this.executeCmd.id); - handler.write('sensorData', this.sensorData); + //handler.write('sensorData', this.sensorData); this.executeCmd.id = ''; this.executeCmd.processing = 'none'; } }; - + /** * 엔트리에서 받은 데이터에 대한 처리 * @param {*} handler