X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fscpi%2Fscpi.c;h=9fa4ac03605392245ca0077f468cd006bb99f235;hb=c16effaedc3a3d8539065d1cf228e98f8cace5e0;hp=f72164a63f177dce0b71dd5d07fbc312566dadd8;hpb=72cd558d4ac706d4d3f934d177c58d0aa0e806fa;p=libsigrok.git diff --git a/src/scpi/scpi.c b/src/scpi/scpi.c index f72164a6..9fa4ac03 100644 --- a/src/scpi/scpi.c +++ b/src/scpi/scpi.c @@ -724,6 +724,7 @@ SR_PRIV int sr_scpi_get_int(struct sr_scpi_dev_inst *scpi, const char *command, int *scpi_response) { int ret; + struct sr_rational ret_rational; char *response; response = NULL; @@ -732,10 +733,14 @@ SR_PRIV int sr_scpi_get_int(struct sr_scpi_dev_inst *scpi, if (ret != SR_OK && !response) return ret; - if (sr_atoi(response, scpi_response) == SR_OK) - ret = SR_OK; - else + ret = sr_parse_rational(response, &ret_rational); + if (ret == SR_OK && (ret_rational.p % ret_rational.q) == 0) { + *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; + } g_free(response);