X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fconrad-digi-35-cpu%2Fapi.c;h=adb38eae460fae2be666d082c39e2dcf148a7384;hb=b96051a507100543bef235365b2ce68942d5f0d8;hp=7991b815c6ab9e68b06eb327d714ad042502cbf6;hpb=dd7a72ea697a172032f5473b0ddff5e8d47222f4;p=libsigrok.git

diff --git a/src/hardware/conrad-digi-35-cpu/api.c b/src/hardware/conrad-digi-35-cpu/api.c
index 7991b815..adb38eae 100644
--- a/src/hardware/conrad-digi-35-cpu/api.c
+++ b/src/hardware/conrad-digi-35-cpu/api.c
@@ -32,13 +32,14 @@ static const uint32_t drvopts[] = {
 };
 
 static const uint32_t devopts[] = {
-	SR_CONF_VOLTAGE | SR_CONF_SET,
-	SR_CONF_CURRENT | SR_CONF_SET,
+	SR_CONF_VOLTAGE_TARGET | SR_CONF_SET | SR_CONF_LIST,
+	SR_CONF_CURRENT_LIMIT | SR_CONF_SET | SR_CONF_LIST,
 	SR_CONF_OVER_CURRENT_PROTECTION_ENABLED | SR_CONF_SET,
 };
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
+	struct dev_context *devc;
 	struct sr_dev_inst *sdi;
 	struct sr_config *src;
 	struct sr_serial_dev_inst *serial;
@@ -74,7 +75,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	if (serial_open(serial, SERIAL_RDWR) != SR_OK)
 		return NULL;
 
-	serial_flush(serial);
 	serial_close(serial);
 
 	sr_spew("Conrad DIGI 35 CPU assumed at %s.", conn);
@@ -83,9 +83,11 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	sdi->status = SR_ST_INACTIVE;
 	sdi->vendor = g_strdup("Conrad");
 	sdi->model = g_strdup("DIGI 35 CPU");
+	devc = g_malloc0(sizeof(struct dev_context));
+	sr_sw_limits_init(&devc->limits);
+	sdi->inst_type = SR_INST_SERIAL;
 	sdi->conn = serial;
-	sdi->priv = NULL;
-	sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "CH1");
+	sdi->priv = devc;
 
 	return std_scan_complete(di, g_slist_append(NULL, sdi));
 }
@@ -93,45 +95,55 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 static int config_set(uint32_t key, GVariant *data,
 	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
-	int ret;
 	double dblval;
 
 	(void)cg;
 
 	switch (key) {
-	case SR_CONF_VOLTAGE:
+	case SR_CONF_VOLTAGE_TARGET:
 		dblval = g_variant_get_double(data);
 		if ((dblval < 0.0) || (dblval > 35.0)) {
 			sr_err("Voltage out of range (0 - 35.0)!");
 			return SR_ERR_ARG;
 		}
-		ret = send_msg1(sdi, 'V', (int) (dblval * 10 + 0.5));
-		break;
-	case SR_CONF_CURRENT:
+		return send_msg1(sdi, 'V', (int) (dblval * 10 + 0.5));
+	case SR_CONF_CURRENT_LIMIT:
 		dblval = g_variant_get_double(data);
-		if ((dblval < 0.01) || (dblval > 2.55)) {
+		if ((dblval < 0.00) || (dblval > 2.55)) {
 			sr_err("Current out of range (0 - 2.55)!");
 			return SR_ERR_ARG;
 		}
-		ret = send_msg1(sdi, 'C', (int) (dblval * 100 + 0.5));
-		break;
+		return send_msg1(sdi, 'C', (int) (dblval * 100 + 0.5));
 	case SR_CONF_OVER_CURRENT_PROTECTION_ENABLED:
 		if (g_variant_get_boolean(data))
-			ret = send_msg1(sdi, 'V', 900);
+			return send_msg1(sdi, 'V', 900);
 		else /* Constant current mode */
-			ret = send_msg1(sdi, 'V', 901);
-		break;
+			return send_msg1(sdi, 'V', 901);
 	default:
-		ret = SR_ERR_NA;
+		return SR_ERR_NA;
 	}
 
-	return ret;
+	return SR_OK;
 }
 
 static int config_list(uint32_t key, GVariant **data,
 	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
-	return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
+	switch (key) {
+	case SR_CONF_SCAN_OPTIONS:
+	case SR_CONF_DEVICE_OPTIONS:
+		return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
+	case SR_CONF_VOLTAGE_TARGET:
+		*data = std_gvar_min_max_step(0.0, 35.0, 0.1);
+		break;
+	case SR_CONF_CURRENT_LIMIT:
+		*data = std_gvar_min_max_step(0.0, 2.55, 0.01);
+		break;
+	default:
+		return SR_ERR_NA;
+	}
+
+	return SR_OK;
 }
 
 static struct sr_dev_driver conrad_digi_35_cpu_driver_info = {