From 1f565583e2fd29141d5b6b17dba5b1ba45f383b5 Mon Sep 17 00:00:00 2001 From: mnakada Date: Mon, 30 Jan 2017 22:50:59 +0900 Subject: [PATCH] =?UTF-8?q?wi-sun=E3=83=A2=E3=82=B8=E3=83=A5=E3=83=BC?= =?UTF-8?q?=E3=83=AB=E3=81=A7startDiscovery=E6=99=82=E3=81=ABException?= =?UTF-8?q?=E7=99=BA=E7=94=9F=20=E7=8A=B6=E6=B3=81:=20wi-sun=E3=83=A2?= =?UTF-8?q?=E3=82=B8=E3=83=A5=E3=83=BC=E3=83=AB=E3=82=92=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E3=81=97=E3=81=A6SmrtMeter=E3=82=92startDiscovery=E3=81=A7?= =?UTF-8?q?=E6=A4=9C=E7=B4=A2=E3=81=99=E3=82=8B=E6=99=82=20=5FactiveScan?= =?UTF-8?q?=E3=81=AE=E4=B8=AD=E3=81=A7=E2=80=9DEVENT=2022=E2=80=9D?= =?UTF-8?q?=E3=82=92=E5=8F=97=E3=81=91=E3=81=9F=E3=81=A8=E3=81=8D=E3=81=AE?= =?UTF-8?q?=E5=87=A6=E7=90=86=E3=81=A7this.SERIAL=5FSEND=5FINTERVAL?= =?UTF-8?q?=E3=81=A7startDiscovery=E3=82=92=E5=86=8D=E5=BA=A6=E5=91=BC?= =?UTF-8?q?=E3=81=B3=E5=87=BA=E3=81=99=E5=87=A6=E7=90=86=E3=81=8C=E3=81=82?= =?UTF-8?q?=E3=82=8B=E3=81=8C=E3=80=81startDiscovery=E3=81=AE=E7=AC=AC1?= =?UTF-8?q?=E5=BC=95=E6=95=B0=E3=81=8C=E6=8A=9C=E3=81=91=E3=81=A6=E3=81=84?= =?UTF-8?q?=E3=82=8B=E3=81=9F=E3=82=81Exception=E3=81=8C=E7=99=BA=E7=94=9F?= =?UTF-8?q?=E3=81=97=E3=81=A6=E3=81=84=E3=82=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 対応：activeScanにbufを渡して、startDiscovery呼び出し時にbufを使用するように変更。 [[ Exception ]] Mon Jan 30 2017 22:03:22 GMT+0900 (JST) TypeError: "list" argument must be an Array of Buffers at Function.Buffer.concat (buffer.js:314:13) at EchonetLiteNetWisunbAdapter.createBufferSKSENDTO (/home/test/wisun_test/node_modules/node-echonet-lite/lib/net/wisunb-bp35a1.js:29:23) at EchonetLiteNetWisunb.send (/home/test/wisun_test/node_modules/node-echonet-lite/lib/net/wisunb.js:429:33) at Timeout.setTimeout (/home/test/wisun_test/node_modules/node-echonet-lite/lib/net/wisunb.js:286:10) at ontimeout (timers.js:365:14) at tryOnTimeout (timers.js:237:5) at Timer.listOnTimeout (timers.js:207:5) TypeError: "list" argument must be an Array of Buffers at Function.Buffer.concat (buffer.js:314:13) at EchonetLiteNetWisunbAdapter.createBufferSKSENDTO (/home/test/wisun_test/node_modules/node-echonet-lite/lib/net/wisunb-bp35a1.js:29:23) at EchonetLiteNetWisunb.send (/home/test/wisun_test/node_modules/node-echonet-lite/lib/net/wisunb.js:429:33) at Timeout.setTimeout (/home/test/wisun_test/node_modules/node-echonet-lite/lib/net/wisunb.js:286:10) at ontimeout (timers.js:365:14) at tryOnTimeout (timers.js:237:5) at Timer.listOnTimeout (timers.js:207:5) --- lib/net/wisunb.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/net/wisunb.js b/lib/net/wisunb.js index 8e43a0c..34684f3 100644 --- a/lib/net/wisunb.js +++ b/lib/net/wisunb.js @@ -277,7 +277,7 @@ EchonetLiteNetWisunb.prototype.startDiscovery = function(buf, callback) { callback = function() {}; } this.is_discovering = true; - this._activeScan((err) => { + this._activeScan(buf, (err) => { if(err) { callback(err); } else { @@ -294,7 +294,7 @@ EchonetLiteNetWisunb.prototype.startDiscovery = function(buf, callback) { }; // Start the active scan -EchonetLiteNetWisunb.prototype._activeScan = function(callback) { +EchonetLiteNetWisunb.prototype._activeScan = function(buf, callback) { this._setSerialCallback((res) => { if(res.match(/(^|\r\n)FAIL/)) { var msg = 'Failed the active scan: ' + this._getFailLine(res); @@ -317,7 +317,7 @@ EchonetLiteNetWisunb.prototype._activeScan = function(callback) { }, this.SERIAL_SEND_INTERVAL); } else { this.discovery_timer_id = setTimeout(() => { - this.startDiscovery(callback); + this.startDiscovery(buf, callback); }, this.SERIAL_SEND_INTERVAL); } }