Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

✍️ Add support for WSTRING read/write. #133

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

✍️ Add support for WSTRING read/write. #133

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 54 additions & 2 deletions nodeS7.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1994,6 +1994,17 @@ function processS7ReadItem(theItem) {
}
theItem.value.push(tempString);
break;
case "WS":
case "WSTRING":
strlen = theItem.byteBuffer.readUInt16BE(thePointer+2);
tempString = '';
for (var charOffset = 4; charOffset < theItem.dtypelen && (charOffset - 4) < (strlen*2); charOffset+=2) {
// say strlen = 1 (one-wchar string) this char is at arrayIndex of 4.
// Convert to string.
tempString += String.fromCharCode(theItem.byteBuffer.readUInt16BE(thePointer+charOffset));
}
theItem.value.push(tempString);
break;
case "C":
case "CHAR":
// Convert to string.
Expand Down Expand Up @@ -2083,6 +2094,16 @@ function processS7ReadItem(theItem) {
theItem.value += String.fromCharCode(theItem.byteBuffer.readUInt8(thePointer+charOffset));
}
break;
case "WS":
case "WSTRING":
strlen = theItem.byteBuffer.readUInt16BE(thePointer+2);
theItem.value = '';
for (var charOffset = 4; charOffset < theItem.dtypelen && (charOffset - 4) < (strlen*2); charOffset+=2) {
// say strlen = 1 (one-char string) this char is at arrayIndex of 2.
// Convert to string.
theItem.value += String.fromCharCode(theItem.byteBuffer.readUInt16BE(thePointer+charOffset));
}
break;
case "C":
case "CHAR":
// No support as of yet for signed 8 bit. This isn't that common in Siemens.
Expand Down Expand Up @@ -2209,6 +2230,19 @@ function bufferizeS7Item(theItem) {
}
}
break;
case "WS":
case "WSTRING":
// Convert to bytes.
theItem.writeBuffer.writeUInt16BE(theItem.dtypelen - 4, thePointer); // Array length is requested val, -2 is string length
theItem.writeBuffer.writeUInt16BE(Math.min(theItem.dtypelen - 4, theItem.writeValue[arrayIndex].length), thePointer+1); // Array length is requested val, -2 is string length
for (var charOffset = 4; charOffset < theItem.dtypelen; charOffset+=2) {
if (charOffset < (theItem.writeValue[arrayIndex].length + 4)) {
theItem.writeBuffer.writeUInt16BE(theItem.writeValue[arrayIndex].charCodeAt(charOffset-4), thePointer+charOffset);
} else {
theItem.writeBuffer.writeUInt16BE(32, thePointer+charOffset); // write space
}
}
break;
case "TIMER":
case "COUNTER":
// I didn't think we supported arrays of timers and counters.
Expand Down Expand Up @@ -2299,6 +2333,20 @@ function bufferizeS7Item(theItem) {
}
}
break;
case "WS":
case "WSTRING":
// Convert to bytes.
theItem.writeBuffer.writeUInt16BE(theItem.dtypelen - 4, thePointer); // Array length is requested val, -4 is string length
theItem.writeBuffer.writeUInt16BE(Math.min(theItem.dtypelen - 4, theItem.writeValue.length), thePointer+2); // Array length is requested val, -4 is string length

for (var charOffset = 4; charOffset < theItem.dtypelen; charOffset+=2) {
if (charOffset < (theItem.writeValue.length + 4)) {
theItem.writeBuffer.writeUInt16BE(theItem.writeValue.charCodeAt(charOffset-4), thePointer+charOffset);
} else {
theItem.writeBuffer.writeUInt16BE(32, thePointer+charOffset); // write space
}
}
break;
case "TIMER":
case "COUNTER":
theItem.writeBuffer.writeInt16BE(theItem.writeValue, thePointer);
Expand Down Expand Up @@ -2331,10 +2379,10 @@ function stringToS7Addr(addr, useraddr, cParam) {
theItem.datatype = splitString2[0].replace(/[0-9]/gi, '').toUpperCase(); // Clear the numbers
if (theItem.datatype === 'X' && splitString2.length === 3) {
theItem.arrayLength = parseInt(splitString2[2], 10);
} else if ((theItem.datatype === 'S' || theItem.datatype === 'STRING') && splitString2.length === 3) {
} else if ((theItem.datatype === 'S' || theItem.datatype === 'STRING' || theItem.datatype === 'WS' || theItem.dataType === 'WSTRING') && splitString2.length === 3) {
theItem.dtypelen = parseInt(splitString2[1], 10) + 2; // With strings, add 2 to the length due to S7 header
theItem.arrayLength = parseInt(splitString2[2], 10); // For strings, array length is now the number of strings
} else if ((theItem.datatype === 'S' || theItem.datatype === 'STRING') && splitString2.length === 2) {
} else if ((theItem.datatype === 'S' || theItem.datatype === 'STRING' || theItem.datatype === 'WS' || theItem.dataType === 'WSTRING') && splitString2.length === 2) {
theItem.dtypelen = parseInt(splitString2[1], 10) + 2; // With strings, add 2 to the length due to S7 header
theItem.arrayLength = 1;
} else if (theItem.datatype !== 'X' && splitString2.length === 2) {
Expand Down Expand Up @@ -2662,6 +2710,8 @@ function stringToS7Addr(addr, useraddr, cParam) {
break;
case "S":
case "STRING":
case "WS":
case "WSTRING":
// For strings, arrayLength and dtypelen were assigned during parsing.
break;
default:
Expand Down Expand Up @@ -2824,6 +2874,8 @@ function S7Item() { // Object
case "CHAR":
case "S":
case "STRING":
case "WS":
case "WSTRING":
// Convert to string.
return "";
default:
Expand Down