Merge pull request #148 from biancode/major_update_serialport

Major update serialport
yaacov · Sep 26, 2017 · 363b98b · 363b98b
2 parents 66976ad + 79a8697
commit 363b98b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -31,3 +31,5 @@ build/Release
 node_modules
 modbus-serial
 docs
+
+package-lock\.json
diff --git a/examples/buffered_server.js b/examples/buffered_server.js
@@ -11,19 +11,20 @@ var unitId = 1;
 var minAddress = 0;
 var maxInputAddress = 10001;
 var maxAddress = 20001;
+var bufferFactor = 8;
 
 //     1...10000*  address - 1      Coils (outputs)    0   Read/Write
 // 10001...20000*  address - 10001  Discrete Inputs    01  Read
 // 30001...40000*  address - 30001  Input Registers    04  Read
 // 40001...50000*  address - 40001  Holding Registers  03  Read/Write
 
 var vector = {
-    getCoil: function(addr, unitID) { if (unitID === unitId && addr >= minAddress && addr < maxAddress) { return coils.readUInt8(addr); } },
-    getInputRegister: function(addr, unitID) { if (unitID === unitId && addr >= minAddress && addr < maxInputAddress) { return regsiters.readUInt16BE(addr); } },
-    getHoldingRegister: function(addr, unitID) { if (unitID === unitId && addr >= minAddress && addr < maxAddress) { return regsiters.readUInt16BE(addr); } },
+    getCoil: function(addr, unitID) { if (unitID === unitId && addr >= minAddress && addr < maxAddress) { return coils.readUInt8(addr * bufferFactor); } },
+    getInputRegister: function(addr, unitID) { if (unitID === unitId && addr >= minAddress && addr < maxInputAddress) { return regsiters.readUInt16BE(addr * bufferFactor); } },
+    getHoldingRegister: function(addr, unitID) { if (unitID === unitId && addr >= maxInputAddress && addr < maxAddress) { return regsiters.readUInt16BE(addr * bufferFactor); } },
 
-    setCoil: function(addr, value, unitID) { if (unitID === unitId && addr >= minAddress && addr < maxAddress) { coils.writeUInt8(value, addr); } },
-    setRegister: function(addr, value, unitID) { if (unitID === unitId && addr >= minAddress && addr < maxAddress) { regsiters.writeUInt16BE(value, addr); } }
+    setCoil: function(addr, value, unitID) { if (unitID === unitId && addr >= minAddress && addr < maxAddress) { coils.writeUInt8(value, addr * bufferFactor); } },
+    setRegister: function(addr, value, unitID) { if (unitID === unitId && addr >= minAddress && addr < maxAddress) { regsiters.writeUInt16BE(value, addr * bufferFactor); } }
 };
 
 // set the server to answer for modbus requests

diff --git a/examples/write_complete.js b/examples/write_complete.js
@@ -68,7 +68,7 @@ function writeRegisters() {
   // write 5 registers statrting at input registers
     client.writeRegisters(1, [100, 90, 80, -200 + 65535, -100 + 65535])
         .then(function(d) {
-            console.log("Write 10, 9, 8, -20, -10 to input registers", d); })
+            console.log("Write 100, 90, 80, -200, -100 to input registers", d); })
         .catch(function(e) {
             console.log(e.message); })
         .then(writeHoldingRegsiters);

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "modbus-serial",
-  "version": "5.4.1",
+  "version": "6.0.0",
   "description": "A pure JavaScript implemetation of MODBUS-RTU (Serial and TCP) for NodeJS.",
   "main": "index.js",
   "scripts": {
@@ -36,8 +36,11 @@
     "pump": "^1.0.2",
     "sinon": "^1.17.7"
   },
+  "engines": {
+    "node": "4.x || 6.x"
+  },
   "dependencies": {
-    "debug": "^2.6.1",
-    "serialport": "^4.0.7"
+    "debug": "^3.0.1",
+    "serialport": "^5.0.0"
   }
 }