scpi-pps: Minor cleanups.

[libsigrok.git] / src / hardware / scpi-pps / api.c

diff --git a/src/hardware/scpi-pps/api.c b/src/hardware/scpi-pps/api.c
index 9da525792625267db897a6158776257169f9e0ee..d4aa4923ff71f06941e049fab2e110d2a98e6313 100644 (file)
--- a/src/hardware/scpi-pps/api.c
+++ b/src/hardware/scpi-pps/api.c
@@ -18,11 +18,10 @@
  */
 
 #include <string.h>
+#include <strings.h>
 #include "protocol.h"
 
 SR_PRIV struct sr_dev_driver scpi_pps_driver_info;
-extern unsigned int num_pps_profiles;
-extern const struct scpi_pps pps_profiles[];
 
 static const uint32_t scanopts[] = {
        SR_CONF_CONN,
@@ -37,6 +36,7 @@ static const struct pps_channel_instance pci[] = {
        { SR_MQ_VOLTAGE, SCPI_CMD_GET_MEAS_VOLTAGE, "V" },
        { SR_MQ_CURRENT, SCPI_CMD_GET_MEAS_CURRENT, "I" },
        { SR_MQ_POWER, SCPI_CMD_GET_MEAS_POWER, "P" },
+       { SR_MQ_FREQUENCY, SCPI_CMD_GET_MEAS_FREQUENCY, "F" },
 };
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
@@ -299,6 +299,14 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
                gvtype = G_VARIANT_TYPE_DOUBLE;
                cmd = SCPI_CMD_GET_VOLTAGE_TARGET;
                break;
+       case SR_CONF_OUTPUT_FREQUENCY:
+               gvtype = G_VARIANT_TYPE_DOUBLE;
+               cmd = SCPI_CMD_GET_MEAS_FREQUENCY;
+               break;
+       case SR_CONF_OUTPUT_FREQUENCY_TARGET:
+               gvtype = G_VARIANT_TYPE_DOUBLE;
+               cmd = SCPI_CMD_GET_FREQUENCY_TARGET;
+               break;
        case SR_CONF_OUTPUT_CURRENT:
                gvtype = G_VARIANT_TYPE_DOUBLE;
                cmd = SCPI_CMD_GET_MEAS_CURRENT;
@@ -377,6 +385,10 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
                d = g_variant_get_double(data);
                ret = scpi_cmd(sdi, SCPI_CMD_SET_VOLTAGE_TARGET, d);
                break;
+       case SR_CONF_OUTPUT_FREQUENCY_TARGET:
+               d = g_variant_get_double(data);
+               ret = scpi_cmd(sdi, SCPI_CMD_SET_FREQUENCY_TARGET, d);
+               break;
        case SR_CONF_OUTPUT_CURRENT_LIMIT:
                d = g_variant_get_double(data);
                ret = scpi_cmd(sdi, SCPI_CMD_SET_CURRENT_LIMIT, d);
@@ -496,6 +508,16 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
                        }
                        *data = g_variant_builder_end(&gvb);
                        break;
+               case SR_CONF_OUTPUT_FREQUENCY_TARGET:
+                       ch_spec = &(devc->device->channels[ch->index]);
+                       g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
+                       /* Min, max, write resolution. */
+                       for (i = 0; i < 3; i++) {
+                               gvar = g_variant_new_double(ch_spec->frequency[i]);
+                               g_variant_builder_add_value(&gvb, gvar);
+                       }
+                       *data = g_variant_builder_end(&gvb);
+                       break;
                case SR_CONF_OUTPUT_CURRENT_LIMIT:
                        g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
                        /* Min, max, step. */
@@ -542,6 +564,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
                return ret;
        if (pch->mq == SR_MQ_VOLTAGE)
                cmd = SCPI_CMD_GET_MEAS_VOLTAGE;
+       else if (pch->mq == SR_MQ_FREQUENCY)
+               cmd = SCPI_CMD_GET_MEAS_FREQUENCY;
        else if (pch->mq == SR_MQ_CURRENT)
                cmd = SCPI_CMD_GET_MEAS_CURRENT;
        else if (pch->mq == SR_MQ_POWER)