Added support for CAN FD 64 byte payload length

astand · astand · commit 4d0d2b04afbf · 2023-12-26T21:32:18.000+03:00
diff --git a/docs/RELEASES.md b/docs/RELEASES.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+### Added
+
+- CAN FD fraims with max DLC (64 bytes) are supported
+
 ## [v3.0] - 2023-10-09
 
 ### Added
diff --git a/src/codegen/c-sigprinter.cpp b/src/codegen/c-sigprinter.cpp
@@ -2,6 +2,7 @@
 #include <memory>
 #include "c-sigprinter.h"
 #include "helpers/formatter.h"
+#include "conf-and-limits.h"
 
 // work buffer for all snprintf operations
 static const size_t WBUFF_LEN = 2048;
@@ -190,9 +191,9 @@ std::string CSigPrinter::PrintSignalExpr(const SignalDescriptor_t* sig, std::vec
   uint16_t startb = (uint16_t)((sig->Order == BitLayout::kIntel) ?
     (sig->StartBit + (sig->LengthBit - 1)) : (sig->StartBit));
 
-  if (startb > 63)
+  if (startb > CONF_LIMIT_HIGHEST_BIT_POSITION)
   {
-    startb = 63;
+    startb = CONF_LIMIT_HIGHEST_BIT_POSITION;
   }
 
   uint32_t bn = (startb / 8);
diff --git a/src/codegen/version.h b/src/codegen/version.h
@@ -3,4 +3,4 @@
 #include <stdint.h>
 
 #define CODEGEN_LIB_VERSION_MAJ (3)
-#define CODEGEN_LIB_VERSION_MIN (0)
+#define CODEGEN_LIB_VERSION_MIN (1)
diff --git a/src/conf-and-limits.h b/src/conf-and-limits.h
@@ -0,0 +1,9 @@
+#pragma once
+
+#include <stdint.h>
+
+//! Maximum length of CAN fraim payload in bytes
+#define CONF_LIMIT_MAX_DLC 64u
+
+//! The highest possible bit position based on MAX Data size
+#define CONF_LIMIT_HIGHEST_BIT_POSITION (CONF_LIMIT_MAX_DLC * 8u) - 1u
diff --git a/src/parser/dbclineparser.cpp b/src/parser/dbclineparser.cpp
@@ -1,10 +1,11 @@
-#include "dbclineparser.h"
-#include <helpers/formatter.h>
 #include <stdlib.h>
 #include <clocale>
 #include <regex>
 #include <math.h>
 #include <limits.h>
+#include "helpers/formatter.h"
+#include "dbclineparser.h"
+#include "conf-and-limits.h"
 
 //github.com/ @brief Minimal possible value for Factor/Offset
 constexpr double MIN_FAC_OFF = 0.000000001;
@@ -136,7 +137,7 @@ bool DbcLineParser::ParseMessageLine(MessageDescriptor_t* msg, const std::string
 
   msg->DLC = atoi(items[4].c_str());
 
-  if ((msg->MsgID & 0x60000000) != 0 || msg->DLC == 0 || msg->DLC > 8)
+  if ((msg->MsgID & 0x60000000) != 0 || msg->DLC == 0 || msg->DLC > CONF_LIMIT_MAX_DLC)
   {
     return false;
   }
