Added fmon-header file generation.

astand · astand · commit e634227dfe97 · 2021-01-31T18:37:08.000+03:00
diff --git a/src/codegen/c-main-generator.cpp b/src/codegen/c-main-generator.cpp
@@ -54,6 +54,7 @@ void CiMainGenerator::Generate(std::vector<MessageDescriptor_t*>& msgs, const Fs
   Gen_MainSource();
 
   // 4 step is to pring fmon head file
+  Gen_FMonHeader();
 
   // 5 step is to print fmon source file
 }
@@ -242,6 +243,38 @@ void CiMainGenerator::Gen_MainSource()
   fwriter->Flush(fdesc->core_c.fpath);
 }
 
+void CiMainGenerator::Gen_FMonHeader()
+{
+  fwriter->AppendLine("#pragma once", 2);
+
+  fwriter->AppendLine("#ifdef __cplusplus\nextern \"C\" {\n#endif", 2);
+
+  fwriter->AppendLine(PrintF("#include \"%s-config.h\"", fdesc->drvname.c_str()), 2);
+
+  // put diagmonitor ifdef selection for including @drv-fmon header
+  // with FMon_* signatures to call from unpack function
+  fwriter->AppendLine(PrintF("#ifdef %s", fdesc->usemon_def.c_str()), 2);
+  fwriter->AppendLine("#include \"canmonitorutil.h\"");
+  fwriter->AppendLine("/*\n\
+This file contains the prototypes of all the functions that will be called\n\
+from each Unpack_*name* function to detect DBC related errors\n\
+It is the user responsibility to defined these functions in the\n\
+separated .c file. If it won't be done the linkage error will happen\n*/", 2);
+
+  for (size_t num = 0; num < sigprt->sigs_expr.size(); num++)
+  {
+    auto msg = &(sigprt->sigs_expr[num]->msg);
+    fwriter->AppendLine(PrintF("void FMon_%s_%s(FrameMonitor_t* _mon);",
+                               msg->Name.c_str(), fdesc->drvname.c_str()));
+  }
+
+  fwriter->AppendLine(PrintF("\n#endif // %s", fdesc->usemon_def.c_str()), 2);
+
+  fwriter->AppendLine("#ifdef __cplusplus\n}\n#endif");
+
+  fwriter->Flush(fdesc->fmon_h.fpath);
+}
+
 void CiMainGenerator::WriteSigStructField(const SignalDescriptor_t& sig, bool bits, size_t padwidth)
 {
   if (sig.CommentText.size() > 0)
diff --git a/src/codegen/c-main-generator.h b/src/codegen/c-main-generator.h
@@ -17,6 +17,7 @@ class CiMainGenerator {
 
   void Gen_MainHeader();
   void Gen_MainSource();
+  void Gen_FMonHeader();
 
   void WriteSigStructField(const SignalDescriptor_t& sig, bool bitfield, size_t pad);
 
diff --git a/src/codegen/fs-creator.cpp b/src/codegen/fs-creator.cpp
@@ -13,21 +13,21 @@ static char _tmpb[kTmpLen];
 std::string str_toupper(std::string s)
 {
   std::transform(s.begin(), s.end(), s.begin(),
-                 [](unsigned char c)
-  {
-    return std::toupper(c);
-  });
+    [](unsigned char c)
+    {
+      return std::toupper(c);
+    });
   return s;
 }
 
 
 std::string str_tolower(std::string s)
 {
   std::transform(s.begin(), s.end(), s.begin(),
-                 [](unsigned char c)
-  {
-    return std::tolower(c);
-  });
+    [](unsigned char c)
+    {
+      return std::tolower(c);
+    });
   return s;
 }
 
@@ -89,13 +89,21 @@ bool FsCreator::PrepareDirectory(std::string drvname, std::string basepath, bool
     FS.core_c.fpath = work_dir_path + "/" + FS.core_c.fname;
 
     FS.util_h.dir = work_dir_path;
-    FS.util_h.fname = FS.drvname + "_binutil" + ".h";
+    FS.util_h.fname = FS.drvname + "-binutil" + ".h";
     FS.util_h.fpath = work_dir_path + "/" + FS.util_h.fname;
 
     FS.util_c.dir = work_dir_path;
-    FS.util_c.fname = FS.drvname + "_binutil" + ".c";
+    FS.util_c.fname = FS.drvname + "-binutil" + ".c";
     FS.util_c.fpath = work_dir_path + "/" + FS.util_c.fname;
 
+    FS.fmon_h.dir = work_dir_path;
+    FS.fmon_h.fname = FS.drvname + "-fmon.h";
+    FS.fmon_h.fpath = work_dir_path + "/" + FS.fmon_h.fname;
+
+    FS.fmon_c.dir = work_dir_path;
+    FS.fmon_c.fname = FS.drvname + "-fmon.c";
+    FS.fmon_c.fpath = work_dir_path + "/" + FS.fmon_h.fname;
+
     snprintf(_tmpb, kTmpLen, "%s_USE_BITS_SIGNAL", FS.DRVNAME.c_str());
     FS.usebits_def = _tmpb;
 
diff --git a/src/codegen/fs-creator.h b/src/codegen/fs-creator.h
@@ -19,6 +19,9 @@ typedef struct
   OutFileDescriptor_t util_h;
   OutFileDescriptor_t util_c;
 
+  OutFileDescriptor_t fmon_h;
+  OutFileDescriptor_t fmon_c;
+
   std::string usebits_def;
   std::string usesruct_def;
   std::string usemon_def;
