Add Topology Ports in FPP (nasa#4805)

* Add topology port tests

* Rename ref topology

* Fix some includes

* Bump to next alpha

* Don't rename topology

* Oops typo

Author: Kronos3

FppTestProject/FppTest/topology/CMakeLists.txt

@@ -1,4 +1,5 @@
 add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/components")
+add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/top_ports")
 add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/ports")
 add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/async")
 add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/sync")

FppTestProject/FppTest/topology/main/main.cpp

@@ -182,6 +182,11 @@ TEST_F(SenderTester, StructReturn) {
     sender2Guarded.testStructReturn(TestDeploymentPort::STRUCT_RETURN_GUARDED);
 }
 
+TEST_F(SenderTester, SenderTop) {
+    sender1Top.testPrimitiveArgs(TestDeploymentPort::PRIMITIVE_ARGS_SYNC);
+    sender2Top.testPrimitiveArgs(TestDeploymentPort::PRIMITIVE_ARGS_SYNC);
+}
+
 TEST_F(SenderTester, IsReceiverConnected) {
     ReceiverTester::testIsConnected();
 }

FppTestProject/FppTest/topology/main/topology.fpp

@@ -7,9 +7,11 @@ module FppTest {
 
   topology FppTest {
 
-    import Sync
-    import Guarded
-    import Async
+    instance Sync
+    instance Guarded
+    instance Async
+    instance TopPorts
+
   }
 
 }

FppTestProject/FppTest/topology/top_ports/CMakeLists.txt

@@ -0,0 +1,10 @@
+set(SOURCE_FILES
+  "${CMAKE_CURRENT_LIST_DIR}/Topology.fpp"
+)
+
+set(MOD_DEPS
+        ${PROJECT_NAME}/topology/components/Sender
+        ${PROJECT_NAME}/topology/components/Receiver
+)
+
+register_fprime_module()

FppTestProject/FppTest/topology/top_ports/ReceiverTopTopologyDefs.hpp

@@ -0,0 +1,10 @@
+#ifndef ReceiverTopTopologyDefs_HPP
+#define ReceiverTopTopologyDefs_HPP
+
+namespace FppTest {
+
+struct TopologyState {};
+
+}  // namespace FppTest
+
+#endif

FppTestProject/FppTest/topology/top_ports/SenderTopTopologyDefs.hpp

@@ -0,0 +1,10 @@
+#ifndef SenderTopTopologyDefs_HPP
+#define SenderTopTopologyDefs_HPP
+
+namespace FppTest {
+
+struct TopologyState {};
+
+}  // namespace FppTest
+
+#endif

FppTestProject/FppTest/topology/top_ports/TopPortsTopologyDefs.hpp

@@ -0,0 +1,10 @@
+#ifndef TopPortsTopologyDefs_HPP
+#define TopPortsTopologyDefs_HPP
+
+namespace FppTest {
+
+struct TopologyState {};
+
+}  // namespace FppTest
+
+#endif

FppTestProject/FppTest/topology/top_ports/Topology.fpp

@@ -0,0 +1,54 @@
+module FppTest {
+
+  instance sender1Top: Sender base id 0x2010 queue size 1
+  instance sender2Top: Sender base id 0x2020 queue size 1
+
+  instance receiver1Top: Receiver base id 0x2100 \
+    queue size Default.QUEUE_SIZE \
+    stack size Default.STACK_SIZE \
+    priority 20
+
+  instance receiver2Top: Receiver base id 0x2200 \
+    queue size Default.QUEUE_SIZE \
+    stack size Default.STACK_SIZE \
+    priority 20
+
+  topology SenderTop {
+    instance sender1Top
+    instance sender2Top
+
+    port primitiveArgsOut1 = sender1Top.primitiveArgsOut
+    port primitiveArgsOut2 = sender2Top.primitiveArgsOut
+
+    port replyIn1 = sender1Top.replyIn
+    port replyIn2 = sender2Top.replyIn
+  }
+
+  topology ReceiverTop {
+    instance receiver1Top
+    instance receiver2Top
+
+    port primitiveArgsSync1 = receiver1Top.primitiveArgsSync
+    port primitiveArgsSync2 = receiver2Top.primitiveArgsSync
+
+    port replyOut1 = receiver1Top.replyOut
+    port replyOut2 = receiver2Top.replyOut
+  }
+
+  topology TopPorts {
+    instance SenderTop
+    instance ReceiverTop
+
+    connections Top2Top {
+        SenderTop.primitiveArgsOut1[0] -> ReceiverTop.primitiveArgsSync1[0]
+        SenderTop.primitiveArgsOut1[1] -> ReceiverTop.primitiveArgsSync1[1]
+
+        SenderTop.primitiveArgsOut2[0] -> ReceiverTop.primitiveArgsSync2[0]
+        SenderTop.primitiveArgsOut2[1] -> ReceiverTop.primitiveArgsSync2[1]
+
+        ReceiverTop.replyOut1[SenderId.SYNC] -> SenderTop.replyIn1
+        ReceiverTop.replyOut2[SenderId.SYNC] -> SenderTop.replyIn2
+    }
+  }
+
+}