output: fixup trigger marker position in ascii/bits/hex output modules

[libsigrok.git] / src / output / hex.c

diff --git a/src/output/hex.c b/src/output/hex.c
index bad607513f653f385352faf954f7cb8903951521..89111446c65001c503329796802582cf40be0d8e 100644 (file)
--- 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);
        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,15 @@ 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) {
+                                               /*
+                                                * Each group of 8 bits occupies 2 hex digits plus
+                                                * 1 separator. Calculate the position of the byte
+                                                * which contains the trigger, then adjust for the
+                                                * trigger's bit position within that byte.
+                                                */
+                                               offset = ctx->trigger / 8 * (2 + 1);
+                                               offset += (ctx->trigger % 8) / 4;
                                                g_string_append_printf(*out, "T:%*s^ %d\n", offset, "", ctx->trigger);
                                                ctx->trigger = -1;
                                        }
@@ -251,8 +259,9 @@ 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,