node-red-contrib-knx-ultimate 3.2.3 → 3.2.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -6,7 +6,10 @@
6
6
 
7
7
  # CHANGELOG
8
8
 
9
- **Version 3.2.3** - September 2024<br/>
9
+ **Version 3.2.5** - September 2024<br/>
10
+ - KNXViewer: fixed an issue with the PIN3.<br/>
11
+
12
+ **Version 3.2.4** - September 2024<br/>
10
13
  - KNX engine: fix oldest invalid KNX queue interval, by defaulting it to 25ms.<br/>
11
14
 
12
15
  **Version 3.2.2** - September 2024<br/>
@@ -5,7 +5,7 @@
5
5
  category: 'config',
6
6
  defaults: {
7
7
  host: { value: "224.0.23.12", required: true },
8
- port: { value: 3671, required: true, validate: RED.validators.number(), min: 20, max: 500 },
8
+ port: { value: 3671, required: true, validate: RED.validators.number() },
9
9
  // the KNX physical address we'd like to use
10
10
  physAddr: { value: "15.15.22", required: true },
11
11
  hostProtocol: { value: "Auto", required: false }, // TunnelUDP/TunnelTCP/Multicast
@@ -140,21 +140,24 @@ module.exports = function (RED) {
140
140
  // outputtype: "read",
141
141
  // nodecallerid: _oClient.id,
142
142
  // });
143
- const aItems = _.clone(node.serverKNX.telegramsQueue);
143
+ let sHead = '';
144
+ let sFooter = '';
144
145
  let sPayload = '';
146
+ try {
147
+ const aItems = _.clone(node.serverKNX.knxConnection.commandQueue);
148
+ if (aItems === undefined) return;
145
149
 
146
- const sHead = `<div class="main"><table><caption>Queue of outgoing telegrams to the KNX BUS. The more the count,</br>the more congested is the KNX BUS.</caption>
150
+ sHead = `<div class="main"><table><caption>Queue of outgoing telegrams to the KNX BUS. The more the count,</br>the more congested is the KNX BUS.</caption>
147
151
  <thead>
148
152
  <tr>
149
- <th> GA </th>
150
- <th> Value </th>
151
- <th> DPT </th>
152
- <th> Output Type </th>
153
- <th> Caller Node (id) </th>
153
+ <th> Channel ID </th>
154
+ <th> Sequence counter </th>
155
+ <th> Type of packet</th>
156
+ <th> Status </th>
154
157
  </tr>
155
158
  </thead>
156
159
  <tbody>`;
157
- const sFooter = `</tbody><tfoot>
160
+ sFooter = `</tbody><tfoot>
158
161
  <tr>
159
162
  <th scope="row">Count</th>
160
163
  <td>` + aItems.length + `</td>
@@ -162,31 +165,13 @@ module.exports = function (RED) {
162
165
  </tfoot>
163
166
  </table></div>`;
164
167
 
165
- try {
168
+
166
169
  for (let index = 0; index < aItems.length; index++) {
167
170
  const element = aItems[index];
168
- sPayload += '<tr><td>' + element.grpaddr + '</td>';
169
- if (typeof element.payload === 'boolean' && element.payload === true) {
170
- sPayload += '<td><b><font color=green>True</font></b></td>';
171
- } else if (typeof element.payload === 'boolean' && element.payload === false) {
172
- sPayload += '<td><font color=red>False</font></td>';
173
- } else if (typeof element.payload === 'object' && !isNaN(Date.parse(element.payload))) {
174
- // The payload is a datetime
175
- sPayload += '<td>' + element.payload.toLocaleString() + '</td>';
176
- } else if (typeof element.payload === 'object') {
177
- // Is maybe a JSON?
178
- try {
179
- // sPayload += '<td>' + JSON.stringify(element.payload) + '</td>'
180
- sPayload += '<td><i>' + element.rawPayload + '</i></td>';
181
- } catch (error) {
182
- sPayload += '<td>' + element.payload + '</td>';
183
- }
184
- } else {
185
- sPayload += '<td>' + element.payload + element.payloadmeasureunit + '</td>';
186
- }
187
- sPayload += '<td>' + element.dpt + '</td>';
188
- sPayload += '<td>' + element.outputtype + '</td>';
189
- sPayload += '<td><font style="font-size: smaller;">' + element.nodecallerid + '</font></td></tr>';
171
+ sPayload += '<tr><td>' + element.knxPacket.channelID + '</td>';
172
+ sPayload += '<td><b><font color=green>' + element.knxPacket.seqCounter + '</font></b></td>';
173
+ sPayload += '<td>' + element.knxPacket.type + '</td>';
174
+ sPayload += '<td>' + element.knxPacket.status + '</td></tr>';
190
175
  }
191
176
  } catch (error) {
192
177
 
package/package.json CHANGED
@@ -3,7 +3,7 @@
3
3
  "engines": {
4
4
  "node": ">=16.0.0"
5
5
  },
6
- "version": "3.2.3",
6
+ "version": "3.2.5",
7
7
  "description": "Control your KNX intallation via Node-Red! A bunch of KNX nodes, with integrated Philips HUE control and ETS group address importer. Easy to use and highly configurable.",
8
8
  "dependencies": {
9
9
  "binary-parser": "2.2.1",