Skip to content

Commit

Permalink
Merge branch 'release/540'
Browse files Browse the repository at this point in the history
  • Loading branch information
biancode committed Mar 28, 2020
2 parents a102045 + 581a7a5 commit 065d277
Show file tree
Hide file tree
Showing 61 changed files with 2,658 additions and 3,367 deletions.
8 changes: 5 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
language: node_js
matrix:
include:
- node_js: 13
- node_js: "lts/*"
- node_js: 10
- node_js: 8
- node_js: 6
allow_failures:
- node_js: "lts/*"
- node_js: 13
- node_js: 10
- node_js: 8
- node_js: 6
install:
- npm install
- npm install --only=dev
Expand All @@ -23,3 +23,5 @@ branches:
only:
- master
- develop
- alpha
- beta
136 changes: 61 additions & 75 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,184 +1,170 @@
# Changelog
# [5.4.0](https://github.com/biancoroyal/node-red-contrib-modbus/compare/v5.4.0-alpha.4...v5.4.0) (2020-03-28)

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [5.2.0](https://github.com/biancoroyal/node-red-contrib-modbus/compare/v5.1.0...v5.2.0) (2019-12-08)


### Features

* [#161](https://github.com/biancoroyal/node-red-contrib-modbus/issues/161) multiple RTU devices via UnitID ([b0b5011](https://github.com/biancoroyal/node-red-contrib-modbus/commit/b0b5011be4ab5e7c06ab44fd9df7b0ff5ddd0fd8))
# [5.4.0-alpha.4](https://github.com/biancoroyal/node-red-contrib-modbus/compare/v5.4.0-alpha.3...v5.4.0-alpha.4) (2020-03-27)


### Bug Fixes

* [#160](https://github.com/biancoroyal/node-red-contrib-modbus/issues/160) error on show activities true ([af27fe6](https://github.com/biancoroyal/node-red-contrib-modbus/commit/af27fe616654eb074bb29f34a163d4ffabc742bd))
* serialport list call ([f401c58](https://github.com/biancoroyal/node-red-contrib-modbus/commit/f401c58cb384ce87489aecaa99a3000f18e4222b))
* typo config node client ([9be8b16](https://github.com/biancoroyal/node-red-contrib-modbus/commit/9be8b1634469abfe6b8b6fb471a16f9387b6cee4))
* needs new on re-register nodes ([464662b](https://github.com/biancoroyal/node-red-contrib-modbus/commit/464662b711a92ad94691cf266e9ebff5ac0ca4ce))

## [5.1.0](https://github.com/biancoroyal/node-red-contrib-modbus/compare/v5.1.0-1...v5.1.0) (2019-12-03)

## [5.1.0-1](https://github.com/biancoroyal/node-red-contrib-modbus/compare/v4.1.3...v5.1.0-1) (2019-11-24)

# [5.4.0-alpha.3](https://github.com/biancoroyal/node-red-contrib-modbus/compare/v5.4.0-alpha.2...v5.4.0-alpha.3) (2020-03-26)

### Bug Fixes

* supporter file missing ([d24fad6](https://github.com/biancoroyal/node-red-contrib-modbus/commit/d24fad66e8730f9535b8d9edc0512087e55b7d07))
### Bug Fixes

## 5.1.0-0 (2019-11-24)
* issue [#182](https://github.com/biancoroyal/node-red-contrib-modbus/issues/182) to get better information from the FSM ([78be12b](https://github.com/biancoroyal/node-red-contrib-modbus/commit/78be12b72403e6de12d6f8c1ee11f633828ff04e))

### 5.0.1-alpha.0 (2019-11-17)


### Features
# [5.4.0-alpha.2](https://github.com/biancoroyal/node-red-contrib-modbus/compare/5.1.0-0...v5.4.0-alpha.2) (2020-03-26)

* new state machine from xstate ([57aef99](https://github.com/biancoroyal/node-red-contrib-modbus/commit/57aef9956187ee9d70e862b226f3a3ef5e091528))

## [5.1.0-0](https://github.com/biancoroyal/node-red-contrib-modbus/compare/v4.1.3...v5.1.0-0) (2019-11-24)
### Bug Fixes

### 5.0.1-alpha.0 (2019-11-17)
* **client:** FSM message FSM Reset while failure handling and on unplanned state changes, now it raises only on failures ([944786c](https://github.com/biancoroyal/node-red-contrib-modbus/commit/944786cdd6f9e8322c3e3264cd1ef8aa4a244118))
* [#160](https://github.com/biancoroyal/node-red-contrib-modbus/issues/160) error on show activities true ([af27fe6](https://github.com/biancoroyal/node-red-contrib-modbus/commit/af27fe616654eb074bb29f34a163d4ffabc742bd))
* [#178](https://github.com/biancoroyal/node-red-contrib-modbus/issues/178) debug per node to see where it is not correct or fallback core log ([ff69134](https://github.com/biancoroyal/node-red-contrib-modbus/commit/ff691343ab7c93451642922bf6fa237f777b934f))
* [#178](https://github.com/biancoroyal/node-red-contrib-modbus/issues/178) too get no crash on internal debug log ([a0389e7](https://github.com/biancoroyal/node-red-contrib-modbus/commit/a0389e7b051d736bc958fee4fbfeb1879cda99e3)), closes [#180](https://github.com/biancoroyal/node-red-contrib-modbus/issues/180)
* serialport list call ([f401c58](https://github.com/biancoroyal/node-red-contrib-modbus/commit/f401c58cb384ce87489aecaa99a3000f18e4222b))
* supporter file missing ([d24fad6](https://github.com/biancoroyal/node-red-contrib-modbus/commit/d24fad66e8730f9535b8d9edc0512087e55b7d07))
* travis build ([7a7294e](https://github.com/biancoroyal/node-red-contrib-modbus/commit/7a7294e9fd2fa14d54412586af8c81e25d5b30cd))
* typo config node client ([9be8b16](https://github.com/biancoroyal/node-red-contrib-modbus/commit/9be8b1634469abfe6b8b6fb471a16f9387b6cee4))


### Features

* new state machine from xstate ([57aef99](https://github.com/biancoroyal/node-red-contrib-modbus/commit/57aef9956187ee9d70e862b226f3a3ef5e091528))
* [#161](https://github.com/biancoroyal/node-red-contrib-modbus/issues/161) multiple RTU devices via UnitID ([b0b5011](https://github.com/biancoroyal/node-red-contrib-modbus/commit/b0b5011be4ab5e7c06ab44fd9df7b0ff5ddd0fd8))
* [#180](https://github.com/biancoroyal/node-red-contrib-modbus/issues/180) msg on fail pre-release alpha ([282a7c4](https://github.com/biancoroyal/node-red-contrib-modbus/commit/282a7c46a26c91f387b024ec1703f090a14f1816))
* msg or error on flex connector ([16a947b](https://github.com/biancoroyal/node-red-contrib-modbus/commit/16a947b9eed12a600b5315bf41e63606305ccbd4))
* new output for flex config ([f78e775](https://github.com/biancoroyal/node-red-contrib-modbus/commit/f78e775f2e84ae5d8ce406457a2b747daa3abd38))
* set default on serial for queue by the type checkbox switch ([65edb52](https://github.com/biancoroyal/node-red-contrib-modbus/commit/65edb52b393a421d7c5db3dd8749a2a0da7d4393))

### [5.0.1-alpha.0](https://github.com/biancode/node-red-contrib-modbus/compare/v5.0.0...v5.0.1-alpha.0) (2019-10-31)

## [5.0.0](https://github.com/biancode/node-red-contrib-modbus/compare/v4.1.3...v5.0.0) (2019-10-31)

## [4.1.3](https://github.com/biancode/node-red-contrib-modbus/compare/v4.1.1...v4.1.3) (2019-02-22)
# [5.1.0-0](https://github.com/biancoroyal/node-red-contrib-modbus/compare/v4.1.3...5.1.0-0) (2019-11-24)


### Features

<a name="4.1.2"></a>
## [4.1.2](https://github.com/biancode/node-red-contrib-modbus/compare/v4.1.1...v4.1.2) (2019-01-12)
* new state machine from xstate ([57aef99](https://github.com/biancoroyal/node-red-contrib-modbus/commit/57aef9956187ee9d70e862b226f3a3ef5e091528))



<a name="4.1.1"></a>
## [4.1.1](https://github.com/biancode/node-red-contrib-modbus/compare/v4.1.0...v4.1.1) (2018-11-13)
## [4.1.1](https://github.com/biancoroyal/node-red-contrib-modbus/compare/v4.1.0...v4.1.1) (2018-11-13)


### Bug Fixes

* modbus flex server ([7d332f0](https://github.com/biancode/node-red-contrib-modbus/commit/7d332f0))
* modbus flex server ([7d332f0](https://github.com/biancoroyal/node-red-contrib-modbus/commit/7d332f0add6e6912f2dd91e8c92bce751d97e6d7))
* **log:** remove console logs ([a859d91](https://github.com/biancoroyal/node-red-contrib-modbus/commit/a859d91a9ad8dad56f985457916a5b809b22a586))



## [4.0.1](https://github.com/biancoroyal/node-red-contrib-modbus/compare/v4.0.0...v4.0.1) (2018-11-08)

<a name="4.1.0"></a>
# [4.1.0](https://github.com/biancode/node-red-contrib-modbus/compare/v4.0.2...v4.1.0) (2018-11-08)

### Features

* update libs ([a4c1aab](https://github.com/biancoroyal/node-red-contrib-modbus/commit/a4c1aab5130c8018ab5374099caf3dcc299afe82))

<a name="4.0.2"></a>
## [4.0.2](https://github.com/biancode/node-red-contrib-modbus/compare/v4.0.0...v4.0.2) (2018-11-08)


### Bug Fixes
# [4.0.0](https://github.com/biancoroyal/node-red-contrib-modbus/compare/v3.6.1...v4.0.0) (2018-08-19)

* **log:** remove console logs ([a859d91](https://github.com/biancode/node-red-contrib-modbus/commit/a859d91))

### Bug Fixes

* **test:** counter has to add some ([f183135](https://github.com/biancoroyal/node-red-contrib-modbus/commit/f183135e0a1458bb071bdb791ceb25e5707392e7))
* **test:** faster travis CI ([3857c29](https://github.com/biancoroyal/node-red-contrib-modbus/commit/3857c296be8e262a46c916a3db5504b652b95bf8))

# Change Log

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
### Features

<a name="4.0.1"></a>
## [4.0.1](https://github.com/biancode/node-red-contrib-modbus/compare/v4.0.0...v4.0.1) (2018-11-08)
* **clients:** register and deregister for all client nodes issue [#105](https://github.com/biancoroyal/node-red-contrib-modbus/issues/105) ([c7a00a3](https://github.com/biancoroyal/node-red-contrib-modbus/commit/c7a00a393ae07cd2f57d4356ec47f1a01c8e509b))
* **read:** log IO option ([61d22ea](https://github.com/biancoroyal/node-red-contrib-modbus/commit/61d22ea0d658dd8cb8dde6e4f0c0d7789c8f0b9c))
* **server:** discrete input for the flex server ([54d7028](https://github.com/biancoroyal/node-red-contrib-modbus/commit/54d70286b245e532dd3a3333cb9790a775bb1d0d))
* **server:** upgrade to jsmodbus 3.0.0 ([12a045e](https://github.com/biancoroyal/node-red-contrib-modbus/commit/12a045e94286438f6a920d6be899573a206b014c)), closes [#105](https://github.com/biancoroyal/node-red-contrib-modbus/issues/105)



<a name="3.6.1"></a>
## [3.6.1](https://github.com/biancode/node-red-contrib-modbus/compare/v3.6.0...v3.6.1) (2018-06-08)
## [3.6.1](https://github.com/biancoroyal/node-red-contrib-modbus/compare/v3.6.0...v3.6.1) (2018-06-08)



<a name="3.6.0"></a>
# [3.6.0](https://github.com/biancode/node-red-contrib-modbus/compare/v3.5.0...v3.6.0) (2018-05-28)
# [3.6.0](https://github.com/biancoroyal/node-red-contrib-modbus/compare/v3.5.0...v3.6.0) (2018-05-28)



<a name="3.5.0"></a>
# [3.5.0](https://github.com/biancode/node-red-contrib-modbus/compare/v3.4.0...v3.5.0) (2018-05-21)
# [3.5.0](https://github.com/biancoroyal/node-red-contrib-modbus/compare/v3.4.0...v3.5.0) (2018-05-21)


### Features

* **server:** IPv6 support ([2eb2973](https://github.com/biancode/node-red-contrib-modbus/commit/2eb2973))
* **server:** IPv6 support ([2eb2973](https://github.com/biancoroyal/node-red-contrib-modbus/commit/2eb297336cb3083cb3cd6f2752c7997a6722e71b))



<a name="3.4.0"></a>
# [3.4.0](https://github.com/biancode/node-red-contrib-modbus/compare/v3.3.4...v3.4.0) (2018-03-05)
# [3.4.0](https://github.com/biancoroyal/node-red-contrib-modbus/compare/v3.3.4...v3.4.0) (2018-03-05)



<a name="3.3.4"></a>
## [3.3.4](https://github.com/biancode/node-red-contrib-modbus/compare/v3.3.2...v3.3.4) (2018-03-05)
## [3.3.4](https://github.com/biancoroyal/node-red-contrib-modbus/compare/v3.3.2...v3.3.4) (2018-03-05)



<a name="3.3.2"></a>
## [3.3.2](https://github.com/biancode/node-red-contrib-modbus/compare/v3.3.1...v3.3.2) (2018-02-21)
## [3.3.2](https://github.com/biancoroyal/node-red-contrib-modbus/compare/v3.3.1...v3.3.2) (2018-02-21)



<a name="3.3.1"></a>
## [3.3.1](https://github.com/biancode/node-red-contrib-modbus/compare/v3.0.2...v3.3.1) (2018-02-20)
## [3.3.1](https://github.com/biancoroyal/node-red-contrib-modbus/compare/v3.0.2...v3.3.1) (2018-02-20)



<a name="3.0.2"></a>
## [3.0.2](https://github.com/biancode/node-red-contrib-modbus/compare/v3.0.1...v3.0.2) (2018-01-10)
## [3.0.2](https://github.com/biancoroyal/node-red-contrib-modbus/compare/v3.0.1...v3.0.2) (2018-01-10)



<a name="3.0.1"></a>
## [3.0.1](https://github.com/biancode/node-red-contrib-modbus/compare/v3.0.0...v3.0.1) (2018-01-09)
## [3.0.1](https://github.com/biancoroyal/node-red-contrib-modbus/compare/v3.0.0...v3.0.1) (2018-01-09)



<a name="2.5.0"></a>
# [2.5.0](https://github.com/biancode/node-red-contrib-modbus/compare/v2.3.2...v2.5.0) (2017-12-19)
# [2.5.0](https://github.com/biancoroyal/node-red-contrib-modbus/compare/v2.3.2...v2.5.0) (2017-12-19)



<a name="2.3.2"></a>
## [2.3.2](https://github.com/biancode/node-red-contrib-modbus/compare/v2.2.3...v2.3.2) (2017-11-21)
## [2.3.2](https://github.com/biancoroyal/node-red-contrib-modbus/compare/v2.2.3...v2.3.2) (2017-11-21)



<a name="2.2.3"></a>
## [2.2.3](https://github.com/biancode/node-red-contrib-modbus/compare/v2.2.2...v2.2.3) (2017-11-08)
## [2.2.3](https://github.com/biancoroyal/node-red-contrib-modbus/compare/v2.2.2...v2.2.3) (2017-11-08)



<a name="2.2.2"></a>
## [2.2.2](https://github.com/biancode/node-red-contrib-modbus/compare/v2.1.1...v2.2.2) (2017-11-08)
## [2.2.2](https://github.com/biancoroyal/node-red-contrib-modbus/compare/v2.1.1...v2.2.2) (2017-11-08)



<a name="2.1.1"></a>
## [2.1.1](https://github.com/biancode/node-red-contrib-modbus/compare/v1.0.16...v2.1.1) (2017-10-22)
## [2.1.1](https://github.com/biancoroyal/node-red-contrib-modbus/compare/v1.0.16...v2.1.1) (2017-10-22)



<a name="1.0.16"></a>
## [1.0.16](https://github.com/biancode/node-red-contrib-modbus/compare/v1.0.12...v1.0.16) (2017-05-10)
## [1.0.16](https://github.com/biancoroyal/node-red-contrib-modbus/compare/v1.0.12...v1.0.16) (2017-05-10)



<a name="1.0.12"></a>
## [1.0.12](https://github.com/biancode/node-red-contrib-modbus/compare/v1.0.8...v1.0.12) (2017-05-06)
## [1.0.12](https://github.com/biancoroyal/node-red-contrib-modbus/compare/v1.0.8...v1.0.12) (2017-05-06)



<a name="1.0.8"></a>
## [1.0.8](https://github.com/biancode/node-red-contrib-modbus/compare/v1.0.0...v1.0.8) (2017-03-05)
## [1.0.8](https://github.com/biancoroyal/node-red-contrib-modbus/compare/v1.0.0...v1.0.8) (2017-03-05)



<a name="1.0.0"></a>
# 1.0.0 (2017-01-18)



2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
BSD 3-Clause License

Copyright (c) 2016, 2017, 2018, 2019 Klaus Landsdorf
Copyright (c) 2017,2018,2019,2020 Klaus Landsdorf (https://osi.bianco-royal.com/)
Copyright (c) 2016, Jason D. Harper, Argonne National Laboratory
Copyright (c) 2015, 2016 - Mika Karaila, Valmet Automation Inc.
All rights reserved.
Expand Down
15 changes: 10 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,14 @@

Based on [modbus-serial][2] with TCP, C701, Telnet, Serial, RTU buffered, and ASCII

* stress tested with Node-RED v1.0 and Node.js v10 and 12 LTS
* stress tested with Node-RED v1.0.4 and Node.js LTS
* works with queueing per unit and round robin scheduling

Node-RED v1.x versions:
* Node.JS 13.x is beta supported with v5.x
* Node.JS 12.x is supported with v5.x
* Node.JS 10.x is supported with v5.x

Node-RED v0.x versions:
* Node.JS 10.x is supported with v4.x
* Node.JS 8.x is supported with v3.x
Expand Down Expand Up @@ -130,7 +135,7 @@ since April 2016 by [Klaus Landsdorf][4]

### History

* contribution in 2016 by [iurly][6]
* contribution since 2016 by [Contributors][6]
* license changed in 2016 by [Jason D. Harper][7]
* started in early 2015 by [Mika Karaila][5]

Expand All @@ -139,12 +144,12 @@ since April 2016 by [Klaus Landsdorf][4]
[3]:https://flows.nodered.org/flow/bf06a87e84395e4bce276714c6f5f884
[4]:https://github.com/biancode
[5]:https://github.com/mikakaraila
[6]:https://github.com/iurly
[6]:https://github.com/BiancoRoyal/node-red-contrib-modbus/graphs/contributors
[7]:https://github.com/jayharper
[8]:http://www.modbus.org/
[9]:http://bit.ly/2jzwjqP
[10]:https://github.com/biancode/node-red-contrib-modbus/wiki
[10]:https://github.com/BiancoRoyal/node-red-contrib-modbus/wiki
[11]:https://bianco-royal.cloud/supporter/
[12]:https://github.com/biancode/node-red-contrib-modbus
[12]:https://github.com/BiancoRoyal/node-red-contrib-modbus
[13]:https://www.npmjs.com/package/jsmodbus
[14]:https://www.npmjs.com/package/serialport
15 changes: 15 additions & 0 deletions clean.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/usr/bin/env bash

rm -rf node_modules/

rm -rf modbus/

rm package-lock.json

npm cache verify

npm i

npm i --only=dev

npm run build
Loading

0 comments on commit 065d277

Please sign in to comment.