X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Foutput%2Fhex.c;h=67a349e5f801ba083730791cb2e648baa362e709;hb=HEAD;hp=a499e354e6aa5daaa554125fa1cc2e1e2d65c6c3;hpb=3cd4b381744eb88fd4ba32565bd408c33b431629;p=libsigrok.git

diff --git a/src/output/hex.c b/src/output/hex.c
index a499e354..e557eb08 100644
--- a/src/output/hex.c
+++ b/src/output/hex.c
@@ -17,10 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #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;
 					}
@@ -251,7 +257,7 @@ 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,