X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Foutput%2Fascii.c;h=c956b075159df16d82658e683d80a29df3d9923f;hb=2868bca35b321ad922326a213146c648ffa3410e;hp=cc67bd9e95cbb23f3771e1893f9655bb28896d47;hpb=6ec6c43b4738dbc7091f4a49a4ec80ea6102cb52;p=libsigrok.git

diff --git a/src/output/ascii.c b/src/output/ascii.c
index cc67bd9e..c956b075 100644
--- a/src/output/ascii.c
+++ b/src/output/ascii.c
@@ -29,6 +29,13 @@
 
 #define DEFAULT_SAMPLES_PER_LINE 74
 
+/*
+ * The string looks ugly with escape characters, here is the readable
+ * version: Use . and " for low and high bits, use \ and / to draw
+ * falling and rising edges respectively.
+ */
+#define DEFAULT_ASCII_CHARS ".\"\\/"
+
 struct context {
 	unsigned int num_enabled_channels;
 	int spl;
@@ -43,6 +50,8 @@ struct context {
 	gboolean header_done;
 	GString **lines;
 	GString *header;
+	const char *charset;
+	gboolean edges;
 };
 
 static int init(struct sr_output *o, GHashTable *options)
@@ -59,6 +68,13 @@ static int init(struct sr_output *o, GHashTable *options)
 	o->priv = ctx;
 	ctx->trigger = -1;
 	ctx->spl = g_variant_get_uint32(g_hash_table_lookup(options, "width"));
+	ctx->charset = g_strdup(g_variant_get_string(
+		g_hash_table_lookup(options, "charset"), NULL));
+	if (!ctx->charset || strlen(ctx->charset) < 2) {
+		g_free((gpointer)ctx->charset);
+		ctx->charset = g_strdup(DEFAULT_ASCII_CHARS);
+	}
+	ctx->edges = (strlen(ctx->charset) >= 4) ? TRUE : FALSE;
 
 	for (l = o->sdi->channels; l; l = l->next) {
 		ch = l->data;
@@ -108,7 +124,7 @@ static GString *gen_header(const struct sr_output *o)
 	}
 
 	header = g_string_sized_new(512);
-	g_string_printf(header, "%s %s\n", PACKAGE_NAME, SR_PACKAGE_VERSION_STRING);
+	g_string_printf(header, "%s %s\n", PACKAGE_NAME, sr_package_version_string_get());
 	num_channels = g_slist_length(o->sdi->channels);
 	g_string_append_printf(header, "Acquisition with %d/%d channels",
 			ctx->num_enabled_channels, num_channels);
@@ -133,6 +149,7 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
 	int idx, offset, curbit, prevbit;
 	uint64_t i, j;
 	gchar *p, c;
+	size_t charidx;
 
 	*out = NULL;
 	if (!o || !o->sdi)
@@ -169,21 +186,25 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
 				curbit = *p & (1 << (idx % 8));
 				prevbit = (ctx->prev_sample[idx / 8] & ((uint8_t) 1 << (idx % 8)));
 
-				c = curbit ? '"' : '.';
-				if (ctx->spl_cnt > 1) {
-					if (curbit < prevbit)
-						c = '\\';
-					else if (curbit > prevbit)
-						c = '/';
+				charidx = curbit ? 1 : 0;
+				if (ctx->edges && ctx->spl_cnt > 1) {
+					if (curbit != prevbit)
+						charidx += 2;
 				}
+				c = ctx->charset[charidx];
 				g_string_append_c(ctx->lines[j], c);
 
 				if (ctx->spl_cnt == ctx->spl) {
 					/* Flush line buffers. */
 					g_string_append_len(*out, ctx->lines[j]->str, ctx->lines[j]->len);
 					g_string_append_c(*out, '\n');
-					if (j == ctx->num_enabled_channels  - 1 && ctx->trigger > -1) {
-						offset = ctx->trigger + ctx->trigger / 8;
+					if (j == ctx->num_enabled_channels - 1 && ctx->trigger > -1) {
+						/*
+						 * Sample data lines have one character per bit and
+						 * no separator between bytes. Align trigger marker
+						 * to this layout.
+						 */
+						offset = ctx->trigger;
 						g_string_append_printf(*out, "T:%*s^ %d\n", offset, "", ctx->trigger);
 						ctx->trigger = -1;
 					}
@@ -228,6 +249,7 @@ static int cleanup(struct sr_output *o)
 	for (i = 0; i < ctx->num_enabled_channels; i++)
 		g_string_free(ctx->lines[i], TRUE);
 	g_free(ctx->lines);
+	g_free((gpointer)ctx->charset);
 	g_free(ctx);
 	o->priv = NULL;
 
@@ -236,6 +258,7 @@ static int cleanup(struct sr_output *o)
 
 static struct sr_option options[] = {
 	{ "width", "Width", "Number of samples per line", NULL, NULL },
+	{ "charset", "Charset", "Characters for 0/1 bits (and fall/rise edges)", NULL, NULL },
 	ALL_ZERO
 };
 
@@ -244,6 +267,8 @@ static const struct sr_option *get_options(void)
 	if (!options[0].def) {
 		options[0].def = g_variant_new_uint32(DEFAULT_SAMPLES_PER_LINE);
 		g_variant_ref_sink(options[0].def);
+		options[1].def = g_variant_new_string(DEFAULT_ASCII_CHARS);
+		g_variant_ref_sink(options[1].def);
 	}
 
 	return options;
@@ -252,7 +277,7 @@ static const struct sr_option *get_options(void)
 SR_PRIV struct sr_output_module output_ascii = {
 	.id = "ascii",
 	.name = "ASCII",
-	.desc = "ASCII art",
+	.desc = "ASCII art logic data",
 	.exts = (const char*[]){"txt", NULL},
 	.flags = 0,
 	.options = get_options,