X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Frigol-ds%2Fapi.c;h=5da9a5eaec94619afb190138859caaff21f15291;hb=5e23fcab889c62864b92aa3ad6902ce3e9f5be49;hp=e988741eeaab6d8b17414fcc171577eee2e4fe5c;hpb=f57d8ffe66612a1fdc20ed09c222f8ea59bd84d4;p=libsigrok.git

diff --git a/src/hardware/rigol-ds/api.c b/src/hardware/rigol-ds/api.c
index e988741e..5da9a5ea 100644
--- a/src/hardware/rigol-ds/api.c
+++ b/src/hardware/rigol-ds/api.c
@@ -39,9 +39,9 @@ static const uint32_t devopts[] = {
 	SR_CONF_LIMIT_FRAMES | SR_CONF_SET,
 	SR_CONF_TIMEBASE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 	SR_CONF_TRIGGER_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
-	SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET,
+	SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 	SR_CONF_HORIZ_TRIGGERPOS | SR_CONF_SET,
-	SR_CONF_NUM_TIMEBASE | SR_CONF_GET,
+	SR_CONF_NUM_HDIV | SR_CONF_GET,
 	SR_CONF_SAMPLERATE | SR_CONF_GET,
 };
 
@@ -113,6 +113,9 @@ static const uint64_t vdivs[][2] = {
 	{ 2, 1 },
 	{ 5, 1 },
 	{ 10, 1 },
+	{ 20, 1 },
+	{ 50, 1 },
+	{ 100, 1 },
 };
 
 #define NUM_TIMEBASE  ARRAY_SIZE(timebases)
@@ -189,7 +192,7 @@ static const struct rigol_ds_series supported_series[] = {
 	[DS1000] = {VENDOR(RIGOL), "DS1000", PROTOCOL_V2, FORMAT_IEEE488_2,
 		{50, 1}, {2, 1000}, 12, 600, 1048576},
 	[DS2000] = {VENDOR(RIGOL), "DS2000", PROTOCOL_V3, FORMAT_IEEE488_2,
-		{500, 1}, {2, 1000}, 14, 1400, 14000},
+		{500, 1}, {500, 1000000}, 14, 1400, 14000},
 	[DS2000A] = {VENDOR(RIGOL), "DS2000A", PROTOCOL_V3, FORMAT_IEEE488_2,
 		{1000, 1}, {500, 1000000}, 14, 1400, 14000},
 	[DSO1000] = {VENDOR(AGILENT), "DSO1000", PROTOCOL_V3, FORMAT_IEEE488_2,
@@ -342,8 +345,7 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
 	for (i = 0; i < model->analog_channels; i++) {
 		if (!(channel_name = g_strdup_printf("CH%d", i + 1)))
 			return NULL;
-		ch = sr_channel_new(i, SR_CHANNEL_ANALOG, TRUE, channel_name);
-		sdi->channels = g_slist_append(sdi->channels, ch);
+		ch = sr_channel_new(sdi, i, SR_CHANNEL_ANALOG, TRUE, channel_name);
 
 		devc->analog_groups[i] = g_malloc0(sizeof(struct sr_channel_group));
 
@@ -359,11 +361,8 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
 		for (i = 0; i < ARRAY_SIZE(devc->digital_channels); i++) {
 			if (!(channel_name = g_strdup_printf("D%d", i)))
 				return NULL;
-			ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE, channel_name);
+			ch = sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE, channel_name);
 			g_free(channel_name);
-			if (!ch)
-				return NULL;
-			sdi->channels = g_slist_append(sdi->channels, ch);
 			devc->digital_group->channels = g_slist_append(
 					devc->digital_group->channels, ch);
 		}
@@ -380,8 +379,10 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
 	}
 
 	for (i = 0; i < NUM_VDIV; i++)
-		if (!memcmp(&devc->model->series->min_vdiv, &vdivs[i], sizeof(uint64_t[2])))
+		if (!memcmp(&devc->model->series->min_vdiv, &vdivs[i], sizeof(uint64_t[2]))) {
 			devc->vdivs = &vdivs[i];
+			devc->num_vdivs = NUM_VDIV - i;
+		}
 
 	if (!(devc->buffer = g_try_malloc(ACQ_BUFFER_SIZE)))
 		return NULL;
@@ -407,13 +408,18 @@ static GSList *dev_list(void)
 
 static int dev_open(struct sr_dev_inst *sdi)
 {
+	int ret;
 	struct sr_scpi_dev_inst *scpi = sdi->conn;
 
-	if (sr_scpi_open(scpi) < 0)
+	if ((ret = sr_scpi_open(scpi)) < 0) {
+		sr_err("Failed to open SCPI device: %s.", sr_strerror(ret));
 		return SR_ERR;
+	}
 
-	if (rigol_ds_get_dev_cfg(sdi) != SR_OK)
+	if ((ret = rigol_ds_get_dev_cfg(sdi)) < 0) {
+		sr_err("Failed to get device config: %s.", sr_strerror(ret));
 		return SR_ERR;
+	}
 
 	sdi->status = SR_ST_ACTIVE;
 
@@ -496,7 +502,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 	const char *tmp_str;
 	uint64_t samplerate;
 	int analog_channel = -1;
-	float smallest_diff = 0.0000000001;
+	float smallest_diff = INFINITY;
 	int idx = -1;
 	unsigned i;
 
@@ -521,11 +527,12 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 	}
 
 	switch (key) {
-	case SR_CONF_NUM_TIMEBASE:
+	case SR_CONF_NUM_HDIV:
 		*data = g_variant_new_int32(devc->model->series->num_horizontal_divs);
 		break;
 	case SR_CONF_NUM_VDIV:
-		*data = g_variant_new_int32(NUM_VDIV);
+		*data = g_variant_new_int32(devc->num_vdivs);
+		break;
 	case SR_CONF_DATA_SOURCE:
 		if (devc->data_source == DATA_SOURCE_LIVE)
 			*data = g_variant_new_string("Live");
@@ -540,6 +547,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 				(devc->timebase * devc->model->series->num_horizontal_divs);
 			*data = g_variant_new_uint64(samplerate);
 		} else {
+			sr_dbg("Unknown data source: %d.", devc->data_source);
 			return SR_ERR_NA;
 		}
 		break;
@@ -559,12 +567,14 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 		*data = g_variant_new_string(tmp_str);
 		break;
 	case SR_CONF_TRIGGER_SLOPE:
-		if (!strcmp(devc->trigger_slope, "POS"))
+		if (!strncmp(devc->trigger_slope, "POS", 3)) {
 			tmp_str = "r";
-		else if (!strcmp(devc->trigger_slope, "NEG"))
+		} else if (!strncmp(devc->trigger_slope, "NEG", 3)) {
 			tmp_str = "f";
-		else
+		} else {
+			sr_dbg("Unknown trigger slope: '%s'.", devc->trigger_slope);
 			return SR_ERR_NA;
+		}
 		*data = g_variant_new_string(tmp_str);
 		break;
 	case SR_CONF_TIMEBASE:
@@ -576,14 +586,18 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 				idx = i;
 			}
 		}
-		if (idx < 0)
+		if (idx < 0) {
+			sr_dbg("Negative timebase index: %d.", idx);
 			return SR_ERR_NA;
+		}
 		*data = g_variant_new("(tt)", devc->timebases[idx][0],
 		                              devc->timebases[idx][1]);
 		break;
 	case SR_CONF_VDIV:
-		if (analog_channel < 0)
+		if (analog_channel < 0) {
+			sr_dbg("Negative analog channel: %d.", analog_channel);
 			return SR_ERR_NA;
+		}
 		for (i = 0; i < ARRAY_SIZE(vdivs); i++) {
 			float vdiv = (float)vdivs[i][0] / vdivs[i][1];
 			float diff = fabs(devc->vdiv[analog_channel] - vdiv);
@@ -592,16 +606,21 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 				idx = i;
 			}
 		}
-		if (idx < 0)
+		if (idx < 0) {
+			sr_dbg("Negative vdiv index: %d.", idx);
 			return SR_ERR_NA;
+		}
 		*data = g_variant_new("(tt)", vdivs[idx][0], vdivs[idx][1]);
 		break;
 	case SR_CONF_COUPLING:
-		if (analog_channel < 0)
+		if (analog_channel < 0) {
+			sr_dbg("Negative analog channel: %d.", analog_channel);
 			return SR_ERR_NA;
+		}
 		*data = g_variant_new_string(devc->coupling[analog_channel]);
 		break;
 	default:
+		sr_dbg("Tried to get unknown config key: %d.", key);
 		return SR_ERR_NA;
 	}
 
@@ -639,8 +658,11 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 	case SR_CONF_TRIGGER_SLOPE:
 		tmp_str = g_variant_get_string(data, NULL);
 
-		if (!tmp_str || !(tmp_str[0] == 'f' || tmp_str[0] == 'r'))
+		if (!tmp_str || !(tmp_str[0] == 'f' || tmp_str[0] == 'r')) {
+			sr_err("Unknown trigger slope: '%s'.",
+			       (tmp_str) ? tmp_str : "NULL");
 			return SR_ERR_ARG;
+		}
 
 		g_free(devc->trigger_slope);
 		devc->trigger_slope = g_strdup((tmp_str[0] == 'r') ? "POS" : "NEG");
@@ -648,8 +670,10 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 		break;
 	case SR_CONF_HORIZ_TRIGGERPOS:
 		t_dbl = g_variant_get_double(data);
-		if (t_dbl < 0.0 || t_dbl > 1.0)
+		if (t_dbl < 0.0 || t_dbl > 1.0) {
+			sr_err("Invalid horiz. trigger position: %g.", t_dbl);
 			return SR_ERR;
+		}
 		devc->horiz_triggerpos = t_dbl;
 		/* We have the trigger offset as a percentage of the frame, but
 		 * need to express this in seconds. */
@@ -668,8 +692,10 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 				break;
 			}
 		}
-		if (i == devc->num_timebases)
+		if (i == devc->num_timebases) {
+			sr_err("Invalid timebase index: %d.", i);
 			ret = SR_ERR_ARG;
+		}
 		break;
 	case SR_CONF_TRIGGER_SOURCE:
 		tmp_str = g_variant_get_string(data, NULL);
@@ -693,8 +719,10 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 				break;
 			}
 		}
-		if (i == ARRAY_SIZE(trigger_sources))
+		if (i == ARRAY_SIZE(trigger_sources)) {
+			sr_err("Invalid trigger source index: %d.", i);
 			ret = SR_ERR_ARG;
+		}
 		break;
 	case SR_CONF_VDIV:
 		if (!cg) {
@@ -713,9 +741,11 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 					return rigol_ds_config_set(sdi, ":CHAN%d:SCAL %s", i + 1,
 							buffer);
 				}
+				sr_err("Invalid vdiv index: %d.", j);
 				return SR_ERR_ARG;
 			}
 		}
+		sr_dbg("Didn't set vdiv, unknown channel(group).");
 		return SR_ERR_NA;
 	case SR_CONF_COUPLING:
 		if (!cg) {
@@ -733,9 +763,11 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 								devc->coupling[i]);
 					}
 				}
+				sr_err("Invalid coupling index: %d.", j);
 				return SR_ERR_ARG;
 			}
 		}
+		sr_dbg("Didn't set coupling, unknown channel(group).");
 		return SR_ERR_NA;
 	case SR_CONF_DATA_SOURCE:
 		tmp_str = g_variant_get_string(data, NULL);
@@ -747,10 +779,13 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 		else if (devc->model->series->protocol >= PROTOCOL_V3
 			 && !strcmp(tmp_str, "Segmented"))
 			devc->data_source = DATA_SOURCE_SEGMENTED;
-		else
+		else {
+			sr_err("Unknown data source: '%s'.", tmp_str);
 			return SR_ERR;
+		}
 		break;
 	default:
+		sr_dbg("Tried to set unknown config key: %d.", key);
 		ret = SR_ERR_NA;
 		break;
 	}
@@ -831,7 +866,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 			return SR_ERR_CHANNEL_GROUP;
 		}
 		g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
-		for (i = 0; i < NUM_VDIV; i++) {
+		for (i = 0; i < devc->num_vdivs; i++) {
 			rational[0] = g_variant_new_uint64(devc->vdivs[i][0]);
 			rational[1] = g_variant_new_uint64(devc->vdivs[i][1]);
 			tuple = g_variant_new_tuple(rational, 2);
@@ -881,6 +916,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 		}
 		break;
 	default:
+		sr_dbg("Tried to list unknown config key: %d.", key);
 		return SR_ERR_NA;
 	}