Merge pull request #671 from nasa/issue-569-fprime-tlm-pkts

Fix to code generation for telemetry packets

Author: bocchino

compiler/lib/src/main/scala/codegen/CppWriter/TopologyCppWriter/TopTlmPacketIncludes.scala

@@ -19,7 +19,9 @@ case class TopTlmPacketIncludes(
     CppWriter.headerString(getIncludePath(tps))
 
   private def getIncludePath(tps: TlmPacketSet): String = {
-    val fileNameBase = ComputeCppFiles.FileNames.getTlmPacketSet(tps.getName)
+    val t = s.a.topologyMap(Symbol.Topology(aNode))
+    val tpsName = s"${t.getName}_${tps.getName}"
+    val fileNameBase = ComputeCppFiles.FileNames.getTlmPacketSet(tpsName)
     val fileName = s"$fileNameBase.hpp"
     s.getRelativePath(fileName).toString
   }

compiler/lib/src/main/scala/codegen/CppWriter/TopologyCppWriter/TopologyCppWriter.scala

@@ -66,7 +66,7 @@ case class TopologyCppWriter(
       TopConfigObjects(s, aNode).getHppLines
     )
     val cppLines = linesMember(
-      Line.blank :: addBlankPostfix(TopConfigObjects(s, aNode).getCppLines),
+      TopConfigObjects(s, aNode).getCppLines,
       CppDoc.Lines.Cpp
     )
     val (helperFnNames, helperFns) = TopHelperFns(s, aNode).getMembers

compiler/tools/fpp-to-cpp/test/top/BasicTopologyAc.ref.cpp

@@ -37,7 +37,6 @@ M::Active active1(FW_OPTIONAL_NAME("active1"));
 
 namespace M {
 
-
   // ----------------------------------------------------------------------
   // Component configuration objects
   // ----------------------------------------------------------------------
@@ -50,7 +49,6 @@ namespace M {
 
   }
 
-
   // ----------------------------------------------------------------------
   // Helper functions
   // ----------------------------------------------------------------------

compiler/tools/fpp-to-cpp/test/top/CommandsTopologyAc.ref.cpp

@@ -24,7 +24,6 @@ namespace M {
 
 namespace M {
 
-
   // ----------------------------------------------------------------------
   // Helper functions
   // ----------------------------------------------------------------------

compiler/tools/fpp-to-cpp/test/top/HealthTopologyAc.ref.cpp

@@ -30,7 +30,6 @@ namespace M {
 
 namespace M {
 
-
   // ----------------------------------------------------------------------
   // Component configuration objects
   // ----------------------------------------------------------------------
@@ -54,7 +53,6 @@ namespace M {
 
   }
 
-
   // ----------------------------------------------------------------------
   // Helper functions
   // ----------------------------------------------------------------------

compiler/tools/fpp-to-cpp/test/top/NestedNamespacesTopologyAc.ref.cpp

@@ -14,7 +14,6 @@ M::N::O::C c(FW_OPTIONAL_NAME("c"));
 
 namespace M {
 
-
   // ----------------------------------------------------------------------
   // Helper functions
   // ----------------------------------------------------------------------

compiler/tools/fpp-to-cpp/test/top/NoInstancesTopologyAc.ref.cpp

@@ -0,0 +1,76 @@
+// ======================================================================
+// \title  NoInstancesTopologyAc.cpp
+// \author Generated by fpp-to-cpp
+// \brief  cpp file for NoInstances topology
+// ======================================================================
+
+#include "NoInstancesTopologyAc.hpp"
+
+// ----------------------------------------------------------------------
+// Helper functions
+// ----------------------------------------------------------------------
+
+void initComponents(const TopologyState& state) {
+  // Nothing to do
+}
+
+void configComponents(const TopologyState& state) {
+  // Nothing to do
+}
+
+void setBaseIds() {
+  // Nothing to do
+}
+
+void connectComponents() {
+  // Nothing to do
+}
+
+void regCommands() {
+  // Nothing to do
+}
+
+void readParameters() {
+  // Nothing to do
+}
+
+void loadParameters() {
+  // Nothing to do
+}
+
+void startTasks(const TopologyState& state) {
+  // Nothing to do
+}
+
+void stopTasks(const TopologyState& state) {
+  // Nothing to do
+}
+
+void freeThreads(const TopologyState& state) {
+  // Nothing to do
+}
+
+void tearDownComponents(const TopologyState& state) {
+  // Nothing to do
+}
+
+// ----------------------------------------------------------------------
+// Setup and teardown functions
+// ----------------------------------------------------------------------
+
+void setup(const TopologyState& state) {
+  initComponents(state);
+  configComponents(state);
+  setBaseIds();
+  connectComponents();
+  regCommands();
+  readParameters();
+  loadParameters();
+  startTasks(state);
+}
+
+void teardown(const TopologyState& state) {
+  stopTasks(state);
+  freeThreads(state);
+  tearDownComponents(state);
+}

compiler/tools/fpp-to-cpp/test/top/NoInstancesTopologyAc.ref.hpp

@@ -0,0 +1,77 @@
+// ======================================================================
+// \title  NoInstancesTopologyAc.hpp
+// \author Generated by fpp-to-cpp
+// \brief  hpp file for NoInstances topology
+// ======================================================================
+
+#ifndef NoInstancesTopologyAc_HPP
+#define NoInstancesTopologyAc_HPP
+
+#include "NoInstancesTopologyDefs.hpp"
+#include "NoInstances_P1TlmPacketsAc.hpp"
+#include "NoInstances_P2TlmPacketsAc.hpp"
+
+// ----------------------------------------------------------------------
+// Helper functions
+// ----------------------------------------------------------------------
+
+//! Initialize components
+void initComponents(
+    const TopologyState& state //!< The topology state
+);
+
+//! Configure components
+void configComponents(
+    const TopologyState& state //!< The topology state
+);
+
+//! Set component base Ids
+void setBaseIds();
+
+//! Connect components
+void connectComponents();
+
+//! Register commands
+void regCommands();
+
+//! Read parameters
+void readParameters();
+
+//! Load parameters
+void loadParameters();
+
+//! Start tasks
+void startTasks(
+    const TopologyState& state //!< The topology state
+);
+
+//! Stop tasks
+void stopTasks(
+    const TopologyState& state //!< The topology state
+);
+
+//! Free threads
+void freeThreads(
+    const TopologyState& state //!< The topology state
+);
+
+//! Tear down components
+void tearDownComponents(
+    const TopologyState& state //!< The topology state
+);
+
+// ----------------------------------------------------------------------
+// Setup and teardown functions
+// ----------------------------------------------------------------------
+
+//! Set up the topology
+void setup(
+    const TopologyState& state //!< The topology state
+);
+
+//! Tear down the topology
+void teardown(
+    const TopologyState& state //!< The topology state
+);
+
+#endif

compiler/tools/fpp-to-cpp/test/top/NoNamespaceTopologyAc.ref.cpp

@@ -6,7 +6,6 @@
 
 #include "NoNamespaceTopologyAc.hpp"
 
-
 // ----------------------------------------------------------------------
 // Helper functions
 // ----------------------------------------------------------------------

compiler/tools/fpp-to-cpp/test/top/OneInstanceTopologyAc.ref.cpp

@@ -0,0 +1,90 @@
+// ======================================================================
+// \title  OneInstanceTopologyAc.cpp
+// \author Generated by fpp-to-cpp
+// \brief  cpp file for OneInstance topology
+// ======================================================================
+
+#include "OneInstanceTopologyAc.hpp"
+
+// ----------------------------------------------------------------------
+// Component instances
+// ----------------------------------------------------------------------
+
+namespace M {
+
+  C c1(FW_OPTIONAL_NAME("c1"));
+
+}
+
+namespace M {
+
+  // ----------------------------------------------------------------------
+  // Helper functions
+  // ----------------------------------------------------------------------
+
+  void initComponents(const TopologyState& state) {
+    M::c1.init(InstanceIds::M_c1);
+  }
+
+  void configComponents(const TopologyState& state) {
+    // Nothing to do
+  }
+
+  void setBaseIds() {
+    M::c1.setIdBase(BaseIds::M_c1);
+  }
+
+  void connectComponents() {
+    // Nothing to do
+  }
+
+  void regCommands() {
+    // Nothing to do
+  }
+
+  void readParameters() {
+    // Nothing to do
+  }
+
+  void loadParameters() {
+    // Nothing to do
+  }
+
+  void startTasks(const TopologyState& state) {
+    // Nothing to do
+  }
+
+  void stopTasks(const TopologyState& state) {
+    // Nothing to do
+  }
+
+  void freeThreads(const TopologyState& state) {
+    // Nothing to do
+  }
+
+  void tearDownComponents(const TopologyState& state) {
+    // Nothing to do
+  }
+
+  // ----------------------------------------------------------------------
+  // Setup and teardown functions
+  // ----------------------------------------------------------------------
+
+  void setup(const TopologyState& state) {
+    initComponents(state);
+    configComponents(state);
+    setBaseIds();
+    connectComponents();
+    regCommands();
+    readParameters();
+    loadParameters();
+    startTasks(state);
+  }
+
+  void teardown(const TopologyState& state) {
+    stopTasks(state);
+    freeThreads(state);
+    tearDownComponents(state);
+  }
+
+}