X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Frigol-ds%2Fapi.c;h=01914ff85c61d3f4e7c3abc628aed86ca66c923e;hb=19f31c8acec775a35482328f517cb08dc66c4d66;hp=0146f3a0b3bcaa63e748092bfa08663e8bb6d2e3;hpb=c4a46475a64c18eabc7f1d039045c7e03ccb0d01;p=libsigrok.git

diff --git a/src/hardware/rigol-ds/api.c b/src/hardware/rigol-ds/api.c
index 0146f3a0..01914ff8 100644
--- a/src/hardware/rigol-ds/api.c
+++ b/src/hardware/rigol-ds/api.c
@@ -275,6 +275,7 @@ static const struct rigol_ds_model supported_models[] = {
 	{SERIES(DS1000Z), "DS1104Z-S", {5, 1000000000}, CH_INFO(4, false), std_cmd},
 	{SERIES(DS1000Z), "DS1074Z Plus", {5, 1000000000}, CH_INFO(4, false), std_cmd},
 	{SERIES(DS1000Z), "DS1104Z Plus", {5, 1000000000}, CH_INFO(4, false), std_cmd},
+	{SERIES(DS1000Z), "DS1202Z-E", {2, 1000000000}, CH_INFO(2, false), std_cmd},
 	{SERIES(DS1000Z), "MSO1074Z", {5, 1000000000}, CH_INFO(4, true), std_cmd},
 	{SERIES(DS1000Z), "MSO1104Z", {5, 1000000000}, CH_INFO(4, true), std_cmd},
 	{SERIES(DS1000Z), "MSO1074Z-S", {5, 1000000000}, CH_INFO(4, true), std_cmd},
@@ -499,6 +500,7 @@ static int analog_frame_size(const struct sr_dev_inst *sdi)
 	case DATA_SOURCE_LIVE:
 		return devc->model->series->live_samples;
 	case DATA_SOURCE_MEMORY:
+	case DATA_SOURCE_SEGMENTED:
 		return devc->model->series->buffer_samples / analog_channels;
 	default:
 		return 0;
@@ -513,6 +515,7 @@ static int digital_frame_size(const struct sr_dev_inst *sdi)
 	case DATA_SOURCE_LIVE:
 		return devc->model->series->live_samples * 2;
 	case DATA_SOURCE_MEMORY:
+	case DATA_SOURCE_SEGMENTED:
 		return devc->model->series->buffer_samples * 2;
 	default:
 		return 0;
@@ -525,7 +528,6 @@ static int config_get(uint32_t key, GVariant **data,
 	struct dev_context *devc;
 	struct sr_channel *ch;
 	const char *tmp_str;
-	uint64_t samplerate;
 	int analog_channel = -1;
 	float smallest_diff = INFINITY;
 	int idx = -1;
@@ -569,14 +571,7 @@ static int config_get(uint32_t key, GVariant **data,
 			*data = g_variant_new_string("Segmented");
 		break;
 	case SR_CONF_SAMPLERATE:
-		if (devc->data_source == DATA_SOURCE_LIVE) {
-			samplerate = analog_frame_size(sdi) /
-				(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;
-		}
+		*data = g_variant_new_uint64(devc->sample_rate);
 		break;
 	case SR_CONF_TRIGGER_SOURCE:
 		if (!strcmp(devc->trigger_source, "ACL"))
@@ -878,7 +873,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	struct sr_scpi_dev_inst *scpi;
 	struct dev_context *devc;
 	struct sr_channel *ch;
-	struct sr_datafeed_packet packet;
 	gboolean some_digital;
 	GSList *l;
 	char *cmd;
@@ -887,6 +881,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	devc = sdi->priv;
 
 	devc->num_frames = 0;
+	devc->num_frames_segmented = 0;
 
 	some_digital = FALSE;
 	for (l = sdi->channels; l; l = l->next) {
@@ -951,8 +946,28 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
 	/* Set memory mode. */
 	if (devc->data_source == DATA_SOURCE_SEGMENTED) {
-		sr_err("Data source 'Segmented' not yet supported");
-		return SR_ERR;
+		switch (devc->model->series->protocol) {
+		case PROTOCOL_V4:
+		{
+			int frames = 0;
+			sr_scpi_get_int(sdi->conn, "FUNC:WREP:FEND?", &frames);
+			if (frames <= 0) {
+				sr_err("No segmented data available");
+				return SR_ERR;
+			}
+			devc->num_frames_segmented = frames;
+			break;
+		}
+		case PROTOCOL_V5:
+			/* The frame limit has to be read on the fly, just set up
+			 * reading of the first frame */
+			if (rigol_ds_config_set(sdi, "REC:CURR 1") != SR_OK)
+				return SR_ERR;
+			break;
+		default:
+			sr_err("Data source 'Segmented' not yet supported");
+			return SR_ERR;
+		}
 	}
 
 	devc->analog_frame_size = analog_frame_size(sdi);
@@ -990,12 +1005,25 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
 	devc->channel_entry = devc->enabled_channels;
 
+	if (devc->data_source == DATA_SOURCE_LIVE)
+		devc->sample_rate = analog_frame_size(sdi) / 
+			(devc->timebase * devc->model->series->num_horizontal_divs);
+	else {
+		float xinc;
+		if (devc->model->series->protocol >= PROTOCOL_V3 && 
+				sr_scpi_get_float(sdi->conn, "WAV:XINC?", &xinc) != SR_OK) {
+			sr_err("Couldn't get sampling rate");
+			return SR_ERR;
+		}
+		devc->sample_rate = 1. / xinc;
+	}
+
+
 	if (rigol_ds_capture_start(sdi) != SR_OK)
 		return SR_ERR;
 
 	/* Start of first frame. */
-	packet.type = SR_DF_FRAME_BEGIN;
-	sr_session_send(sdi, &packet);
+	std_session_send_df_frame_begin(sdi);
 
 	return SR_OK;
 }