Refactor EDU code (#249)

SpaceTeam · Feb 10, 2024 · 2759332 · 2759332
2 parents fcb8544 + db8dc2d
commit 2759332
Show file tree

Hide file tree

Showing 29 changed files with 531 additions and 688 deletions.
diff --git a/Sts1CobcSw/CommandParser.cpp b/Sts1CobcSw/CommandParser.cpp
@@ -65,7 +65,7 @@ auto BuildEduQueue(std::span<Byte const> commandData) -> void
 
     edu::programQueue.clear();
     ParseAndAddQueueEntries(commandData);
-    edu::queueIndex = 0U;
+    edu::queueIndex = 0;
 
     RODOS::PRINTF("Queue index reset. Current size of EDU program queue is %d.\n",
                   static_cast<int>(edu::programQueue.size()));

diff --git a/Sts1CobcSw/CommandParser.hpp b/Sts1CobcSw/CommandParser.hpp
@@ -22,10 +22,10 @@ enum CommandId : char
 
 struct GsCommandHeader
 {
-    char startCharacter;
-    std::int32_t utc;
-    std::int8_t commandId;
-    std::int16_t length;
+    char startCharacter = '\0';
+    std::int32_t utc = 0;
+    std::int8_t commandId = 0;
+    std::int16_t length = 0;
 };
 
 

diff --git a/Sts1CobcSw/CommandParserThread.cpp b/Sts1CobcSw/CommandParserThread.cpp
@@ -48,7 +48,7 @@ class CommandParserThread : public RODOS::StaticThread<stackSize>
             // module
             std::size_t const nReadCharacters =
                 RODOS::uart_stdout.read(&readCharacter, sizeof(readCharacter));
-            if(nReadCharacters == 0U)
+            if(nReadCharacters == 0)
             {
                 RODOS::uart_stdout.suspendUntilDataReady();
                 continue;

diff --git a/Sts1CobcSw/Dummy.hpp b/Sts1CobcSw/Dummy.hpp
@@ -12,6 +12,6 @@ struct Dummy
 
     static constexpr auto maxNameLength = 42;
 
-    etl::string<maxNameLength> name;
+    etl::string<maxNameLength> name = "";
 };
 }
diff --git a/Sts1CobcSw/Edu/CMakeLists.txt b/Sts1CobcSw/Edu/CMakeLists.txt
@@ -5,6 +5,7 @@ target_link_libraries(Sts1CobcSw_Edu PRIVATE Sts1CobcSw_Utility)
 if(CMAKE_SYSTEM_NAME STREQUAL Generic)
     target_sources(Sts1CobcSw_Edu PRIVATE Edu.cpp)
     target_link_libraries(Sts1CobcSw_Edu PUBLIC Sts1CobcSw_Hal Sts1CobcSw_Periphery)
+    target_link_libraries(Sts1CobcSw_Edu PRIVATE etl::etl)
 endif()
 if(CMAKE_SYSTEM_NAME STREQUAL Linux)
     target_sources(Sts1CobcSw_Edu PRIVATE EduMock.cpp)