Fix Outcome bug when returning a ResultInfo structure

SpaceTeam · Nov 11, 2023 · c809ec2 · c809ec2
1 parent d4bd1f7
commit c809ec2
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/Sts1CobcSw/Edu/Edu.cpp b/Sts1CobcSw/Edu/Edu.cpp
@@ -1,5 +1,6 @@
 #include <Sts1CobcSw/Edu/Edu.hpp>
 #include <Sts1CobcSw/Edu/Names.hpp>
+#include <Sts1CobcSw/Edu/Structs.hpp>
 #include <Sts1CobcSw/Hal/Communication.hpp>
 #include <Sts1CobcSw/Hal/GpioPin.hpp>
 #include <Sts1CobcSw/Hal/IoNames.hpp>
@@ -393,7 +394,7 @@ auto ReturnResult() -> Result<ResultInfo>
         if(resultInfo.value().reachedEof)
         {
             RODOS::PRINTF(" ResultResultRetry() reached EOF\n");
-            return {/*reachedEof*/ true, totalResultSize};
+            return ResultInfo{.reachedEof = true, .resultSize = totalResultSize};
         }
 
         // END DEBUG
@@ -403,7 +404,7 @@ auto ReturnResult() -> Result<ResultInfo>
         totalResultSize += resultInfo.value().resultSize;
         packets++;
     }
-    return {false, totalResultSize};
+    return ResultInfo{.reachedEof = false, .resultSize = totalResultSize};
 }
 
 
@@ -479,7 +480,7 @@ auto ReturnResultCommunication() -> Result<edu::ResultInfo>
     }
     if(command == cmdEof)
     {
-        return {/*reachedEof*/ true, 0_usize};
+        return ResultInfo{.reachedEof = true, .resultSize = 0_usize};
     }
     if(command != cmdData)
     {
@@ -532,7 +533,7 @@ auto ReturnResultCommunication() -> Result<edu::ResultInfo>
     RODOS::PRINTF("\nSuccess\n");
     // END DEBUG
 
-    return {false, actualDataLength};
+    return ResultInfo{.reachedEof = false, .resultSize = actualDataLength};
 }
 
 
@@ -698,6 +699,7 @@ auto UartReceive(void * destination) -> Result<void>
     {
         return ErrorCode::timeout;
     }
+    return outcome_v2::success();
 }