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

scpi: accept numbers like 4.0000E3 as integer value 

MSO5000 returns memory depth value in that format, e.g.
sr: [04:21.491949] scpi_vxi: Successfully sent SCPI command: 'ACQ:MDEP?'.
sr: [04:21.501463] scpi: Got response: '4.0000E+03', length 10.

[ gsi: drop redundant assignment and parens, amend diag message ]
This commit is contained in:
Ralf 2020-08-25 08:19:18 +02:00 committed by Gerhard Sittig
parent 0c52026459
commit 2dddd5bd5e
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/scpi/scpi.c
View File

@ -724,6 +724,7 @@ SR_PRIV int sr_scpi_get_int(struct sr_scpi_dev_inst *scpi,
const char *command, int *scpi_response) const char *command, int *scpi_response)
{ {
int ret; int ret;
struct sr_rational ret_rational;
char *response; char *response;
response = NULL; response = NULL;
@ -732,10 +733,14 @@ SR_PRIV int sr_scpi_get_int(struct sr_scpi_dev_inst *scpi,
if (ret != SR_OK && !response) if (ret != SR_OK && !response)
return ret; return ret;
if (sr_atoi(response, scpi_response) == SR_OK) ret = sr_parse_rational(response, &ret_rational);
ret = SR_OK; if (ret == SR_OK && (ret_rational.p % ret_rational.q) == 0) {
else *scpi_response = ret_rational.p / ret_rational.q;
} else {
sr_dbg("get_int: non-integer rational=%" PRId64 "/%" PRIu64,
ret_rational.p, ret_rational.q);
ret = SR_ERR_DATA; ret = SR_ERR_DATA;
}
g_free(response); g_free(response);