node-red-contrib-ta-cmi-coe 1.1.0 → 1.1.1

package/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## Changelog
 
+### Version 1.1.1
+ - Fix wrong V2 output number
+
 ### Version 1.1.0
  - Change to variable message size (similar to CoE V2 approach)
  - Added transmission conditions (output node)

package/examples/monitor.json

@@ -0,0 +1,42 @@
+[
+    {
+        "id": "monitor_example",
+        "type": "coe-monitor",
+        "name": "CoE Monitor",
+        "cmiconfig": "mycmi",
+        "filterNodeNumber": 0,
+        "filterDataType": "all",
+        "includeRaw": false,
+        "x": 250,
+        "y": 100,
+        "wires": [
+            [
+                "monitor_debug"
+            ]
+        ]
+    },
+    {
+        "id": "monitor_debug",
+        "type": "debug",
+        "name": "Debug Monitor",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "payload",
+        "targetType": "msg",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 450,
+        "y": 100,
+        "wires": []
+    },
+    {
+        "id": "mycmi",
+        "type": "cmiconfig",
+        "name": "My CMI",
+        "localip": "0.0.0.0",
+        "address": "192.168.0.100",
+        "coeVersion": 1
+    }
+]

package/lib/coe-v2.js

@@ -38,7 +38,7 @@ function parsePacket(buffer) {
     for (let i = 0; i < outputCount; i++) {
         const offset = 4 + (i * 8);
         const nodeNumber = buffer.readUInt8(offset);
-        const outputNumber = buffer.readUInt8(offset + 1);
+        const outputNumber = buffer.readUInt8(offset + 1) + 1;
         const dataType = buffer.readUInt8(offset + 2);
         const unitId = buffer.readUInt8(offset + 3);
         const value = buffer.readInt32LE(offset + 4);
@@ -110,13 +110,15 @@ function createPacket(nodeNumber, dataType, outputs) {
     for (let i = 0; i < blockCount; i++) {
         const offset = 4 + (i * 8);
         const output = outputState[i];
+        const isAnalog = (dataType === 'analog');
+        
+        const rawNumber = output.outputNumber - 1 || 0;
         const rawValue = convertValueToRaw(output.value, output.unitId, 2); // V2 decimals
         
         buffer.writeUInt8(nodeNumber, offset);
         
-        // Output Number (Little Endian, 2 Bytes)
-        buffer.writeUInt8(output.outputNumber & 0xFF, offset + 1);
-        buffer.writeUInt8((output.outputNumber >> 8) & 0xFF, offset + 2);
+        buffer.writeUInt8(rawNumber, offset + 1);
+        buffer.writeUInt8((isAnalog), offset + 2);
         
         buffer.writeUInt8(output.unitId || 0, offset + 3);  // Unit ID
         buffer.writeInt32LE(rawValue, offset + 4);  // Value (Int32 LE)
@@ -131,12 +133,9 @@ function convertUniformToV2Format(dataType, outputs) {
 
     Object.entries(outputs).forEach(([outputKey, output]) => {
         
-        // Output > 255 = analog
-        const outputNumber = parseInt(outputKey) + !isDigital * 256;
-
         if (output.value !== undefined) {  
             outputState.push({
-                outputNumber: outputNumber,
+                outputNumber: parseInt(outputKey),
                 value: isDigital? (output.value ? 1 : 0) : output.value,
                 unitId: output ? output.unit : 0
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-ta-cmi-coe",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Node-RED nodes for TA CMI CoE (CAN over Ethernet)",
   "author": "Florian Mayrhofer",
   "license": "Apache-2.0",
@@ -25,7 +25,9 @@
       "units-config": "coe/units-config.js"
     }
   },
-  "dependencies": {},
+  "dependencies": {
+    "node-red-contrib-ta-cmi-coe": "^1.1.0"
+  },
   "devDependencies": {
     "jest": "^30.2.0"
   },

package/lib/old.js

@@ -1,133 +0,0 @@
-/**
- * CoE V2 Protocol Support Module
- * 
- * Copyright 2025 Florian Mayrhofer
- * Licensed under the Apache License, Version 2.0
- *
- */ 
-
-// Convert V2 Data into Uniform format
-function convertV2ToUniformFormat(v2Data) {
-    // Group Outputs by block
-    const blockMap = {};
-    
-    v2Data.blocks.forEach(block => {
-        const isDigital = block.outputNumber <= 254;
-        const actualOutput = isDigital ? block.outputNumber : (block.outputNumber - 255);
-        
-        // Determine block number and position
-        let blockNumber, position;
-        
-        if (isDigital) {
-            // Digital: Output 1-16 → Block 0, Output 17-32 → Block 9
-            if (actualOutput <= 16) {
-                blockNumber = 0;
-                position = actualOutput - 1;
-            } else {
-                blockNumber = 9;
-                position = actualOutput - 17;
-            }
-        } else {
-            // Analog: Output 1-4 → Block 1, 5-8 → Block 2, etc.
-            blockNumber = Math.floor((actualOutput - 1) / 4) + 1;
-            position = (actualOutput - 1) % 4;
-        }
-        
-        const key = `${block.nodeNumber}-${blockNumber}`;
-        
-        if (!blockMap[key]) {
-            blockMap[key] = {
-                nodeNumber: block.nodeNumber,
-                blockNumber: blockNumber,
-                dataType: isDigital ? 'digital' : 'analog',
-                values: isDigital ? new Array(16).fill(undefined) : new Array(4).fill(undefined),
-                units: isDigital ? new Array(16).fill(undefined) : new Array(4).fill(undefined)
-            };
-        }
-        
-        // Convert value & insert (V2 uses other decimals)
-        const convertedValue = convertRawToValue(block.value, block.unitId, 2);
-        blockMap[key].values[position] = isDigital ? (block.value ? 1 : 0) : convertedValue;
-        
-        if (blockMap[key].units) {
-            blockMap[key].units[position] = block.unitId;
-        }
-    });
-    return Object.values(blockMap);
-}
-
-// Create CoE V2 Packet
-function createPacket(nodeNumber, dataType, outputs) {
-    // outputState: Array von {outputNumber, unit, value}
-    // Max 16 value blocks
-    const outputState = convertUniformToV2Format(dataType, outputs);
-    
-    const blockCount = Math.min(outputState.length, 16);
-    const messageLength = 4 + (blockCount * 8);
-    
-    const buffer = Buffer.alloc(messageLength);
-    
-    // Write header
-    buffer.writeUInt8(0x02, 0);  // Version Low
-    buffer.writeUInt8(0x00, 1);  // Version High
-    buffer.writeUInt8(messageLength, 2);  // Message Length
-    buffer.writeUInt8(blockCount, 3);  // Block Count
-    
-    // Write value blocks
-    for (let i = 0; i < blockCount; i++) {
-        const offset = 4 + (i * 8);
-        const output = outputState[i];
-        
-        buffer.writeUInt8(nodeNumber, offset);
-        
-        // Output Number (Little Endian, 2 Bytes)
-        buffer.writeUInt8(output.outputNumber & 0xFF, offset + 1);
-        buffer.writeUInt8((output.outputNumber >> 8) & 0xFF, offset + 2);
-        
-        buffer.writeUInt8(output.unitId || 0, offset + 3);  // Unit ID
-        buffer.writeInt32LE(output.value, offset + 4);  // Value (Int32 LE)
-    }
-    return buffer;
-}
-
-// Convert Uniform format to V2 outputs
-// function convertUniformToV2Format(blockNumber, values, units, dataType) {
-function convertUniformToV2Format(dataType, outputs) {
-    let outputState = [];
-    
-    if (dataType === 'digital') {
-        // Digital: 16 Bits
-        const baseOutput = blockNumber === 0 ? 1 : 17;
-        for (let i = 0; i < values.length; i++) {
-            if (values[i] !== undefined) {
-                const unitId = units && units[i] !== undefined ? units[i] : 0;
-
-                outputState.push({
-                    outputNumber: baseOutput + i,
-                    unitId: unitId,
-                    value: values[i] ? 1 : 0
-                });
-            }
-        }
-    } else {
-        // Analog: 4 Values
-        const baseOutput = (blockNumber - 1) * 4 + 1;
-        for (let i = 0; i < 4; i++) {
-            if (values[i] !== undefined) {
-                const unitId = units ? units[i] : 0;
-                const rawValue = convertValueToRaw(values[i], unitId, 2); // V2 uses other decimals
-                
-                // Output > 255 = analog
-                const outputNumber = baseOutput + i + 255;
-                
-                outputState.push({
-                    outputNumber: outputNumber,
-                    unitId: unitId,
-                    value: rawValue
-                });
-            }
-        }
-    }
-    
-    return outputState;
-}