From 6934206d18ba7d4f4f5a64e880e21b5723fc1371 Mon Sep 17 00:00:00 2001 From: Administrator Date: Thu, 8 Nov 2018 10:45:28 +0800 Subject: [PATCH] Update main.js --- main.js | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/main.js b/main.js index d746620..3ccf1d2 100644 --- a/main.js +++ b/main.js @@ -287,11 +287,10 @@ function checkObjects(options, regType, regName, regFullName, tasks, newObjects) common: { name: regs[i].description, role: regs[i].role, - type: regType === 'coils' || regType === 'disInputs' ? 'boolean' : - ((regs[i].type === 'string' || regs[i].type === 'string') ? 'string' : 'number'), + type: regs[i].type, read: true, - write: regType === 'coils' || regType === 'holdingRegs', - def: regType === 'coils' || regType === 'disInputs' ? false : 0 + write: true, + def: regs[i].type === 'boolean' ? false : regs[i].value }, native: { regType: regType, @@ -299,21 +298,11 @@ function checkObjects(options, regType, regName, regFullName, tasks, newObjects) deviceId: regs[i].deviceId } }; + if (regType === 'coils') { objects[id].native.poll = regs[i].poll; objects[id].native.wp = regs[i].wp; - } else - 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; - } - } + } tasks.push({ id: regs[i].id,