Merge pull request #473 from emcell/master

fix(modbus-client): respect parallelUnitIdsAllowed in queue
BiancoRoyal · Jun 27, 2024 · b6145e9 · b6145e9
2 parents 253b199 + 5c3345f
commit b6145e9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-modbus",
-  "version": "5.40.0",
+  "version": "5.41.0",
   "private": false,
   "description": "The all in one Modbus TCP and Serial contribution long term supported package for Node-RED.",
   "dependencies": {

diff --git a/src/modbus-client.js b/src/modbus-client.js
@@ -221,11 +221,18 @@ module.exports = function (RED) {
 
       if (state.matches('queueing')) {
         if (node.clienttype === 'tcp') {
-          node.stateService.send('SEND')
+          if (!node.parallelUnitIdsAllowed) {
+            if (node.serialSendingAllowed) {
+              coreModbusQueue.queueSerialLockCommand(node);
+              node.stateService.send('SEND');
+            }
+          } else {
+            node.stateService.send('SEND');
+          }
         } else {
           if (node.serialSendingAllowed) {
-            coreModbusQueue.queueSerialLockCommand(node)
-            node.stateService.send('SEND')
+            coreModbusQueue.queueSerialLockCommand(node);
+            node.stateService.send('SEND');
           }
         }
       }