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

scpi-pps: cleaner rewriting of output regulation GVariant

This commit is contained in:
Aurelien Jacobs 2015-09-20 16:43:43 +02:00
parent d66c93ccda
commit 069d9f25d9
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -262,7 +262,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
const GVariantType *gvtype; const GVariantType *gvtype;
unsigned int i; unsigned int i;
int cmd, ret; int cmd, ret;
char *s; const char *s;
if (!sdi) if (!sdi)
return SR_ERR_ARG; return SR_ERR_ARG;
@ -366,17 +366,19 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
* the Rigol notation. * the Rigol notation.
*/ */
s = g_variant_get_string(*data, NULL); s = g_variant_get_string(*data, NULL);
if (!strcmp(s, "CV") || !strcmp(s, "VOLT")) { if (!strcmp(s, "VOLT")) {
g_variant_unref(*data);
*data = g_variant_new_string("CV"); *data = g_variant_new_string("CV");
} else if (!strcmp(s, "CC") || !strcmp(s, "CURR")) { } else if (!strcmp(s, "CURR")) {
g_variant_unref(*data);
*data = g_variant_new_string("CC"); *data = g_variant_new_string("CC");
} else if (!strcmp(s, "UR")) { }
*data = g_variant_new_string("UR");
} else { s = g_variant_get_string(*data, NULL);
if (strcmp(s, "CV") && strcmp(s, "CC") && strcmp(s, "UR")) {
sr_dbg("Unknown response to SCPI_CMD_GET_OUTPUT_REGULATION: %s", s); sr_dbg("Unknown response to SCPI_CMD_GET_OUTPUT_REGULATION: %s", s);
ret = SR_ERR_DATA; ret = SR_ERR_DATA;
} }
g_free(s);
} }
return ret; return ret;