From c451c369349f87b436c3eafdfcd07f218e5f7918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=9F=E8=BF=9B?= Date: Wed, 16 Jan 2019 05:47:46 +0000 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20main.js?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.js | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/main.js b/main.js index c033d9c..311e224 100644 --- a/main.js +++ b/main.js @@ -345,6 +345,7 @@ function checkObjects(options, regType, regName, regFullName, tasks, newObjects) regs[i].fullId = id; + objects[id] = { _id: regs[i].id, type: 'state', @@ -363,28 +364,26 @@ function checkObjects(options, regType, regName, regFullName, tasks, newObjects) deviceId: regs[i].deviceId } }; - if (regType === 'inputRegs' || regType === 'holdingRegs') { - objects[id].common.unit = regs[i].unit || ''; - - objects[id].native.type = regs[i].type; - objects[id].native.len = regs[i].len; - objects[id].native.offset = regs[i].offset; - objects[id].native.factor = regs[i].factor; - if (regType === 'holdingRegs') { - objects[id].native.poll = regs[i].poll; - } - } + + objects[id].common.unit = regs[i].unit || ''; + objects[id].native.type = regs[i].type; + objects[id].native.len = regs[i].len; + objects[id].native.offset = regs[i].offset; + objects[id].native.factor = regs[i].factor; + objects[id].native.poll = regs[i].poll; tasks.push({ id: regs[i].id, name: 'add', obj: objects[id] }); + tasks.push({ id: id, name: 'syncEnums', obj: regs[i].room }); + newObjects.push(id); }