Fixed compilation & cleanup

UWARG · Jul 14, 2024 · ac0f11f · ac0f11f
1 parent 38561a0
commit ac0f11f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 29 deletions.
diff --git a/TelemetryManager/Inc/TelemetryManager.hpp b/TelemetryManager/Inc/TelemetryManager.hpp
@@ -16,7 +16,6 @@
 
 #include "GroundStationCommunication.hpp"
 #include "MavlinkTranslator.hpp"
-#include "TelemetryTask.hpp"
 
 class TelemetryManager {
    private:

diff --git a/TelemetryManager/Src/MavlinkTranslator.cpp b/TelemetryManager/Src/MavlinkTranslator.cpp
@@ -10,7 +10,7 @@ MavlinkTranslator::~MavlinkTranslator() {
 
 void MavlinkTranslator::bytesToMavlinkMsg(TMCircularBuffer &rxFromGroundByteQueue) {
     // Take bytes in rxFromGroundByteQueue and convert them to Mavlink messages
-    MavlinkDecoder decoder;
+    // MavlinkDecoder decoder;
     bool success = true;
     uint8_t bytesUntilEnd = 0;
 

diff --git a/TelemetryManager/Src/TelemetryManager.cpp b/TelemetryManager/Src/TelemetryManager.cpp
@@ -1,4 +1,5 @@
 #include "TelemetryManager.hpp"
+#include "TelemetryTask.hpp"
 
 /**
  * @brief This task is called every 500ms. It is responsible for
@@ -17,7 +18,9 @@ TelemetryManager::TelemetryManager(uint8_t& altitude)
       GSC(*DMAReceiveBuffer, lowPriorityTransmitBuffer, highPriorityTransmitBuffer,
           RFD900_BUF_SIZE),
       MT(),
-      altitude(altitude) {}
+      altitude(altitude) {
+
+      }
 
 TelemetryManager::~TelemetryManager() {
     // Destructor
@@ -97,4 +100,6 @@ void TelemetryManager::update() {
     GSC.transmit(GSC.lowPriorityTransmitBuffer);
 }
 
-void TelemetryManager::teardownTasks() { delete routineDataTransmission; }
+void TelemetryManager::teardownTasks() { 
+    delete routineDataTransmission; 
+    }
diff --git a/TelemetryManager/Tests/MavlinkTranslatorTest.cpp b/TelemetryManager/Tests/MavlinkTranslatorTest.cpp
@@ -1,4 +1,5 @@
 #include <gtest/gtest.h>
+
 #include <MavlinkTranslator.hpp>
 
 TEST(MavlinkTranslatorTest, EncodeThenDecodeTest) {
@@ -24,8 +25,9 @@ TEST(MavlinkTranslatorTest, EncodeThenDecodeTest) {
             // start bit and therefore determine when the second message ends
 
     translator.bytesToMavlinkMsg(buffer);
-    ASSERT_EQ(translator.decodedMessages, expectedNumberOfMessagesDecoded);
 
+    ASSERT_EQ(translator.decoder.messagesHandledSuccessfully, expectedNumberOfMessagesDecoded);
+    ASSERT_EQ(translator.decodedMessages, expectedNumberOfMessagesDecoded);
 }
 
 TEST(MavlinkTranslatorTest, ParseBytesToMavlinkMsgsTest) {
@@ -55,33 +57,10 @@ TEST(MavlinkTranslatorTest, ParseBytesToMavlinkMsgsTest) {
 
     translator.bytesToMavlinkMsg(buffer);
 
+    ASSERT_EQ(translator.decoder.messagesHandledSuccessfully, expectedNumberOfMessagesDecoded);
     ASSERT_EQ(translator.decodedMessages, expectedNumberOfMessagesDecoded);
 }
 
-TEST(MavlinkTranslatorTest, global_position_int) {
-    mavlink_message_t msg;
-    mavlink_msg_global_position_int_pack(0, 0, &msg, 1, 2, 3, 4, 5, 6, 7, 8, 9);
-
-    // Create a buffer to hold the message data
-    uint8_t expectedBuffer[MAVLINK_MAX_PACKET_LEN] = {0};
-
-
-    // Decode the message
-    mavlink_global_position_int_t globalPositionInt;
-    mavlink_msg_global_position_int_decode(&msg, &globalPositionInt);
-
-    // Assertions
-    ASSERT_EQ(globalPositionInt.time_boot_ms, 1);
-    ASSERT_EQ(globalPositionInt.lat, 2);
-    ASSERT_EQ(globalPositionInt.lon, 3);
-    ASSERT_EQ(globalPositionInt.alt, 4);
-    ASSERT_EQ(globalPositionInt.relative_alt, 5);
-    ASSERT_EQ(globalPositionInt.vx, 6);
-    ASSERT_EQ(globalPositionInt.vy, 7);
-    ASSERT_EQ(globalPositionInt.vz, 8);
-    ASSERT_EQ(globalPositionInt.hdg, 9);
-}
-
 TEST(MavlinkTranslatorTest, AddMavlinkMsgToByteQueueTest) {
     MavlinkTranslator translator;
     uint8_t _buffer[256];