lin-epics-modules/sinqS7plcFW
0
0
Fork 0
Code Pull Requests Activity

fixing_strings (#1)

Browse Source 
Reviewed-on: #1
Co-authored-by: Edward Wall <edward.wall@psi.ch>
Co-committed-by: Edward Wall <edward.wall@psi.ch>
This commit is contained in:
wall_e
2025-04-24 15:46:58 +02:00
committed by wall_e
parent 7d4f57750b
commit 8ae2aa7ecd
3 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
devS7plcFW.c
View File

@ -2033,7 +2033,11 @@ STATIC long s7plcFWInitRecordStringin(stringinRecord *record)
STATIC long s7plcFWReadStringin(stringinRecord *record)
{
// The SPS includes the max length of the string and the length of the
// current string, as the first two bytes in the register.
int status;
epicsUInt8 uval8;
S7memPrivate_t *priv = (S7memPrivate_t *)record->dpvt;
if (!priv)
@ -2044,11 +2048,18 @@ STATIC long s7plcFWReadStringin(stringinRecord *record)
return -1;
}
assert(priv->station);
status = s7plcFWRead(priv->station, priv->offs+1,
1, &uval8);
s7plcFWDebugLog(3, "stringin %s: read 8bit %02x\n",
record->name, uval8);
uval8 = uval8 <= priv->dlen ? uval8 : priv->dlen;
memset(record->val, 0, priv->dlen);
status = s7plcFWReadArray(priv->station, priv->offs,
1, priv->dlen, record->val);
status = s7plcFWReadArray(priv->station, priv->offs+2,
1, uval8, record->val);
s7plcFWDebugLog(3, "stringin %s: read array of %d 8bit values\n",
record->name, priv->dlen);
record->name, uval8);
if (record->val[priv->dlen] && !memchr(record->val, 0, priv->dlen))
{
/* truncate oversize string */