X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Foutput%2Fhex.c;h=e557eb08221d2b0cc1dc0376d79476dcc49e1d17;hb=c3d4003710edfe193de072f6032401bcba098672;hp=6c0e15d5c51fb6ec5f29daaff2a8dc04ae9021df;hpb=af7d656d37de4b8b7fc344fd557f9ae8d3238705;p=libsigrok.git
diff --git a/src/output/hex.c b/src/output/hex.c
index 6c0e15d5..e557eb08 100644
--- a/src/output/hex.c
+++ b/src/output/hex.c
@@ -17,10 +17,11 @@
* along with this program. If not, see .
*/
+#include
#include
#include
#include
-#include "libsigrok.h"
+#include
#include "libsigrok-internal.h"
#define LOG_PREFIX "output/hex"
@@ -106,7 +107,7 @@ static GString *gen_header(const struct sr_output *o)
}
header = g_string_sized_new(512);
- g_string_printf(header, "%s\n", PACKAGE_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);
@@ -179,8 +180,13 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
/* 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 nibble,
+ * plus one separator per byte. Align trigger marker
+ * to this layout.
+ */
+ offset = ctx->trigger / 4 + ctx->trigger / 8;
g_string_append_printf(*out, "T:%*s^ %d\n", offset, "", ctx->trigger);
ctx->trigger = -1;
}
@@ -235,7 +241,7 @@ static int cleanup(struct sr_output *o)
static struct sr_option options[] = {
{ "width", "Width", "Number of samples per line", NULL, NULL },
- { 0 }
+ ALL_ZERO
};
static const struct sr_option *get_options(void)
@@ -251,10 +257,11 @@ static const struct sr_option *get_options(void)
SR_PRIV struct sr_output_module output_hex = {
.id = "hex",
.name = "Hexadecimal",
- .desc = "Hexadecimal digits",
+ .desc = "Hexadecimal digits logic data",
+ .exts = (const char*[]){"txt", NULL},
+ .flags = 0,
.options = get_options,
.init = init,
.receive = receive,
.cleanup = cleanup,
};
-