X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Foutput_gnuplot.c;h=f7027626a2e4736a598af172fc9ab1966a8e4242;hb=81bbdf6a6a2a8651e3c1ab3a7f714a851da77141;hp=e79bd9f566de00e285b3cb185dff5939e99bfc68;hpb=25e7d9b115e5ea08be2d92ffe286aa1bf95778f4;p=libsigrok.git

diff --git a/output/output_gnuplot.c b/output/output_gnuplot.c
index e79bd9f5..f7027626 100644
--- a/output/output_gnuplot.c
+++ b/output/output_gnuplot.c
@@ -25,76 +25,96 @@
 #include "config.h"
 
 struct context {
-	int num_enabled_probes;
-	int unitsize;
-	char *probelist[65];
+	unsigned int num_enabled_probes;
+	unsigned int unitsize;
+	char *probelist[MAX_NUM_PROBES+1];
 	char *header;
 };
 
+#define MAX_HEADER_LEN   1024 + (MAX_NUM_PROBES * (MAX_PROBENAME_LEN + 10))
 const char *gnuplot_header = "\
 # Sample data in space-separated columns format usable by gnuplot\n\
 #\n\
-# Generated by: %s on %s\n\
-# Comment: Acquisition with %d/%d probes at %s\n\
-# Timescale: %d %s\n\
-# Column assignment:\n%s\n";
+# Generated by: %s on %s%s\
+# Period: %s\n\
+#\n\
+# Column\tProbe\n\
+# -------------------------------------\
+----------------------------------------\n\
+# 0\t\tSample counter (for internal gnuplot purposes)\n%s\n";
+
+const char *gnuplot_header_comment = "\
+# Comment: Acquisition with %d/%d probes at %s\n";
 
 static int init(struct output *o)
 {
-/* Maximum header length */
-#define MAX_HEADER_LEN 2048
-
 	struct context *ctx;
 	struct probe *probe;
 	GSList *l;
 	uint64_t samplerate;
-	int i, b, num_probes;
-	char *c, *samplerate_s;
-	char wbuf[1000];
+	unsigned int i;
+	int b, num_probes;
+	char *c, *frequency_s;
+	char wbuf[1000], comment[128];
+	time_t t;
 
-	ctx = malloc(sizeof(struct context));
-	if (ctx == NULL)
+	if (!(ctx = calloc(1, sizeof(struct context))))
 		return SIGROK_ERR_MALLOC;
+
+	if (!(ctx->header = calloc(1, MAX_HEADER_LEN + 1))) {
+		free(ctx);
+		return SIGROK_ERR_MALLOC;
+	}
+
 	o->internal = ctx;
 	ctx->num_enabled_probes = 0;
 	for (l = o->device->probes; l; l = l->next) {
 		probe = l->data;
-		if (probe->enabled)
-			ctx->probelist[ctx->num_enabled_probes++] = probe->name;
+		if (!probe->enabled)
+			continue;
+		ctx->probelist[ctx->num_enabled_probes++] = probe->name;
 	}
-
 	ctx->probelist[ctx->num_enabled_probes] = 0;
 	ctx->unitsize = (ctx->num_enabled_probes + 7) / 8;
 
-	/* TODO: Allow for configuration via o->param. */
-
-	ctx->header = calloc(1, MAX_HEADER_LEN + 1);
-	if (ctx->header == NULL)
-		return SIGROK_ERR_MALLOC;
 	num_probes = g_slist_length(o->device->probes);
-	/* TODO: Handle num_probes == 0, too many probes, etc. */
-	samplerate = *((uint64_t *) o->device->plugin->get_device_info(
-			o->device->plugin_index, DI_CUR_SAMPLERATE));
-  
-	if ((samplerate_s = sigrok_samplerate_string(samplerate)) == NULL)
-		return -1; // FIXME
+	comment[0] = '\0';
+	if (o->device->plugin) {
+		samplerate = *((uint64_t *) o->device->plugin->get_device_info(
+				o->device->plugin_index, DI_CUR_SAMPLERATE));
+		if (!(frequency_s = sigrok_samplerate_string(samplerate))) {
+			free(ctx->header);
+			free(ctx);
+			return SIGROK_ERR;
+		}
+		snprintf(comment, 127, gnuplot_header_comment,
+			ctx->num_enabled_probes, num_probes, frequency_s);
+		free(frequency_s);
+	}
 
 	/* Columns / channels */
 	wbuf[0] = '\0';
 	for (i = 0; i < ctx->num_enabled_probes; i++) {
 		c = (char *)&wbuf + strlen((char *)&wbuf);
-		sprintf(c, "# Column %d: channel %s\n", i, ctx->probelist[i]);
+		sprintf(c, "# %d\t\t%s\n", i + 1, ctx->probelist[i]);
 	}
 
-	/* TODO: date: File or signals? Make y/n configurable. */
-	/* TODO: Timescale */
+	if (!(frequency_s = sigrok_period_string(samplerate))) {
+		free(ctx->header);
+		free(ctx);
+		return SIGROK_ERR;
+	}
+	t = time(NULL);
 	b = snprintf(ctx->header, MAX_HEADER_LEN, gnuplot_header,
-		     PACKAGE_STRING, "TODO", ctx->num_enabled_probes,
-		     num_probes, samplerate_s, 1, "ns", (char *)&wbuf);
-
-	free(samplerate_s);
+		     PACKAGE_STRING, ctime(&t), comment, frequency_s,
+		     (char *)&wbuf);
+	free(frequency_s);
 
-	/* TODO: Handle snprintf errors. */
+	if (b < 0) {
+		free(ctx->header);
+		free(ctx);
+		return SIGROK_ERR;
+	}
 
 	return 0;
 }
@@ -103,24 +123,21 @@ static int event(struct output *o, int event_type, char **data_out,
 		 uint64_t *length_out)
 {
 	struct context *ctx;
-	char *outbuf;
-	int outlen = 1; /* FIXME */
 
 	ctx = o->internal;
-	switch(event_type) {
+	switch (event_type) {
 	case DF_TRIGGER:
+		/* TODO: can a trigger mark be in a gnuplot data file? */
 		break;
 	case DF_END:
-		outbuf = calloc(1, 1); // FIXME
-		if (outbuf == NULL)
-			return SIGROK_ERR_MALLOC;
-		*data_out = outbuf;
-		*length_out = outlen;
 		free(o->internal);
 		o->internal = NULL;
 		break;
 	}
 
+	*data_out = NULL;
+	*length_out = 0;
+
 	return SIGROK_OK;
 }
 
@@ -128,45 +145,179 @@ static int data(struct output *o, char *data_in, uint64_t length_in,
 		char **data_out, uint64_t *length_out)
 {
 	struct context *ctx;
-	int offset, outsize, p, curbit;
-	uint64_t sample, count = 0;
+	unsigned int max_linelen, outsize, p, curbit, i;
+	uint64_t sample;
+	static uint64_t samplecount = 0;
 	char *outbuf, *c;
 
 	ctx = o->internal;
-	outsize = strlen(ctx->header);
-	outbuf = calloc(1, outsize + 1 + 10000); // FIXME: Use realloc().
-	if (outbuf == NULL)
+	max_linelen = 16 + ctx->num_enabled_probes * 2;
+	outsize = length_in / ctx->unitsize * max_linelen;
+	if (ctx->header)
+		outsize += strlen(ctx->header);
+
+	if (!(outbuf = calloc(1, outsize)))
 		return SIGROK_ERR_MALLOC;
+
+	outbuf[0] = '\0';
 	if (ctx->header) {
 		/* The header is still here, this must be the first packet. */
 		strncpy(outbuf, ctx->header, outsize);
 		free(ctx->header);
 		ctx->header = NULL;
-	} else {
-		outbuf[0] = 0;
 	}
 
-	/* TODO: Are disabled probes handled correctly? */
-
-	for (offset = 0; offset <= length_in - ctx->unitsize;
-						offset += ctx->unitsize) {
-		memcpy(&sample, data_in + offset, ctx->unitsize);
+	for (i = 0; i <= length_in - ctx->unitsize; i += ctx->unitsize) {
+		memcpy(&sample, data_in + i, ctx->unitsize);
 
 		/* The first column is a counter (needed for gnuplot). */
 		c = outbuf + strlen(outbuf);
-		sprintf(c, "%"PRIu64"\t\t", count++);
+		sprintf(c, "%" PRIu64 "\t", samplecount++);
 
 		/* The next columns are the values of all channels. */
 		for (p = 0; p < ctx->num_enabled_probes; p++) {
-			curbit = (sample & ((uint64_t) (1 << p))) != 0;
+			curbit = (sample & ((uint64_t) (1 << p))) >> p;
 			c = outbuf + strlen(outbuf);
 			sprintf(c, "%d ", curbit);
 		}
 
 		c = outbuf + strlen(outbuf);
 		sprintf(c, "\n");
+	}
+
+	*data_out = outbuf;
+	*length_out = strlen(outbuf);
+
+	return SIGROK_OK;
+}
+
+static int analog_init(struct output *o)
+{
+	struct context *ctx;
+	struct probe *probe;
+	GSList *l;
+	uint64_t samplerate;
+	unsigned int i;
+	int b, num_probes;
+	char *c, *frequency_s;
+	char wbuf[1000], comment[128];
+	time_t t;
+
+	if (!(ctx = calloc(1, sizeof(struct context))))
+		return SIGROK_ERR_MALLOC;
+
+	if (!(ctx->header = calloc(1, MAX_HEADER_LEN + 1))) {
+		free(ctx);
+		return SIGROK_ERR_MALLOC;
+	}
+
+	o->internal = ctx;
+	ctx->num_enabled_probes = 0;
+	for (l = o->device->probes; l; l = l->next) {
+		probe = l->data;
+		if (!probe->enabled)
+			continue;
+		ctx->probelist[ctx->num_enabled_probes++] = probe->name;
+	}
+	ctx->probelist[ctx->num_enabled_probes] = 0;
+//	ctx->unitsize = (ctx->num_enabled_probes + 7) / 8;
+	ctx->unitsize = sizeof(struct analog_sample) +
+			(ctx->num_enabled_probes * sizeof(struct analog_probe));
+
+	num_probes = g_slist_length(o->device->probes);
+	comment[0] = '\0';
+	if (o->device->plugin) {
+		samplerate = *((uint64_t *) o->device->plugin->get_device_info(
+				o->device->plugin_index, DI_CUR_SAMPLERATE));
+		if (!(frequency_s = sigrok_samplerate_string(samplerate))) {
+			free(ctx->header);
+			free(ctx);
+			return SIGROK_ERR;
+		}
+		snprintf(comment, 127, gnuplot_header_comment,
+			ctx->num_enabled_probes, num_probes, frequency_s);
+		free(frequency_s);
+	}
+
+	/* Columns / channels */
+	wbuf[0] = '\0';
+	for (i = 0; i < ctx->num_enabled_probes; i++) {
+		c = (char *)&wbuf + strlen((char *)&wbuf);
+		sprintf(c, "# %d\t\t%s\n", i + 1, ctx->probelist[i]);
+	}
+
+	if (!(frequency_s = sigrok_period_string(samplerate))) {
+		free(ctx->header);
+		free(ctx);
+		return SIGROK_ERR;
+	}
+	t = time(NULL);
+	b = snprintf(ctx->header, MAX_HEADER_LEN, gnuplot_header,
+		     PACKAGE_STRING, ctime(&t), comment, frequency_s,
+		     (char *)&wbuf);
+	free(frequency_s);
+
+	if (b < 0) {
+		free(ctx->header);
+		free(ctx);
+		return SIGROK_ERR;
+	}
+
+	return 0;
+}
+
+static int analog_data(struct output *o, char *data_in, uint64_t length_in,
+		char **data_out, uint64_t *length_out)
+{
+	struct context *ctx;
+	unsigned int max_linelen, outsize, p, curbit, i;
+//	uint64_t sample;
+	static uint64_t samplecount = 0;
+	char *outbuf, *c;
+	struct analog_sample *sample;
+
+	ctx = o->internal;
+//	max_linelen = 16 + ctx->num_enabled_probes * 2;
+	max_linelen = 16 + ctx->num_enabled_probes * 30;
+	outsize = length_in / ctx->unitsize * max_linelen;
+	if (ctx->header)
+		outsize += strlen(ctx->header);
+
+	if (!(outbuf = calloc(1, outsize)))
+		return SIGROK_ERR_MALLOC;
+
+	outbuf[0] = '\0';
+	if (ctx->header) {
+		/* The header is still here, this must be the first packet. */
+		strncpy(outbuf, ctx->header, outsize);
+		free(ctx->header);
+		ctx->header = NULL;
+	}
+
+	for (i = 0; i <= length_in - ctx->unitsize; i += ctx->unitsize) {
+//		memcpy(&sample, data_in + i, ctx->unitsize);
+		sample = (struct analog_sample *) (data_in + i);
+
+		/* The first column is a counter (needed for gnuplot). */
+		c = outbuf + strlen(outbuf);
+		sprintf(c, "%" PRIu64 "\t", samplecount++);
+
+		/* The next columns are the values of all channels. */
+		for (p = 0; p < ctx->num_enabled_probes; p++) {
+//			curbit = (sample & ((uint64_t) (1 << p))) >> p;
+			c = outbuf + strlen(outbuf);
+//			sprintf(c, "%d ", curbit);
+			/*
+			 * FIXME: Should be doing proper raw->voltage conversion
+			 * here, casting to int16_t isn't it. Remember that if
+			 * res = 1 conversion isn't necessary.
+			 */
+			sprintf(c, "%f ", (double) ((int16_t) (sample->probes[p].val &
+					((1 << sample->probes[p].res) - 1))));
+		}
 
-		/* TODO: realloc() if strlen(outbuf) is almost "full"... */
+		c = outbuf + strlen(outbuf);
+		sprintf(c, "\n");
 	}
 
 	*data_out = outbuf;
@@ -178,7 +329,17 @@ static int data(struct output *o, char *data_in, uint64_t length_in,
 struct output_format output_gnuplot = {
 	"gnuplot",
 	"Gnuplot",
+	DF_LOGIC,
 	init,
 	data,
 	event,
 };
+
+struct output_format output_analog_gnuplot = {
+	"analog_gnuplot",
+	"Gnuplot analog",
+	DF_ANALOG,
+	analog_init,
+	analog_data,
+	event,
+};