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

scpi-pps: sr_scpi_get_string() is already called by scpi_cmd_resp() 

This double call was causing the following error:
sr: scpi_usbtmc: USBTMC bulk in transfer error: LIBUSB_ERROR_TIMEOUT.
This commit is contained in:
Aurelien Jacobs 2015-09-20 16:22:21 +02:00
parent 6ab604c5c2
commit d66c93ccda
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/hardware/scpi-pps/api.c
View File

@ -365,8 +365,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
* return VOLT/CURR. We always return a GVariant string in
* the Rigol notation.
*/
if ((ret = sr_scpi_get_string(sdi->conn, NULL, &s)) != SR_OK)
return ret;
s = g_variant_get_string(*data, NULL);
if (!strcmp(s, "CV") || !strcmp(s, "VOLT")) {
*data = g_variant_new_string("CV");
} else if (!strcmp(s, "CC") || !strcmp(s, "CURR")) {