-
-
Notifications
You must be signed in to change notification settings - Fork 112
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
25 changed files
with
4,271 additions
and
1,787 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,6 +18,8 @@ rm package-lock.json | |
|
|
||
| rm yarn.lock | ||
|
|
||
| npm run clean | ||
|
|
||
| npm cache verify | ||
|
|
||
| npm install | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,9 +5,10 @@ | |
| @author <a href="mailto:[email protected]">Klaus Landsdorf</a> (Bianco Royal) | ||
| */ | ||
|
|
||
| /** | ||
| * Modbus flexible Getter node. | ||
| * @module NodeRedModbusFlexGetter | ||
| * Flex Connector Node. | ||
| * @module NodeRedModbusFlexConnector | ||
| * | ||
| * @param RED | ||
| */ | ||
|
|
@@ -19,6 +20,7 @@ module.exports = function (RED) { | |
|
|
||
| function ModbusFlexConnector (config) { | ||
| RED.nodes.createNode(this, config) | ||
|
|
||
| this.name = config.name | ||
| this.maxReconnectsPerMinute = config.maxReconnectsPerMinute || 4 | ||
| this.emptyQueue = config.emptyQueue | ||
|
|
@@ -29,53 +31,82 @@ module.exports = function (RED) { | |
| this.internalDebugLog = internalDebugLog | ||
| this.verboseLogging = RED.settings.verbose | ||
| this.server = RED.nodes.getNode(config.server) | ||
| this.emptyMsgOnFail = config.emptyMsgOnFail | ||
| this.configMsgOnChange = config.configMsgOnChange | ||
|
|
||
| const node = this | ||
|
|
||
| mbBasics.setNodeStatusTo('waiting', node) | ||
| if (!this.server) { | ||
|
|
||
| if (!node.server) { | ||
| mbBasics.setNodeStatusTo('disconnected', node) | ||
| return | ||
| } | ||
| this.server.registerForModbus(node) | ||
|
|
||
| mbBasics.setNodeStatusTo('connecting', node) | ||
|
|
||
| node.server.registerForModbus(node) | ||
| mbBasics.initModbusClientEvents(node, this.server) | ||
|
|
||
| node.onConfigDone = function (msg) { | ||
| const shouldShowStatus = node.showStatusActivities | ||
| if (shouldShowStatus) { | ||
| mbBasics.setNodeStatusTo('config done', node) | ||
| } | ||
| if (shouldShowStatus) { | ||
| mbBasics.setNodeStatusTo(this.server.actualServiceState, node) | ||
| } | ||
|
|
||
| if (!shouldShowStatus) { | ||
| if (node.showStatusActivities) { | ||
| mbBasics.setNodeStatusTo(node.server.actualServiceState, node) | ||
| } else { | ||
| mbBasics.setNodeDefaultStatus(node) | ||
| } | ||
|
|
||
| msg.error.nodeStatus = node.statusText | ||
|
|
||
| if (node.emptyMsgOnFail) { | ||
| msg.payload = '' | ||
| if (node.configMsgOnChange) { | ||
| msg.payload = msg.payload || {} | ||
| msg.payload.status = 'changed' | ||
| } else { | ||
| msg.config_change = 'emitted' | ||
| } | ||
|
|
||
| node.send(msg) | ||
| } | ||
|
|
||
| node.onConfigError = function (err, msg) { | ||
| internalDebugLog(err.message) | ||
|
|
||
| if (node.showErrors) { | ||
| if (node.showStatusActivities) { | ||
| mbBasics.setNodeStatusTo('error', node) | ||
| } else { | ||
| mbBasics.setNodeDefaultStatus(node) | ||
| } | ||
|
|
||
| if (err && err.message) { | ||
| msg.error = err | ||
| } else { | ||
| msg.error = new Error(err) | ||
| } | ||
|
|
||
| msg.error.nodeStatus = node.statusText | ||
|
|
||
| node.error(msg.error, msg) | ||
|
|
||
| if (node.emptyMsgOnFail) { | ||
| msg.payload = '' | ||
| } | ||
|
|
||
| node.send(msg) | ||
| } | ||
| } | ||
|
|
||
| node.on('input', function (msg) { | ||
| if (mbBasics.invalidPayloadIn(msg)) { | ||
| return | ||
| } | ||
|
|
||
| // if (!this.server) { | ||
| // return | ||
| // } | ||
|
|
||
| if (node.showStatusActivities) { | ||
| mbBasics.setNodeStatusTo(this.server.actualServiceState, node) | ||
| mbBasics.setNodeStatusTo(node.server.actualServiceState, node) | ||
| } | ||
|
|
||
| if (msg.payload.connectorType) { | ||
| internalDebugLog(`dynamicReconnect: ${JSON.stringify(msg.payload)}`) | ||
|
|
||
| msg.payload.emptyQueue = node.emptyQueue | ||
| this.server.emit('dynamicReconnect', msg, node.onConfigDone, node.onConfigError) | ||
| node.server.emit('dynamicReconnect', msg, node.onConfigDone, node.onConfigError) | ||
| } else { | ||
| const error = new Error('Payload Not Valid - Connector Type') | ||
| node.error(error, msg) | ||
|
|
@@ -84,7 +115,9 @@ module.exports = function (RED) { | |
| } | ||
| }) | ||
|
|
||
| if (!node.showStatusActivities) { | ||
| if (node.showStatusActivities) { | ||
| mbBasics.setNodeStatusTo('active', node) | ||
| } else { | ||
| mbBasics.setNodeDefaultStatus(node) | ||
| } | ||
| } | ||
|
|
||
Oops, something went wrong.