BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

scpi_serial: Add support for (broken) devices sending NL+CR terminator. 

This allows SCPI code to work with devices that terminate their responses
with NL+CR (instead of usual NL) like some GW-Instek DMMs.
This commit is contained in:
Timo Kokkonen 2020-06-01 23:56:03 -07:00 committed by Gerhard Sittig
parent d7df9dc738
commit a0ade2f933
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/scpi/scpi_serial.c
View File

@ -187,7 +187,12 @@ static int scpi_serial_read_data(void *priv, char *buf, int maxlen)
if (ret > 0) { if (ret > 0) {
if (buf[ret - 1] == '\n') { if (buf[ret - 1] == '\n') {
sscpi->got_newline = TRUE; sscpi->got_newline = TRUE;
sr_spew("Received terminator"); sr_spew("Received NL terminator");
} else if (ret > 1 &&
buf[ret - 2] == '\n' && buf[ret - 1] == '\r') {
sscpi->got_newline = TRUE;
sr_spew("Received NL+CR terminator");
ret--;
} else { } else {
sscpi->got_newline = FALSE; sscpi->got_newline = FALSE;
} }