Use SR_CONF_OUTPUT_VOLTAGE_TARGET and _CURRENT_LIMIT.

[libsigrok.git] / src / hardware / manson-hcs-3xxx / api.c

diff --git a/src/hardware/manson-hcs-3xxx/api.c b/src/hardware/manson-hcs-3xxx/api.c
index b0dc27338371870c1f3ea0a16c6e375ce7062d76..fad2e8dae6f161c9b7a6cef4a5510d7b17f7554c 100644 (file)
--- a/src/hardware/manson-hcs-3xxx/api.c
+++ b/src/hardware/manson-hcs-3xxx/api.c
@@ -39,11 +39,11 @@ static const uint32_t devopts[] = {
        SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
        SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET,
        /* Device configuration */
+       SR_CONF_OUTPUT_VOLTAGE | SR_CONF_GET,
+       SR_CONF_OUTPUT_VOLTAGE_TARGET | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
        SR_CONF_OUTPUT_CURRENT | SR_CONF_GET,
-       SR_CONF_OUTPUT_CURRENT_MAX | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+       SR_CONF_OUTPUT_CURRENT_LIMIT | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
        SR_CONF_OUTPUT_ENABLED | SR_CONF_GET | SR_CONF_SET,
-       SR_CONF_OUTPUT_VOLTAGE | SR_CONF_GET,
-       SR_CONF_OUTPUT_VOLTAGE_MAX | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 };
 
 /* Note: All models have one power supply output only. */
@@ -235,21 +235,21 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
        case SR_CONF_LIMIT_MSEC:
                *data = g_variant_new_uint64(devc->limit_msec);
                break;
+       case SR_CONF_OUTPUT_VOLTAGE:
+               *data = g_variant_new_double(devc->voltage);
+               break;
+       case SR_CONF_OUTPUT_VOLTAGE_TARGET:
+               *data = g_variant_new_double(devc->voltage_max);
+               break;
        case SR_CONF_OUTPUT_CURRENT:
                *data = g_variant_new_double(devc->current);
                break;
-       case SR_CONF_OUTPUT_CURRENT_MAX:
+       case SR_CONF_OUTPUT_CURRENT_LIMIT:
                *data = g_variant_new_double(devc->current_max);
                break;
        case SR_CONF_OUTPUT_ENABLED:
                *data = g_variant_new_boolean(devc->output_enabled);
                break;
-       case SR_CONF_OUTPUT_VOLTAGE:
-               *data = g_variant_new_double(devc->voltage);
-               break;
-       case SR_CONF_OUTPUT_VOLTAGE_MAX:
-               *data = g_variant_new_double(devc->voltage_max);
-               break;
        default:
                return SR_ERR_NA;
        }
@@ -282,7 +282,18 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
                        return SR_ERR_ARG;
                devc->limit_samples = g_variant_get_uint64(data);
                break;
-       case SR_CONF_OUTPUT_CURRENT_MAX:
+       case SR_CONF_OUTPUT_VOLTAGE_TARGET:
+               dval = g_variant_get_double(data);
+               if (dval < devc->model->voltage[0] || dval > devc->voltage_max_device)
+                       return SR_ERR_ARG;
+
+               if ((hcs_send_cmd(sdi->conn, "VOLT%03.0f\r",
+                       (dval / devc->model->voltage[2])) < 0) ||
+                   (hcs_read_reply(sdi->conn, 1, devc->buf, sizeof(devc->buf)) < 0))
+                       return SR_ERR;
+               devc->voltage_max = dval;
+               break;
+       case SR_CONF_OUTPUT_CURRENT_LIMIT:
                dval = g_variant_get_double(data);
                if (dval < devc->model->current[0] || dval > devc->current_max_device)
                        return SR_ERR_ARG;
@@ -302,17 +313,6 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
                        return SR_ERR;
                devc->output_enabled = bval;
                break;
-       case SR_CONF_OUTPUT_VOLTAGE_MAX:
-               dval = g_variant_get_double(data);
-               if (dval < devc->model->voltage[0] || dval > devc->voltage_max_device)
-                       return SR_ERR_ARG;
-
-               if ((hcs_send_cmd(sdi->conn, "VOLT%03.0f\r",
-                       (dval / devc->model->voltage[2])) < 0) ||
-                   (hcs_read_reply(sdi->conn, 1, devc->buf, sizeof(devc->buf)) < 0))
-                       return SR_ERR;
-               devc->voltage_max = dval;
-               break;
        default:
                return SR_ERR_NA;
        }
@@ -344,27 +344,27 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
                *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
                                devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
                break;
-       case SR_CONF_OUTPUT_CURRENT_MAX:
+       case SR_CONF_OUTPUT_VOLTAGE_TARGET:
                g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
                /* Min, max, step. */
                for (idx = 0; idx < 3; idx++) {
                        if (idx == 1)
-                               dval = devc->current_max_device;
+                               dval = devc->voltage_max_device;
                        else
-                               dval = devc->model->current[idx];
+                               dval = devc->model->voltage[idx];
                        gvar = g_variant_new_double(dval);
                        g_variant_builder_add_value(&gvb, gvar);
                }
                *data = g_variant_builder_end(&gvb);
                break;
-       case SR_CONF_OUTPUT_VOLTAGE_MAX:
+       case SR_CONF_OUTPUT_CURRENT_LIMIT:
                g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
                /* Min, max, step. */
                for (idx = 0; idx < 3; idx++) {
                        if (idx == 1)
-                               dval = devc->voltage_max_device;
+                               dval = devc->current_max_device;
                        else
-                               dval = devc->model->voltage[idx];
+                               dval = devc->model->current[idx];
                        gvar = g_variant_new_double(dval);
                        g_variant_builder_add_value(&gvb, gvar);
                }