Remove unused header in state machine code gen

Fix related bug in code gen Update unit tests
nasa · Sep 2, 2024 · 6efa37a · 6efa37a
1 parent ecb8b6a
commit 6efa37a
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 13 deletions.
diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriter.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriter.scala
@@ -95,8 +95,6 @@ case class ComponentCppWriter (
       guardedList (hasEvents) (List("Fw/Log/LogString.hpp"))
     val internalStrHeaders =
       guardedList (hasInternalPorts) (List("Fw/Types/InternalInterfaceString.hpp"))
-    val stateMachineEventHeaders =
-      guardedList (hasStateMachineInstances) (List("Fw/Types/SMSignalsSerializableAc.hpp"))
 
     val standardHeaders = List.concat(
       List(
@@ -111,8 +109,7 @@ case class ComponentCppWriter (
       tlmStrHeaders,
       prmStrHeaders,
       logStrHeaders,
-      internalStrHeaders,
-      stateMachineEventHeaders
+      internalStrHeaders
     ).map(CppWriter.headerString)
     val symbolHeaders = writeIncludeDirectives
     val headers = standardHeaders ++ symbolHeaders
@@ -341,7 +338,7 @@ case class ComponentCppWriter (
         lines(
           s"""|// Size of statemachine sendSignals
               |BYTE sendSignalsStatemachineSize[
-              |  Fw::SMSignals::SERIALIZED_SIZE
+              |  2 * sizeof(FwEnumStoreType) + Fw::SMSignalBuffer::SERIALIZED_SIZE
               |];
               |"""
         )

diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveStateMachinesComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveStateMachinesComponentAc.ref.cpp
@@ -24,7 +24,7 @@ namespace M {
     union BuffUnion {
       // Size of statemachine sendSignals
       BYTE sendSignalsStatemachineSize[
-        Fw::SMSignals::SERIALIZED_SIZE
+        2 * sizeof(FwEnumStoreType) + Fw::SMSignalBuffer::SERIALIZED_SIZE
       ];
     };
 

diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveStateMachinesComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveStateMachinesComponentAc.ref.hpp
@@ -13,7 +13,6 @@
 #include "Fw/Comp/ActiveComponentBase.hpp"
 #include "Fw/Port/InputSerializePort.hpp"
 #include "Fw/Port/OutputSerializePort.hpp"
-#include "Fw/Types/SMSignalsSerializableAc.hpp"
 
 namespace M {
 

diff --git a/compiler/tools/fpp-to-cpp/test/fprime/Fw/Types/Types.fpp b/compiler/tools/fpp-to-cpp/test/fprime/Fw/Types/Types.fpp
@@ -13,12 +13,6 @@ module Fw {
     NO_ROOM_LEFT  @< No room left in the buffer to serialize data
   }
 
-  struct SMSignals {
-        smId : U32
-        eventSignal: U32
-        payload: [128] U8
-  }
-
   @ Deserialization status
   enum DeserialStatus {
     OK = 0