* 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"
}
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);
/* 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;
}
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,
};
-