X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fdemo%2Fdemo.c;h=433f35229cdb6f284a9c539d3a6c8da93f129977;hb=860bc59b0ff598f37f23a1882bf5822ef7c86382;hp=50bd50c844856dde3d1215c2940e917e7372cbcd;hpb=4374219bc8c26997bb5c13c57f0babe3a61cd47e;p=libsigrok.git

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index 50bd50c8..433f3522 100644
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -78,6 +78,8 @@ enum {
 	 */
 	PATTERN_SQUARE,
 	PATTERN_SINE,
+	PATTERN_TRIANGLE,
+	PATTERN_SAWTOOTH,
 };
 
 static const char *logic_pattern_str[] = {
@@ -91,6 +93,8 @@ static const char *logic_pattern_str[] = {
 static const char *analog_pattern_str[] = {
 	"square",
 	"sine",
+	"triangle",
+	"sawtooth",
 };
 
 struct analog_gen {
@@ -107,7 +111,8 @@ struct dev_context {
 	uint64_t cur_samplerate;
 	uint64_t limit_samples;
 	uint64_t limit_msec;
-	uint64_t samples_counter;
+	uint64_t logic_counter;
+	uint64_t analog_counter;
 	int64_t starttime;
 	uint64_t step;
 	/* Logic */
@@ -188,7 +193,7 @@ static void generate_analog_pattern(const struct sr_probe_group *probe_group, ui
 
 	switch (ag->pattern) {
 	case PATTERN_SQUARE:
-		value = 5.0;
+		value = ANALOG_AMPLITUDE;
 		last_end = 0;
 		for (i = 0; i < num_samples; i++) {
 			if (i % 5 == 0)
@@ -201,7 +206,7 @@ static void generate_analog_pattern(const struct sr_probe_group *probe_group, ui
 		break;
 
 	case PATTERN_SINE:
-		frequency = sample_rate / ANALOG_SAMPLES_PER_PERIOD;
+		frequency = (double) sample_rate / ANALOG_SAMPLES_PER_PERIOD;
 
 		/* Make sure the number of samples we put out is an integer
 		 * multiple of our period size */
@@ -216,6 +221,36 @@ static void generate_analog_pattern(const struct sr_probe_group *probe_group, ui
 						sin(2 * M_PI * frequency * t);
 		}
 
+		ag->num_samples = num_samples;
+		break;
+
+	case PATTERN_TRIANGLE:
+		frequency = (double) sample_rate / ANALOG_SAMPLES_PER_PERIOD;
+
+		while (num_samples % ANALOG_SAMPLES_PER_PERIOD != 0)
+			num_samples--;
+
+		for (i = 0; i < num_samples; i++) {
+			t = (double) i / (double) sample_rate;
+			ag->pattern_data[i] = (2 * ANALOG_AMPLITUDE / M_PI) *
+						asin(sin(2 * M_PI * frequency * t));
+		}
+
+		ag->num_samples = num_samples;
+		break;
+
+	case PATTERN_SAWTOOTH:
+		frequency = (double) sample_rate / ANALOG_SAMPLES_PER_PERIOD;
+
+		while (num_samples % ANALOG_SAMPLES_PER_PERIOD != 0)
+			num_samples--;
+
+		for (i = 0; i < num_samples; i++) {
+			t = (double) i / (double) sample_rate;
+			ag->pattern_data[i] = 2 * ANALOG_AMPLITUDE *
+						((t * frequency) - floor(0.5f + t * frequency));
+		}
+
 		ag->num_samples = num_samples;
 		break;
 	}
@@ -231,7 +266,7 @@ static GSList *scan(GSList *options)
 	struct sr_config *src;
 	struct analog_gen *ag;
 	GSList *devices, *l;
-	int num_logic_probes, num_analog_probes, i;
+	int num_logic_probes, num_analog_probes, pattern, i;
 	char probe_name[16];
 
 	drvc = di->priv;
@@ -288,9 +323,12 @@ static GSList *scan(GSList *options)
 	sdi->probe_groups = g_slist_append(NULL, pg);
 
 	/* Analog probes, probe groups and pattern generators. */
+
+	pattern = 0;
 	for (i = 0; i < num_analog_probes; i++) {
 		sprintf(probe_name, "A%d", i);
-		if (!(probe = sr_probe_new(i, SR_PROBE_ANALOG, TRUE, probe_name)))
+		if (!(probe = sr_probe_new(i + num_logic_probes,
+				SR_PROBE_ANALOG, TRUE, probe_name)))
 			return NULL;
 		sdi->probes = g_slist_append(sdi->probes, probe);
 
@@ -308,11 +346,14 @@ static GSList *scan(GSList *options)
 		ag->packet.mqflags = 0;
 		ag->packet.unit = SR_UNIT_VOLT;
 		ag->packet.data = ag->pattern_data;
-		ag->pattern = PATTERN_SINE;
+		ag->pattern = pattern;
 		pg->priv = ag;
 
 		sdi->probe_groups = g_slist_append(sdi->probe_groups, pg);
 		devc->analog_probe_groups = g_slist_append(devc->analog_probe_groups, pg);
+
+		if (++pattern == ARRAY_SIZE(analog_pattern_str))
+			pattern = 0;
 	}
 
 	sdi->priv = devc;
@@ -584,7 +625,7 @@ static int prepare_data(int fd, int revents, void *cb_data)
 	struct sr_probe_group *pg;
 	struct analog_gen *ag;
 	GSList *l;
-	uint64_t samples_to_send, expected_samplenum, analog_samples, sending_now;
+	uint64_t logic_todo, analog_todo, expected_samplenum, analog_samples, sending_now;
 	int64_t time, elapsed;
 
 	(void)fd;
@@ -597,20 +638,15 @@ static int prepare_data(int fd, int revents, void *cb_data)
 	time = g_get_monotonic_time();
 	elapsed = time - devc->starttime;
 	expected_samplenum = elapsed * devc->cur_samplerate / 1000000;
-	/* Of those, how many do we still have to send? */
-	samples_to_send = expected_samplenum - devc->samples_counter;
-
-	if (devc->limit_samples) {
-		samples_to_send = MIN(samples_to_send,
-				devc->limit_samples - devc->samples_counter);
-	}
 
-	while (samples_to_send > 0) {
-		sending_now = 0;
+	/* Of those, how many do we still have to send? */
+	logic_todo = MIN(expected_samplenum, devc->limit_samples) - devc->logic_counter;
+	analog_todo = MIN(expected_samplenum, devc->limit_samples) - devc->analog_counter;
 
+	while (logic_todo || analog_todo) {
 		/* Logic */
-		if (devc->num_logic_probes > 0) {
-			sending_now = MIN(samples_to_send,
+		if (devc->num_logic_probes > 0 && logic_todo > 0) {
+			sending_now = MIN(logic_todo,
 					LOGIC_BUFSIZE / devc->logic_unitsize);
 			logic_generator(sdi, sending_now * devc->logic_unitsize);
 			packet.type = SR_DF_LOGIC;
@@ -619,10 +655,12 @@ static int prepare_data(int fd, int revents, void *cb_data)
 			logic.unitsize = devc->logic_unitsize;
 			logic.data = devc->logic_data;
 			sr_session_send(sdi, &packet);
+			logic_todo -= sending_now;
+			devc->logic_counter += sending_now;
 		}
 
 		/* Analog, one probe at a time */
-		if (devc->num_analog_probes > 0) {
+		if (devc->num_analog_probes > 0 && analog_todo > 0) {
 			sending_now = 0;
 			for (l = devc->analog_probe_groups; l; l = l->next) {
 				pg = l->data;
@@ -635,21 +673,20 @@ static int prepare_data(int fd, int revents, void *cb_data)
 				 * beginning of our buffer. A ring buffer would
 				 * help here as well */
 
-				analog_samples = MIN(samples_to_send, ag->num_samples);
+				analog_samples = MIN(analog_todo, ag->num_samples);
 				/* Whichever probe group gets there first. */
 				sending_now = MAX(sending_now, analog_samples);
 				ag->packet.num_samples = analog_samples;
 				sr_session_send(sdi, &packet);
 			}
+			analog_todo -= sending_now;
+			devc->analog_counter += sending_now;
 		}
-
-		samples_to_send -= sending_now;
-		devc->samples_counter += sending_now;
 	}
 
-	if (devc->limit_samples &&
-		devc->samples_counter >= devc->limit_samples) {
-		sr_info("Requested number of samples reached.");
+	if (devc->logic_counter >= devc->limit_samples &&
+			devc->analog_counter >= devc->limit_samples) {
+		sr_dbg("Requested number of samples reached.");
 		dev_acquisition_stop(sdi, cb_data);
 		return TRUE;
 	}
@@ -665,9 +702,10 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;
 
-	/* TODO: don't start without a sample limit set */
 	devc = sdi->priv;
-	devc->samples_counter = 0;
+	if (devc->limit_samples == 0)
+		return SR_ERR;
+	devc->logic_counter = devc->analog_counter = 0;
 
 	/*
 	 * Setting two channels connected by a pipe is a remnant from when the