njs-modbus 1.3.5 → 1.5.0

package/README.md

@@ -89,83 +89,82 @@ modbusMaster
 ### Modbus RTU Slave
 
 ```typescript
+import type { ModbusSlaveModel } from 'njs-modbus';
 import { SerialPhysicalLayer, RtuApplicationLayer, ModbusSlave } from 'njs-modbus';
 
-const MB_SERVER = {
+const physicalLayer = new SerialPhysicalLayer({ path: 'COM1', baudRate: 9600, dataBits: 8, parity: 'none', stopBits: 1 });
+const applicationLayer = new RtuApplicationLayer(physicalLayer);
+
+const slave1Data = {
   discreteInputs: new Map<number, boolean>(),
   coils: new Map<number, boolean>(),
   inputRegisters: new Map<number, number>(),
   holdingRegisters: new Map<number, number>(),
 };
+const slave1: ModbusSlaveModel = {
+  readDiscreteInputs: (address, length) => {
+    return Array.from({ length }).map((_, i) => {
+      const discreteInput = slave1Data.discreteInputs.get(address + i);
+      if (typeof discreteInput === 'undefined') {
+        return false;
+      }
+      return discreteInput;
+    });
+  },
 
-const physicalLayer = new SerialPhysicalLayer({ path: 'COM1', baudRate: 9600, dataBits: 8, parity: 'none', stopBits: 1 });
-const applicationLayer = new RtuApplicationLayer(physicalLayer);
+  readCoils: (address, length) => {
+    return Array.from({ length }).map((_, i) => {
+      const coil = slave1Data.coils.get(address + i);
+      if (typeof coil === 'undefined') {
+        return false;
+      }
+      return coil;
+    });
+  },
+  writeSingleCoil: (address, value) => {
+    slave1Data.coils.set(address, value);
+  },
 
-const modbusSlave = new ModbusSlave(
-  {
-    readDiscreteInputs: (address, length) => {
-      return Array.from({ length }).map((_, i) => {
-        const discreteInput = MB_SERVER.discreteInputs.get(address + i);
-        if (typeof discreteInput === 'undefined') {
-          return false;
-        }
-        return discreteInput;
-      });
-    },
-
-    readCoils: (address, length) => {
-      return Array.from({ length }).map((_, i) => {
-        const coil = MB_SERVER.coils.get(address + i);
-        if (typeof coil === 'undefined') {
-          return false;
-        }
-        return coil;
-      });
-    },
-    writeSingleCoil: (address, value) => {
-      MB_SERVER.coils.set(address, value);
-    },
-
-    readInputRegisters: (address, length) => {
-      return Array.from({ length }).map((_, i) => {
-        const inputRegister = MB_SERVER.inputRegisters.get(address + i);
-        if (typeof inputRegister === 'undefined') {
-          return 0;
-        }
-        return inputRegister;
-      });
-    },
-
-    readHoldingRegisters: (address, length) => {
-      return Array.from({ length }).map((_, i) => {
-        const holdingRegister = MB_SERVER.holdingRegisters.get(address + i);
-        if (typeof holdingRegister === 'undefined') {
-          return 0;
-        }
-        return holdingRegister;
-      });
-    },
-    writeSingleRegister: (address, value) => {
-      MB_SERVER.holdingRegisters.set(address, value);
-    },
-
-    reportServerId: () => ({ additionalData: [1, 2, 3] }),
-
-    readDeviceIdentification: () => ({
-      0x00: 'Basic:VendorName',
-      0x01: 'Basic:ProductCode',
-      0x02: 'Basic:MajorMinorRevision',
-      0x03: 'Regular:VendorUrl',
-      0x04: 'Regular:ProductName',
-      0x05: 'Regular:ModelName',
-      0x06: 'Regular:UserApplicationName',
-      0x80: 'Extended:Extended',
-      0xff: 'Extended:Extended',
-    }),
+  readInputRegisters: (address, length) => {
+    return Array.from({ length }).map((_, i) => {
+      const inputRegister = slave1Data.inputRegisters.get(address + i);
+      if (typeof inputRegister === 'undefined') {
+        return 0;
+      }
+      return inputRegister;
+    });
+  },
+
+  readHoldingRegisters: (address, length) => {
+    return Array.from({ length }).map((_, i) => {
+      const holdingRegister = slave1Data.holdingRegisters.get(address + i);
+      if (typeof holdingRegister === 'undefined') {
+        return 0;
+      }
+      return holdingRegister;
+    });
   },
-  applicationLayer,
-  physicalLayer,
-);
+  writeSingleRegister: (address, value) => {
+    slave1Data.holdingRegisters.set(address, value);
+  },
+
+  reportServerId: () => ({ additionalData: [1, 2, 3] }),
+
+  readDeviceIdentification: () => ({
+    0x00: 'Basic:VendorName',
+    0x01: 'Basic:ProductCode',
+    0x02: 'Basic:MajorMinorRevision',
+    0x03: 'Regular:VendorUrl',
+    0x04: 'Regular:ProductName',
+    0x05: 'Regular:ModelName',
+    0x06: 'Regular:UserApplicationName',
+    0x80: 'Extended:Extended',
+    0xff: 'Extended:Extended',
+  }),
+};
+
+const modbusSlave = new ModbusSlave(applicationLayer, physicalLayer);
+modbusSlave.add(slave1);
 
 modbusSlave
   .open()