X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fmanson-hcs-3xxx%2Fapi.c;h=dead308546e5685aed85164c1c25d5d297b12d13;hb=b5bbc3f1b00d5f3096c6800af4069fb07704d3a9;hp=b75fbb69011447cee11cc828938186cf917682ae;hpb=9740d9bf8c257e714d937602a10b8d81a7762d4e;p=libsigrok.git

diff --git a/hardware/manson-hcs-3xxx/api.c b/hardware/manson-hcs-3xxx/api.c
index b75fbb69..dead3085 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. */
@@ -85,7 +91,7 @@ static GSList *scan(GSList *options)
 	GSList *devices, *l;
 	const char *conn, *serialcomm;
 	struct sr_serial_dev_inst *serial;
-	char reply[50], **tokens;
+	char reply[50], **tokens, *dummy;
 
 	drvc = di->priv;
 	drvc->instances = NULL;
@@ -165,13 +171,24 @@ static GSList *scan(GSList *options)
 
 	sdi->priv = devc;
 
-	/* Get current device status. */
+	/* Get current voltage, current, status. */
 	if ((hcs_send_cmd(serial, "GETD\r") < 0) ||
 	    (hcs_read_reply(serial, 2, reply, sizeof(reply)) < 0))
-		return NULL;
+		goto exit_err;
 	tokens = g_strsplit((const gchar *)&reply, "\r", 2);
 	if (hcs_parse_volt_curr_mode(sdi, tokens) < 0)
 		goto exit_err;
+	g_strfreev(tokens);
+
+	/* Get max. voltage and current. */
+	if ((hcs_send_cmd(serial, "GMAX\r") < 0) ||
+	    (hcs_read_reply(serial, 2, reply, sizeof(reply)) < 0))
+		goto exit_err;
+	tokens = g_strsplit((const gchar *)&reply, "\r", 2);
+	devc->current_max_device = g_strtod(&tokens[0][3], &dummy) * devc->model->current[2];
+	tokens[0][3] = '\0';
+	devc->voltage_max_device = g_strtod(tokens[0], &dummy) * devc->model->voltage[2];
+	g_strfreev(tokens);
 
 	drvc->instances = g_slist_append(drvc->instances, sdi);
 	devices = g_slist_append(devices, sdi);
@@ -218,11 +235,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 +261,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 +282,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->current_max_device)
+			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->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;
 	}
@@ -264,9 +323,18 @@ 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;
+	double dval;
+	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 +344,32 @@ 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++) {
+			if (idx == 1)
+				dval = devc->current_max_device;
+			else
+				dval = devc->model->current[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:
+		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;
+			else
+				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;
 	default:
 		return SR_ERR_NA;
 	}