From 811d6255bbed786183616867196029b639fd7891 Mon Sep 17 00:00:00 2001 From: Matthias Heidbrink Date: Thu, 26 Jun 2014 14:14:31 +0200 Subject: [PATCH] manson-hcs-3xxx: Implemented setting voltage, current and output. --- hardware/manson-hcs-3xxx/api.c | 82 +++++++++++++++++++++++++++-- hardware/manson-hcs-3xxx/protocol.h | 4 +- 2 files changed, 81 insertions(+), 5 deletions(-) diff --git a/hardware/manson-hcs-3xxx/api.c b/hardware/manson-hcs-3xxx/api.c index b75fbb69..99b8051b 100644 --- a/hardware/manson-hcs-3xxx/api.c +++ b/hardware/manson-hcs-3xxx/api.c @@ -32,12 +32,18 @@ static const int32_t hwopts[] = { }; static const int32_t devopts[] = { + /* Device class */ SR_CONF_POWER_SUPPLY, + /* Aquisition modes. */ SR_CONF_LIMIT_SAMPLES, SR_CONF_LIMIT_MSEC, SR_CONF_CONTINUOUS, - SR_CONF_OUTPUT_VOLTAGE, + /* Device configuration */ SR_CONF_OUTPUT_CURRENT, + SR_CONF_OUTPUT_CURRENT_MAX, + SR_CONF_OUTPUT_ENABLED, + SR_CONF_OUTPUT_VOLTAGE, + SR_CONF_OUTPUT_VOLTAGE_MAX, }; /* Note: All models have one power supply output only. */ @@ -218,11 +224,20 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi, case SR_CONF_LIMIT_MSEC: *data = g_variant_new_uint64(devc->limit_msec); break; + case SR_CONF_OUTPUT_CURRENT: + *data = g_variant_new_double(devc->current); + break; + case SR_CONF_OUTPUT_CURRENT_MAX: + *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_CURRENT: - *data = g_variant_new_double(devc->current); + case SR_CONF_OUTPUT_VOLTAGE_MAX: + *data = g_variant_new_double(devc->voltage_max); break; default: return SR_ERR_NA; @@ -235,6 +250,8 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { struct dev_context *devc; + gboolean bval; + gdouble dval; (void)cg; @@ -254,6 +271,37 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi, return SR_ERR_ARG; devc->limit_samples = g_variant_get_uint64(data); break; + case SR_CONF_OUTPUT_CURRENT_MAX: + dval = g_variant_get_double(data); + if (dval < devc->model->current[0] || dval > devc->model->current[1]) + return SR_ERR_ARG; + + if ((hcs_send_cmd(sdi->conn, "CURR%03.0f\r", + (dval / devc->model->current[2])) < 0) || + (hcs_read_reply(sdi->conn, 1, devc->buf, sizeof(devc->buf)) < 0)) + return SR_ERR; + devc->current_max = dval; + break; + case SR_CONF_OUTPUT_ENABLED: + bval = g_variant_get_boolean(data); + if (bval == devc->output_enabled) /* Nothing to do. */ + break; + if ((hcs_send_cmd(sdi->conn, "SOUT%1d\r", !bval) < 0) || + (hcs_read_reply(sdi->conn, 1, devc->buf, sizeof(devc->buf)) < 0)) + 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->model->voltage[1]) + 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; } @@ -264,9 +312,17 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi, static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { - (void)sdi; + struct dev_context *devc; + GVariant *gvar; + GVariantBuilder gvb; + int idx; + (void)cg; + if (!sdi) + return SR_ERR_ARG; + devc = sdi->priv; + switch (key) { case SR_CONF_SCAN_OPTIONS: *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, @@ -276,6 +332,24 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, devopts, ARRAY_SIZE(devopts), sizeof(int32_t)); break; + case SR_CONF_OUTPUT_CURRENT_MAX: + g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY); + /* Min, max, step. */ + for (idx = 0; idx < 3; idx++) { + gvar = g_variant_new_double(devc->model->current[idx]); + g_variant_builder_add_value(&gvb, gvar); + } + *data = g_variant_builder_end(&gvb); + break; + case SR_CONF_OUTPUT_VOLTAGE_MAX: + g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY); + /* Min, max, step. */ + for (idx = 0; idx < 3; idx++) { + gvar = g_variant_new_double(devc->model->voltage[idx]); + g_variant_builder_add_value(&gvb, gvar); + } + *data = g_variant_builder_end(&gvb); + break; default: return SR_ERR_NA; } diff --git a/hardware/manson-hcs-3xxx/protocol.h b/hardware/manson-hcs-3xxx/protocol.h index cbed952d..f5cd77f8 100644 --- a/hardware/manson-hcs-3xxx/protocol.h +++ b/hardware/manson-hcs-3xxx/protocol.h @@ -77,8 +77,10 @@ struct dev_context { void *cb_data; - float voltage; /**< Last voltage value [V] read from device. */ float current; /**< Last current value [A] read from device. */ + float current_max; /**< Output current set */ + float voltage; /**< Last voltage value [V] read from device. */ + float voltage_max; /**< Output voltage set */ gboolean cc_mode; /**< Device is in constant current mode (otherwise constant voltage). */ gboolean output_enabled; /**< Is the output enabled? */