X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Foutput_gnuplot.c;h=10b9c2647eea6bab64595cd6c2a77f0c5d298a29;hb=809c5f2011198a064a2e5e4028f19e63eb532ec1;hp=5ad9cc5ba54079a0a796ddaebb6672e23e29717c;hpb=9ab95e54083b62c060cddd1e2762529c762d90be;p=libsigrok.git

diff --git a/output/output_gnuplot.c b/output/output_gnuplot.c
index 5ad9cc5b..10b9c264 100644
--- a/output/output_gnuplot.c
+++ b/output/output_gnuplot.c
@@ -46,10 +46,10 @@ const char *gnuplot_header = "\
 const char *gnuplot_header_comment = "\
 # Comment: Acquisition with %d/%d probes at %s\n";
 
-static int init(struct output *o)
+static int init(struct sr_output *o)
 {
 	struct context *ctx;
-	struct probe *probe;
+	struct sr_probe *probe;
 	GSList *l;
 	uint64_t samplerate;
 	unsigned int i;
@@ -59,11 +59,11 @@ static int init(struct output *o)
 	time_t t;
 
 	if (!(ctx = calloc(1, sizeof(struct context))))
-		return SIGROK_ERR_MALLOC;
+		return SR_ERR_MALLOC;
 
 	if (!(ctx->header = calloc(1, MAX_HEADER_LEN + 1))) {
 		free(ctx);
-		return SIGROK_ERR_MALLOC;
+		return SR_ERR_MALLOC;
 	}
 
 	o->internal = ctx;
@@ -79,13 +79,13 @@ static int init(struct output *o)
 
 	num_probes = g_slist_length(o->device->probes);
 	comment[0] = '\0';
-	if (o->device->plugin) {
+	if (o->device->plugin && sr_device_has_hwcap(o->device, SR_HWCAP_SAMPLERATE)) {
 		samplerate = *((uint64_t *) o->device->plugin->get_device_info(
-				o->device->plugin_index, DI_CUR_SAMPLERATE));
-		if (!(frequency_s = sigrok_samplerate_string(samplerate))) {
+				o->device->plugin_index, SR_DI_CUR_SAMPLERATE));
+		if (!(frequency_s = sr_samplerate_string(samplerate))) {
 			free(ctx->header);
 			free(ctx);
-			return SIGROK_ERR;
+			return SR_ERR;
 		}
 		snprintf(comment, 127, gnuplot_header_comment,
 			ctx->num_enabled_probes, num_probes, frequency_s);
@@ -99,10 +99,10 @@ static int init(struct output *o)
 		sprintf(c, "# %d\t\t%s\n", i + 1, ctx->probelist[i]);
 	}
 
-	if (!(frequency_s = sigrok_period_string(samplerate))) {
+	if (!(frequency_s = sr_period_string(samplerate))) {
 		free(ctx->header);
 		free(ctx);
-		return SIGROK_ERR;
+		return SR_ERR;
 	}
 	t = time(NULL);
 	b = snprintf(ctx->header, MAX_HEADER_LEN, gnuplot_header,
@@ -113,23 +113,23 @@ static int init(struct output *o)
 	if (b < 0) {
 		free(ctx->header);
 		free(ctx);
-		return SIGROK_ERR;
+		return SR_ERR;
 	}
 
 	return 0;
 }
 
-static int event(struct output *o, int event_type, char **data_out,
+static int event(struct sr_output *o, int event_type, char **data_out,
 		 uint64_t *length_out)
 {
 	struct context *ctx;
 
 	ctx = o->internal;
 	switch (event_type) {
-	case DF_TRIGGER:
+	case SR_DF_TRIGGER:
 		/* TODO: can a trigger mark be in a gnuplot data file? */
 		break;
-	case DF_END:
+	case SR_DF_END:
 		free(o->internal);
 		o->internal = NULL;
 		break;
@@ -138,10 +138,10 @@ static int event(struct output *o, int event_type, char **data_out,
 	*data_out = NULL;
 	*length_out = 0;
 
-	return SIGROK_OK;
+	return SR_OK;
 }
 
-static int data(struct output *o, char *data_in, uint64_t length_in,
+static int data(struct sr_output *o, char *data_in, uint64_t length_in,
 		char **data_out, uint64_t *length_out)
 {
 	struct context *ctx;
@@ -157,7 +157,7 @@ static int data(struct output *o, char *data_in, uint64_t length_in,
 		outsize += strlen(ctx->header);
 
 	if (!(outbuf = calloc(1, outsize)))
-		return SIGROK_ERR_MALLOC;
+		return SR_ERR_MALLOC;
 
 	outbuf[0] = '\0';
 	if (ctx->header) {
@@ -188,14 +188,161 @@ static int data(struct output *o, char *data_in, uint64_t length_in,
 	*data_out = outbuf;
 	*length_out = strlen(outbuf);
 
-	return SIGROK_OK;
+	return SR_OK;
 }
 
-struct output_format output_gnuplot = {
+struct sr_output_format output_gnuplot = {
 	"gnuplot",
 	"Gnuplot",
-	DF_LOGIC,
+	SR_DF_LOGIC,
 	init,
 	data,
 	event,
 };
+
+/* Temporarily disabled. */
+#if 0
+static int analog_init(struct sr_output *o)
+{
+	struct context *ctx;
+	struct sr_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 SR_ERR_MALLOC;
+
+	if (!(ctx->header = calloc(1, MAX_HEADER_LEN + 1))) {
+		free(ctx);
+		return SR_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 sr_analog_sample) +
+			(ctx->num_enabled_probes * sizeof(struct sr_analog_probe));
+
+	num_probes = g_slist_length(o->device->probes);
+	comment[0] = '\0';
+	if (o->device->plugin && sr_device_has_hwcap(o->device, SR_HWCAP_SAMPLERATE)) {
+		samplerate = *((uint64_t *) o->device->plugin->get_device_info(
+				o->device->plugin_index, SR_DI_CUR_SAMPLERATE));
+		if (!(frequency_s = sr_samplerate_string(samplerate))) {
+			free(ctx->header);
+			free(ctx);
+			return SR_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 = sr_period_string(samplerate))) {
+		free(ctx->header);
+		free(ctx);
+		return SR_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 SR_ERR;
+	}
+
+	return 0;
+}
+
+static int analog_data(struct sr_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 sr_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 SR_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 sr_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))));
+		}
+
+		c = outbuf + strlen(outbuf);
+		sprintf(c, "\n");
+	}
+
+	*data_out = outbuf;
+	*length_out = strlen(outbuf);
+
+	return SR_OK;
+}
+
+struct sr_output_format output_analog_gnuplot = {
+	"analog_gnuplot",
+	"Gnuplot analog",
+	SR_DF_ANALOG,
+	analog_init,
+	analog_data,
+	event,
+};
+#endif