From 4cda83153683d77b4d9e8f789f953abc83af5d97 Mon Sep 17 00:00:00 2001 From: Ayoub Kaanich Date: Sun, 9 May 2021 01:57:20 +0200 Subject: [PATCH] asc2log: add CANFD_FDF to programs --- asc2log.c | 1 + cangen.c | 1 + cangw.c | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/asc2log.c b/asc2log.c index 71be7f8..be1332a 100644 --- a/asc2log.c +++ b/asc2log.c @@ -315,6 +315,7 @@ void eval_canfd(char* buf, struct timeval *date_tvp, char timestamps, int dplace if (flags & ASC_F_FDF) { dlen = CANFD_MAX_DLEN; + cf.flags |= CANFD_FDF; if (flags & ASC_F_BRS) cf.flags |= CANFD_BRS; if (flags & ASC_F_ESI) diff --git a/cangen.c b/cangen.c index 894ad29..dae1d29 100644 --- a/cangen.c +++ b/cangen.c @@ -409,6 +409,7 @@ int main(int argc, char **argv) if (canfd){ mtu = CANFD_MTU; maxdlen = CANFD_MAX_DLEN; + frame.flags |= CANFD_FDF; if (brs) frame.flags |= CANFD_BRS; if (esi) diff --git a/cangw.c b/cangw.c index bf45331..e85c21e 100644 --- a/cangw.c +++ b/cangw.c @@ -264,7 +264,7 @@ void print_usage(char *prg) fprintf(stderr, " is one of 'AND' 'OR' 'XOR' 'SET'\n"); fprintf(stderr, " is _one_ or _more_ of 'I'd 'F'lags 'L'ength 'D'ata\n"); fprintf(stderr, " is an u32 value containing the CAN FD Identifier\n"); - fprintf(stderr, " is an u8 value containing CAN FD flags (CANFD_BRS, CANFD_ESI)\n"); + fprintf(stderr, " is an u8 value containing CAN FD flags (CANFD_BRS, CANFD_ESI, CANFD_FDF)\n"); fprintf(stderr, " is an u8 value containing the data length in hex (0 .. 40)\n"); fprintf(stderr, " is always 64(!) u8 values containing the CAN FD frames data\n"); fprintf(stderr, "The max. four modifications are performed in the order AND -> OR -> XOR -> SET\n");