]> sigrok.org Git - libsigrok.git/blobdiff - hardware/common/scpi.c
rigol-ds: Advertise SR_CONF_LIMIT_FRAMES support.
[libsigrok.git] / hardware / common / scpi.c
index beb33423934224df8287378a2dad942ccf783162..591b9770f8b1a0a40326209e2dcd51380f8ab2e4 100644 (file)
@@ -75,7 +75,7 @@ static const struct sr_scpi_dev_inst *scpi_devs[] = {
        &scpi_tcp_raw_dev,
        &scpi_tcp_rigol_dev,
        &scpi_usbtmc_dev,
-#ifdef HAVE_RPC
+#if HAVE_RPC
        &scpi_vxi_dev,
 #endif
 #ifdef HAVE_LIBSERIALPORT
@@ -404,7 +404,7 @@ SR_PRIV int sr_scpi_get_float(struct sr_scpi_dev_inst *scpi,
                if (!response)
                        return SR_ERR;
 
-       if (sr_atof(response, scpi_response) == SR_OK)
+       if (sr_atof_ascii(response, scpi_response) == SR_OK)
                ret = SR_OK;
        else
                ret = SR_ERR;
@@ -505,7 +505,7 @@ SR_PRIV int sr_scpi_get_floatv(struct sr_scpi_dev_inst *scpi,
        response_array = g_array_sized_new(TRUE, FALSE, sizeof(float), 256);
 
        while (*ptr) {
-               if (sr_atof(*ptr, &tmp) == SR_OK)
+               if (sr_atof_ascii(*ptr, &tmp) == SR_OK)
                        response_array = g_array_append_val(response_array,
                                                            tmp);
                else