update FppTest for new autocoder changes

FppTest/state_machine/CMakeLists.txt

@@ -3,6 +3,7 @@ set(SOURCE_FILES
   "${CMAKE_CURRENT_LIST_DIR}/SmTest.fpp"
     "${CMAKE_CURRENT_LIST_DIR}/DeviceSm.cpp"
 )
+set(MOD_DEPS Fw/SMSignal)
 
 register_fprime_module()
 

FppTest/state_machine/DeviceSm.cpp

@@ -19,7 +19,7 @@ void FppTest::DeviceSm::init()
 }
 
 
-void FppTest::DeviceSm::update(const Fw::SMSignals *e)
+void FppTest::DeviceSm::update(const DeviceSmEvents signal, const Fw::SMSignalBuffer &data)
 {
     switch (this->state) {
 
@@ -28,7 +28,7 @@ void FppTest::DeviceSm::update(const Fw::SMSignals *e)
             */
             case OFF:
 
-            switch (e->geteventSignal()) {
+            switch (signal) {
 
                 case RTI_SIG:
                         this->state = ON;
@@ -45,7 +45,7 @@ void FppTest::DeviceSm::update(const Fw::SMSignals *e)
             */
             case ON:
 
-            switch (e->geteventSignal()) {
+            switch (signal) {
 
                 case RTI_SIG:
                         this->state = OFF;

FppTest/state_machine/DeviceSm.hpp

@@ -8,7 +8,9 @@
 
 #ifndef DEVICESM_H_
 #define DEVICESM_H_
-
+
+#include <Fw/SMSignal/SMSignalBuffer.hpp>
+
 namespace Fw {
   class SMSignals;
 }
@@ -43,7 +45,7 @@ class DeviceSm {
     void * extension;
 
     void init();
-    void update(const Fw::SMSignals *e);
+    void update(const DeviceSmEvents signal, const Fw::SMSignalBuffer &data);
 
 };
 

FppTest/state_machine/DeviceSm.trans

@@ -0,0 +1,2 @@
+InitialState = OFF, Event = RTI, guard = None, action = None, TargetState = ON
+InitialState = ON, Event = RTI, guard = None, action = None, TargetState = OFF

FppTest/state_machine/SmTest.cpp

@@ -29,17 +29,11 @@ SmTest ::~SmTest() {}
 // ----------------------------------------------------------------------
 
 void SmTest::schedIn_handler(const NATIVE_INT_TYPE portNum, U32 context) {
-    Fw::SMSignals event;
-    event.seteventSignal(DeviceSm::RTI_SIG);
+    Fw::SMSignalBuffer data;
 
-    event.setsmId(STATE_MACHINE_DEVICE1);
-    stateMachineInvoke(event);
-
-    event.setsmId(STATE_MACHINE_DEVICE2);
-    stateMachineInvoke(event);
-
-    event.setsmId(STATE_MACHINE_DEVICE3);
-    stateMachineInvoke(event);
+    device1StateMachineInvoke(DeviceSm::RTI_SIG, data);
+    device2StateMachineInvoke(DeviceSm::RTI_SIG, data);
+    device3StateMachineInvoke(DeviceSm::RTI_SIG, data);
 
 }
 

FppTest/state_machine/autosm.sh

@@ -0,0 +1 @@
+ /home/watney/STARS/autocoder/Stars.py -namespace FppTest -backend fprime -noImpl -model DeviceSm.plantuml 

FppTest/state_machine/cpstuff.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# Define the source and destination directories
+SOURCE_DIR="/home/watney/fprime/FppTest/state_machine/dev"
+DEST_DIR="/home/watney/fprime/FppTest/build-fprime-automatic-native-ut/FppTest/state_machine"
+
+# List of files to copy
+FILES=("SmTestComponentAc.cpp" "SmTestComponentAc.hpp")
+
+# Loop through each file and copy it to the destination directory
+for FILE in "${FILES[@]}"; do
+  if [ -f "$SOURCE_DIR/$FILE" ]; then
+    cp "$SOURCE_DIR/$FILE" "$DEST_DIR/"
+    echo "Copied $FILE to $DEST_DIR/"
+  else
+    echo "File not found: $SOURCE_DIR/$FILE"
+  fi
+done
+
+echo "File copy operation completed."
+

Fw/CMakeLists.txt

@@ -14,6 +14,7 @@ add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/Tlm/")
 # Framework subdirectories
 add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/Cfg/")
 add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/Comp/")
+add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/SMSignal/")
 add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/FilePacket/")
 add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/Obj/")
 add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/Port/")

Fw/SMSignal/CMakeLists.txt

@@ -0,0 +1,11 @@
+####
+# F prime CMakeLists.txt:
+#
+# SOURCE_FILES: combined list of source and autocoding files
+# MOD_DEPS: (optional) module dependencies
+#
+####
+set(SOURCE_FILES
+  "${CMAKE_CURRENT_LIST_DIR}/SMSignalBuffer.cpp"
+)
+register_fprime_module()

Fw/SMSignal/README

@@ -0,0 +1,3 @@
+ComPortAi.xml - Port description for communication buffers
+ComBuffer.hpp(.cpp) - A buffer holding a serialized communication buffer
+ComPacket.hpp(.cpp) - A packet type that holds a communication buffer

Fw/SMSignal/SMSignalBuffer.cpp

@@ -0,0 +1,45 @@
+#include <Fw/SMSignal/SMSignalBuffer.hpp>
+#include <Fw/Types/Assert.hpp>
+
+namespace Fw {
+
+    SMSignalBuffer::SMSignalBuffer(const U8 *args, NATIVE_UINT_TYPE size) {
+        SerializeStatus stat = SerializeBufferBase::setBuff(args,size);
+        FW_ASSERT(FW_SERIALIZE_OK == stat,static_cast<NATIVE_INT_TYPE>(stat));
+    }
+
+    SMSignalBuffer::SMSignalBuffer() {
+    }
+
+    SMSignalBuffer::~SMSignalBuffer() {
+    }
+
+    SMSignalBuffer::SMSignalBuffer(const SMSignalBuffer& other) : Fw::SerializeBufferBase() {
+        SerializeStatus stat = SerializeBufferBase::setBuff(other.m_bufferData,other.getBuffLength());
+        FW_ASSERT(FW_SERIALIZE_OK == stat,static_cast<NATIVE_INT_TYPE>(stat));
+    }
+
+    SMSignalBuffer& SMSignalBuffer::operator=(const SMSignalBuffer& other) {
+        if(this == &other) {
+            return *this;
+        }
+
+        SerializeStatus stat = SerializeBufferBase::setBuff(other.m_bufferData,other.getBuffLength());
+        FW_ASSERT(FW_SERIALIZE_OK == stat,static_cast<NATIVE_INT_TYPE>(stat));
+        return *this;
+    }
+
+    NATIVE_UINT_TYPE SMSignalBuffer::getBuffCapacity() const {
+        return sizeof(this->m_bufferData);
+    }
+
+    const U8* SMSignalBuffer::getBuffAddr() const {
+        return this->m_bufferData;
+    }
+
+    U8* SMSignalBuffer::getBuffAddr() {
+        return this->m_bufferData;
+    }
+
+}
+

Fw/SMSignal/SMSignalBuffer.hpp

@@ -0,0 +1,42 @@
+/*
+ * SMSignalBuffer.hpp
+ *
+ */
+
+/*
+ * Description:
+ * This object contains the SMSignalBuffer type, used for attaching data to state machine signals
+ */
+#ifndef FW_SM_SIGNAL_BUFFER_HPP
+#define FW_SM_SIGNAL_BUFFER_HPP
+
+#include <FpConfig.hpp>
+#include <Fw/Types/Serializable.hpp>
+
+namespace Fw {
+
+    class SMSignalBuffer : public SerializeBufferBase {
+        public:
+
+            enum {
+                SERIALIZED_TYPE_ID = 1010,
+                SERIALIZED_SIZE = FW_COM_BUFFER_MAX_SIZE + sizeof(FwBuffSizeType)  // size of buffer + storage of size word
+            };
+
+            SMSignalBuffer(const U8 *args, NATIVE_UINT_TYPE size);
+            SMSignalBuffer();
+            SMSignalBuffer(const SMSignalBuffer& other);
+            virtual ~SMSignalBuffer();
+            SMSignalBuffer& operator=(const SMSignalBuffer& other);
+
+            NATIVE_UINT_TYPE getBuffCapacity() const; // !< returns capacity, not current size, of buffer
+            U8* getBuffAddr();
+            const U8* getBuffAddr() const;
+
+        private:
+            U8 m_bufferData[FW_SM_SIGNALS_BUFFER_MAX_SIZE]; // packet data buffer
+    };
+
+}
+
+#endif

Fw/SMSignal/docs/.gitignore

@@ -0,0 +1 @@
+*.html

Fw/SMSignal/docs/sdd.md

@@ -0,0 +1,36 @@
+\page FwComPort Fw::Com Port
+# Fw::Com Port
+
+## 1. Introduction
+
+The `Fw::Com` port is used to pass binary data to a service for transporting data out of the system. 
+Incoming and outgoing packets are serialized into these buffers.
+
+## 2. Design
+
+### 2.1 Context
+
+#### 2.1.1 Port Diagram
+
+The `Fw::Com` port has the following port diagram:
+
+![Fw::Com Diagram](img/FwComBDD.jpg "Fw::Com Port")
+
+#### 2.1.2 Serializables
+
+##### 2.1.2.1 Fw::ComPacket 
+
+The `Fw::ComPacket` class is a base class for other packet classes. It provides type identification for packet subtypes.
+
+##### 2.1.2.2 Fw::ComBuffer
+
+The `Fw::ComBuffer` class represents a buffer to store data for transmission. It is used as a destination buffer for serialization of `Fw::ComPacket` subtypes.
+
+## 3. Change Log
+
+Date | Description
+---- | -----------
+6/22/2015 |  Initial Version
+
+
+

config/FpConfig.h

@@ -268,6 +268,11 @@ typedef FwIndexType FwQueueSizeType;
 #define FW_COM_BUFFER_MAX_SIZE 512
 #endif
 
+// Specifies the size of the buffer attached to state machine signals.
+#ifndef FW_SM_SIGNALS_BUFFER_MAX_SIZE
+#define FW_SM_SIGNALS_BUFFER_MAX_SIZE 128
+#endif
+
 // Specifies the size of the buffer that contains the serialized command arguments.
 
 #ifndef FW_CMD_ARG_BUFFER_MAX_SIZE