Fix short names for SR_CONF_OUTPUT_VOLTAGE_TARGET/_CURRENT_LIMIT.

[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 bd7e6d6e983ea48d0a1c7dcca8eed0bbdfbdd163..addf610df57bd66db09ae20fb6e58aa82eca4c5f 100644 (file)
--- a/src/hardware/scpi-pps/api.c
+++ b/src/hardware/scpi-pps/api.c
@@ -242,17 +242,17 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
                gvtype = G_VARIANT_TYPE_DOUBLE;
                cmd = SCPI_CMD_GET_MEAS_VOLTAGE;
                break;
-       case SR_CONF_OUTPUT_VOLTAGE_MAX:
+       case SR_CONF_OUTPUT_VOLTAGE_TARGET:
                gvtype = G_VARIANT_TYPE_DOUBLE;
-               cmd = SCPI_CMD_GET_VOLTAGE_MAX;
+               cmd = SCPI_CMD_GET_VOLTAGE_TARGET;
                break;
        case SR_CONF_OUTPUT_CURRENT:
                gvtype = G_VARIANT_TYPE_DOUBLE;
                cmd = SCPI_CMD_GET_MEAS_CURRENT;
                break;
-       case SR_CONF_OUTPUT_CURRENT_MAX:
+       case SR_CONF_OUTPUT_CURRENT_LIMIT:
                gvtype = G_VARIANT_TYPE_DOUBLE;
-               cmd = SCPI_CMD_GET_CURRENT_MAX;
+               cmd = SCPI_CMD_GET_CURRENT_LIMIT;
                break;
        case SR_CONF_OVER_VOLTAGE_PROTECTION_ENABLED:
                gvtype = G_VARIANT_TYPE_BOOLEAN;
@@ -320,7 +320,6 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
        struct pps_channel *pch;
        double d;
        int ret;
-       const char *s;
 
        if (!sdi)
                return SR_ERR_ARG;
@@ -333,20 +332,24 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
                switch (key) {
                /* No channel group: global options. */
                case SR_CONF_OUTPUT_ENABLED:
-                       s = g_variant_get_boolean(data) ? "ON" : "OFF";
-                       ret = scpi_cmd(sdi, SCPI_CMD_SET_OUTPUT_ENABLED, s);
+                       if (g_variant_get_boolean(data))
+                               ret = scpi_cmd(sdi, SCPI_CMD_SET_OUTPUT_ENABLE);
+                       else
+                               ret = scpi_cmd(sdi, SCPI_CMD_SET_OUTPUT_DISABLE);
                        break;
-               case SR_CONF_OUTPUT_VOLTAGE_MAX:
+               case SR_CONF_OUTPUT_VOLTAGE_TARGET:
                        d = g_variant_get_double(data);
-                       ret = scpi_cmd(sdi, SCPI_CMD_SET_VOLTAGE_MAX, d);
+                       ret = scpi_cmd(sdi, SCPI_CMD_SET_VOLTAGE_TARGET, d);
                        break;
-               case SR_CONF_OUTPUT_CURRENT_MAX:
+               case SR_CONF_OUTPUT_CURRENT_LIMIT:
                        d = g_variant_get_double(data);
-                       ret = scpi_cmd(sdi, SCPI_CMD_SET_CURRENT_MAX, d);
+                       ret = scpi_cmd(sdi, SCPI_CMD_SET_CURRENT_LIMIT, d);
                        break;
                case SR_CONF_OVER_TEMPERATURE_PROTECTION:
-                       s = g_variant_get_boolean(data) ? "ON" : "OFF";
-                       ret = scpi_cmd(sdi, SCPI_CMD_SET_OVER_TEMPERATURE_PROTECTION, s);
+                       if (g_variant_get_boolean(data))
+                               ret = scpi_cmd(sdi, SCPI_CMD_SET_OVER_TEMPERATURE_PROTECTION_ENABLE);
+                       else
+                               ret = scpi_cmd(sdi, SCPI_CMD_SET_OVER_TEMPERATURE_PROTECTION_DISABLE);
                        break;
                default:
                        ret = SR_ERR_NA;
@@ -357,21 +360,26 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
                pch = ch->priv;
                switch (key) {
                case SR_CONF_OUTPUT_ENABLED:
-                       s = g_variant_get_boolean(data) ? "ON" : "OFF";
-                       ret = scpi_cmd(sdi, SCPI_CMD_SET_OUTPUT_ENABLED, pch->hwname, s);
+                       if (g_variant_get_boolean(data))
+                               ret = scpi_cmd(sdi, SCPI_CMD_SET_OUTPUT_ENABLE, pch->hwname);
+                       else
+                               ret = scpi_cmd(sdi, SCPI_CMD_SET_OUTPUT_DISABLE, pch->hwname);
                        break;
-               case SR_CONF_OUTPUT_VOLTAGE_MAX:
+               case SR_CONF_OUTPUT_VOLTAGE_TARGET:
                        d = g_variant_get_double(data);
-                       ret = scpi_cmd(sdi, SCPI_CMD_SET_VOLTAGE_MAX, pch->hwname, d);
+                       ret = scpi_cmd(sdi, SCPI_CMD_SET_VOLTAGE_TARGET, pch->hwname, d);
                        break;
-               case SR_CONF_OUTPUT_CURRENT_MAX:
+               case SR_CONF_OUTPUT_CURRENT_LIMIT:
                        d = g_variant_get_double(data);
-                       ret = scpi_cmd(sdi, SCPI_CMD_SET_CURRENT_MAX, pch->hwname, d);
+                       ret = scpi_cmd(sdi, SCPI_CMD_SET_CURRENT_LIMIT, pch->hwname, d);
                        break;
                case SR_CONF_OVER_VOLTAGE_PROTECTION_ENABLED:
-                       s = g_variant_get_boolean(data) ? "ON" : "OFF";
-                       ret = scpi_cmd(sdi, SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_ENABLED,
-                                       pch->hwname, s);
+                       if (g_variant_get_boolean(data))
+                               ret = scpi_cmd(sdi, SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_ENABLE,
+                                               pch->hwname);
+                       else
+                               ret = scpi_cmd(sdi, SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_DISABLE,
+                                               pch->hwname);
                        break;
                case SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD:
                        d = g_variant_get_double(data);
@@ -379,9 +387,12 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
                                        pch->hwname, d);
                        break;
                case SR_CONF_OVER_CURRENT_PROTECTION_ENABLED:
-                       s = g_variant_get_boolean(data) ? "ON" : "OFF";
-                       ret = scpi_cmd(sdi, SCPI_CMD_SET_OVER_CURRENT_PROTECTION_ENABLED,
-                                       pch->hwname, s);
+                       if (g_variant_get_boolean(data))
+                               ret = scpi_cmd(sdi, SCPI_CMD_SET_OVER_CURRENT_PROTECTION_ENABLE,
+                                               pch->hwname);
+                       else
+                               ret = scpi_cmd(sdi, SCPI_CMD_SET_OVER_CURRENT_PROTECTION_DISABLE,
+                                               pch->hwname);
                        break;
                case SR_CONF_OVER_CURRENT_PROTECTION_THRESHOLD:
                        d = g_variant_get_double(data);
@@ -464,7 +475,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
                                        devc->device->devopts_cg, devc->device->num_devopts_cg,
                                        sizeof(uint32_t));
                        break;
-               case SR_CONF_OUTPUT_VOLTAGE_MAX:
+               case SR_CONF_OUTPUT_VOLTAGE_TARGET:
                        ch_spec = &(devc->device->channels[ch->index]);
                        g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
                        /* Min, max, write resolution. */
@@ -474,7 +485,7 @@ 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_CURRENT_MAX:
+               case SR_CONF_OUTPUT_CURRENT_LIMIT:
                        g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
                        /* Min, max, step. */
                        for (i = 0; i < 3; i++) {