Merge branch 'master' into develop

BiancoRoyal · Apr 15, 2024 · dfd8650 · dfd8650
2 parents 86138dd + 27f3f81
commit dfd8650
Show file tree

Hide file tree

Showing 22 changed files with 100 additions and 74 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        node: [12, 14, 16, 18]
+        node: [14, 16, 18, 20]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,16 @@
+# [0.3.0](https://github.com/BiancoRoyal/node-red-contrib-bacnet/compare/v0.2.7...v0.3.0) (2024-04-15)
+
+
+
+## [0.2.7](https://github.com/BiancoRoyal/node-red-contrib-bacnet/compare/v0.2.6...v0.2.7) (2022-09-25)
+
+
+### Bug Fixes
+
+* Node-RED PLUS changed to PLUS for Node-RED ([bf86f55](https://github.com/BiancoRoyal/node-red-contrib-bacnet/commit/bf86f55dc3521915ec16b8969618fe20ef8ec31d))
+
+
+
 ## [0.2.6](https://github.com/BiancoRoyal/node-red-contrib-bacnet/compare/v0.2.5...v0.2.6) (2022-07-29)
 
 

diff --git a/README.md b/README.md
@@ -1,9 +1,8 @@
-![Platform Node-RED](http://b.repl.ca/v1/Platform-Node--RED-red.png)
-![Node-RED BACnet](http://b.repl.ca/v1/Contribution-BACnet-blue.png)
-[![Repository GitHub](http://b.repl.ca/v1/Repository-GitHub-orange.png)](https://github.com/BiancoRoyal/node-red-contrib-bacnet)
+![Platform Node-RED](https://img.shields.io/badge/Platform-Node--RED-red.png)
+![Node-RED BACnet](https://img.shields.io/badge/Contribution-BACnet-blue.png)
+[![Repository GitHub](https://img.shields.io/badge/Repository-GitHub-orange.png)](https://github.com/BiancoRoyal/node-red-contrib-bacnet)
 [![NPM download](https://img.shields.io/npm/dm/node-red-contrib-bacnet.svg)](http://www.npm-stats.com/~packages/node-red-contrib-bacnet)
-[![Quality Travis CI](http://b.repl.ca/v1/Quality-Travis_CI-green.png)](https://travis-ci.org/BiancoRoyal/node-red-contrib-bacnet)
-[![Build Status](https://travis-ci.org/BiancoRoyal/node-red-contrib-bacnet.svg?branch=master)](https://travis-ci.org/BiancoRoyal/node-red-contrib-bacnet)
+[![Quality Travis CI](https://img.shields.io/badge/Quality-Travis_CI-green.png)](https://travis-ci.org/BiancoRoyal/node-red-contrib-bacnet)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/6cbeb40ab5604b3ab99e6badc9469e8a)](https://www.codacy.com/gh/BiancoRoyal/node-red-contrib-bacnet?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=BiancoRoyal/node-red-contrib-bacnet&amp;utm_campaign=Badge_Grade)
 [![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/BiancoRoyal/node-red-contrib-bacnet)
 
@@ -19,7 +18,7 @@ For an international area, [Iniationware][6] has provided the [PLUS for Node-RED
 
 ### IIoT Webseite Deutschland für Node-RED 
 
-Für einen deutschsprachigen Bereich hat [Iniationware][6] die Webseite [PLUS for Node-RED Germany][7] bereitgestellt.
+Für einen deutschsprachigen Bereich hat [Iniationware][9] die Webseite [PLUS for Node-RED Germany][7] bereitgestellt.
 
 
 ## Install
@@ -56,9 +55,10 @@ I'd like to give special thanks to [fh1ch][2] and [Apollon77][4] for their work
 
 [1]:https://github.com/sponsors/biancode
 [2]:https://github.com/fh1ch
-[3]:https://noderedplus.de/
+[3]:https://plus4nodered.com/
 [4]:https://github.com/Apollon77
 [5]:https://github.com/BiancoRoyal
-[6]:https://github.com/Iniationware
-[7]:https://www.noderedplus.de/de/
-[8]:https://www.noderedplus.de/
+[6]:https://iniationware.com/
+[7]:https://www.p4nr.com/de/
+[8]:https://www.p4nr.com/
+[9]:https://iniationware.de/
diff --git a/index.js b/index.js
@@ -1,7 +1,7 @@
 /*
  The MIT License
 
- Copyright (c) 2017,2018,2019,2020,2021,2022 Klaus Landsdorf (http://node-red.plus/)
+ Copyright (c) 2017,2018,2019,2020,2021,2022,2023,2024 Klaus Landsdorf (http://plus4nodered.com/)
  All rights reserved.
  node-red-contrib-bacnet
  */

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "node-red-contrib-bacnet",
-  "version": "0.2.7",
+  "version": "0.3.0",
   "private": false,
-  "description": "The BACnet toolbox package for Node-RED.",
+  "description": "The BACnet toolbox package for Node-RED from the P4NR B2B Community.",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/BiancoRoyal/node-red-contrib-bacnet.git"
@@ -19,13 +19,13 @@
     "fieldbus",
     "biancoroyal"
   ],
-  "author": "Klaus Landsdorf <developers@bianco-royal.de> (https://bianco-royal.space/)",
+  "author": "P4NR Support <support@plus4nodered.com> (https://plus4nodered.com/)",
   "contributors": [
     {
-      "name": "Node-RED PLUS <github@noderedplus.de> (https://noderedplus.de/)"
+      "name": "P4NR B2B Community <team@plus4nodered.com> (https://p4nr.com/)"
     },
     {
-      "name": "Iniationware GmbH <github@iniationware.com> (https://iniationware.com/)"
+      "name": "Iniationware GmbH <team@iniationware.com> (https://iniationware.com/)"
     },
     {
       "name": "Ingo Fischer (Gameforge)"
@@ -52,7 +52,7 @@
   "engines": {
     "node": ">=14"
   },
-  "homepage": "https://noderedplus.de/",
+  "homepage": "https://p4nr.com/",
   "scripts": {
     "test": "standard --fix && mocha test --recursive --reporter dot --timeout 5000",
     "test-with-coverage": "istanbul cover _mocha --report lcovonly -- --recursive --timeout 5000 -R spec && cat ./coverage/lcov.info | codacy-coverage --token $CODACY_COVERAGE_TOKEN && rm -rf ./coverage",

diff --git a/src/bacnet-client.html b/src/bacnet-client.html
@@ -1,7 +1,7 @@
 <!--
  The MIT License
 
- Copyright (c) 2017,2018,2019,2020,2021,2022 Klaus Landsdorf (http://node-red.plus/)
+ Copyright (c) 2017,2018,2019,2020,2021,2022,2023,2024 Klaus Landsdorf (http://plus4nodered.com/)
  All rights reserved.
  node-red-contrib-bacnet
 -->

diff --git a/src/bacnet-client.js b/src/bacnet-client.js
@@ -1,7 +1,7 @@
 /*
  The MIT License
 
- Copyright (c) 2017,2018,2019,2020,2021,2022 Klaus Landsdorf (http://node-red.plus/)
+ Copyright (c) 2017,2018,2019,2020,2021,2022,2023,2024 Klaus Landsdorf (http://plus4nodered.com/)
  All rights reserved.
  node-red-contrib-bacnet
  */
@@ -72,9 +72,9 @@ module.exports = function (RED) {
     node.whoIsExplicit = function (lowLimit, highLimit, deviceIPAddress, cb) {
       node.devices = []
       const options = {
-        lowLimit: lowLimit,
-        highLimit: highLimit,
-        deviceIPAddress: deviceIPAddress
+        lowLimit,
+        highLimit,
+        deviceIPAddress
       }
       node.client.whoIs(options)
       setTimeout(cb, 3000)

diff --git a/src/bacnet-command.html b/src/bacnet-command.html
@@ -1,7 +1,7 @@
 <!--
  The MIT License
 
- Copyright (c) 2017,2018,2019,2020,2021,2022 Klaus Landsdorf (http://node-red.plus/)
+ Copyright (c) 2017,2018,2019,2020,2021,2022,2023,2024 Klaus Landsdorf (http://plus4nodered.com/)
  All rights reserved.
  node-red-contrib-bacnet
 -->
@@ -23,7 +23,6 @@
       server: {type: "BACnet-Client", required:true}
     },
     credentials: {
-        username: {type: "text"},
         password: {type: "password"}
     },
     inputs: 1,
@@ -60,8 +59,6 @@
       let commandTimeSync = $('#commandTimeSync')
       let commandWhoIsExplicit = $('#commandWhoIsExplicit')
 
-
-
       let enableDisableLookupField = $("#node-lookup-enableDisable")
       let enableDisableField = $("#node-input-enableDisable")
 
@@ -135,11 +132,11 @@
             source: node.lookupItems,
             minLength: 0,
             focus: function (event, ui) {
-              enableDisableField.val(ui.item.value);
+              enableDisableField.val(parseInt(ui.item.value) || 0);
               return false;
             },
             select: function (event, ui) {
-              enableDisableField.val(ui.item.value)
+              enableDisableField.val(parseInt(ui.item.value) || 0)
               return false;
             },
             close: function (event, ui) {
@@ -163,11 +160,11 @@
             source: node.lookupItems,
             minLength: 0,
             focus: function (event, ui) {
-              deviceSateField.val(ui.item.value);
+              deviceSateField.val(parseInt(ui.item.value) || 0);
               return false;
             },
             select: function (event, ui) {
-              deviceSateField.val(ui.item.value)
+              deviceSateField.val(parseInt(ui.item.value) || 0)
               return false;
             },
             close: function (event, ui) {

diff --git a/src/bacnet-command.js b/src/bacnet-command.js
@@ -1,7 +1,7 @@
 /*
  The MIT License
 
- Copyright (c) 2017,2018,2019,2020,2021,2022 Klaus Landsdorf (http://node-red.plus/)
+ Copyright (c) 2017,2018,2019,2020,2021,2022,2023,2024 Klaus Landsdorf (http://plus4nodered.com/)
  All rights reserved.
  node-red-contrib-bacnet
  */
@@ -138,7 +138,11 @@ module.exports = function (RED) {
     })
   }
 
-  RED.nodes.registerType('BACnet-Command', BACnetCommand)
+  RED.nodes.registerType('BACnet-Command', BACnetCommand, {
+    credentials: {
+      password: { type: 'password' }
+    }
+  })
 
   RED.httpAdmin.get('/bacnet/BacnetEnableDisable', RED.auth.needsPermission('bacnet.CMD.read'), function (req, res) {
     const typeList = BACnet.enum.EnableDisable

diff --git a/src/bacnet-device.html b/src/bacnet-device.html
@@ -1,7 +1,7 @@
 <!--
  The MIT License
 
- Copyright (c) 2017,2018,2019,2020,2021,2022 Klaus Landsdorf (http://node-red.plus/)
+ Copyright (c) 2017,2018,2019,2020,2021,2022,2023,2024 Klaus Landsdorf (http://plus4nodered.com/)
  All rights reserved.
  node-red-contrib-bacnet
 -->

diff --git a/src/bacnet-device.js b/src/bacnet-device.js
@@ -1,7 +1,7 @@
 /*
  The MIT License
 
- Copyright (c) 2017,2018,2019,2020,2021,2022 Klaus Landsdorf (http://node-red.plus/)
+ Copyright (c) 2017,2018,2019,2020,2021,2022,2023,2024 Klaus Landsdorf (http://plus4nodered.com/)
  All rights reserved.
  node-red-contrib-bacnet
  */

diff --git a/src/bacnet-instance.html b/src/bacnet-instance.html
@@ -1,7 +1,7 @@
 <!--
  The MIT License
 
- Copyright (c) 2017,2018,2019,2020,2021,2022 Klaus Landsdorf (http://node-red.plus/)
+ Copyright (c) 2017,2018,2019,2020,2021,2022,2023,2024 Klaus Landsdorf (http://plus4nodered.com/)
  All rights reserved.
  node-red-contrib-bacnet
 -->

diff --git a/src/bacnet-instance.js b/src/bacnet-instance.js
@@ -1,7 +1,7 @@
 /*
  The MIT License
 
- Copyright (c) 2017,2018,2019,2020,2021,2022 Klaus Landsdorf (http://node-red.plus/)
+ Copyright (c) 2017,2018,2019,2020,2021,2022,2023,2024 Klaus Landsdorf (http://plus4nodered.com/)
  All rights reserved.
  node-red-contrib-bacnet
  */

diff --git a/src/bacnet-read.html b/src/bacnet-read.html
@@ -1,7 +1,7 @@
 <!--
  The MIT License
 
- Copyright (c) 2017,2018,2019,2020,2021,2022 Klaus Landsdorf (http://node-red.plus/)
+ Copyright (c) 2017,2018,2019,2020,2021,2022,2023,2024 Klaus Landsdorf (http://plus4nodered.com/)
  All rights reserved.
  node-red-contrib-bacnet
 -->
@@ -62,11 +62,11 @@
             source: node.lookupItems,
             minLength: 0,
             focus: function (event, ui) {
-              objectTypeField.val(ui.item.value);
+              objectTypeField.val(parseInt(ui.item.value) || 0);
               return false;
             },
             select: function (event, ui) {
-              objectTypeField.val(ui.item.value)
+              objectTypeField.val(parseInt(ui.item.value) || 0)
               return false;
             },
             close: function (event, ui) {
@@ -93,11 +93,11 @@
             source: node.lookupItems,
             minLength: 0,
             focus: function (event, ui) {
-              datatypeField.val(ui.item.value);
+              datatypeField.val(parseInt(ui.item.value) || 0);
               return false;
             },
             select: function (event, ui) {
-              datatypeField.val(ui.item.value)
+              datatypeField.val(parseInt(ui.item.value) || 0)
               return false;
             },
             close: function (event, ui) {
@@ -175,10 +175,21 @@ <h4>Input</h4>
 
     <p>Example of msg.payload.requestArray:</p>
     <pre>
-        const requestArray = [{
-            objectId: {type: 8, instance: 4194303},
-            properties: [{id: 8}]
-        }]
+        {
+            "requestArray": [
+                {
+                    "objectId": {
+                        "type": 8,
+                        "instance": 3457166
+                    },
+                    "properties": [
+                        {
+                            "id": 8
+                        }
+                    ]
+                }
+            ]
+        }
     </pre>
 
     <pre>

diff --git a/src/bacnet-read.js b/src/bacnet-read.js
@@ -1,7 +1,7 @@
 /*
  The MIT License
 
- Copyright (c) 2017,2018,2019,2020,2021,2022 Klaus Landsdorf (http://node-red.plus/)
+ Copyright (c) 2017,2018,2019,2020,2021,2022,2023,2024 Klaus Landsdorf (http://plus4nodered.com/)
  All rights reserved.
  node-red-contrib-bacnet
  */