diff --git a/bsp_linux_board/main.cpp b/bsp_linux_board/main.cpp index 0ecb56d9..2f8ac4bc 100644 --- a/bsp_linux_board/main.cpp +++ b/bsp_linux_board/main.cpp @@ -3,8 +3,8 @@ #include "InitMission.h" #include "OBSWConfig.h" #include "OBSWVersion.h" -#include "fsfw/version.h" #include "fsfw/tasks/TaskFactory.h" +#include "fsfw/version.h" #ifdef RASPBERRY_PI static const char* const BOARD_NAME = "Raspberry Pi"; @@ -22,8 +22,7 @@ int main(void) { std::cout << "-- EIVE OBSW --" << std::endl; std::cout << "-- Compiled for Linux board " << BOARD_NAME << " --" << std::endl; std::cout << "-- OBSW " << SW_NAME << " v" << SW_VERSION << "." << SW_SUBVERSION << "." - << SW_REVISION << ", FSFW v" << fsfw::FSFW_VERSION - << "--" << std::endl; + << SW_REVISION << ", FSFW v" << fsfw::FSFW_VERSION << "--" << std::endl; std::cout << "-- " << __DATE__ << " " << __TIME__ << " --" << std::endl; initmission::initMission(); diff --git a/mission/tmtc/CCSDSHandler.h b/mission/tmtc/CCSDSHandler.h index f6f2fff3..a916361b 100644 --- a/mission/tmtc/CCSDSHandler.h +++ b/mission/tmtc/CCSDSHandler.h @@ -135,7 +135,7 @@ class CCSDSHandler : public SystemObject, // syrlinks must not be transmitting more than 15 minutes (according to datasheet) // Value can be configured via CTOR argument to allow test setups - const uint32_t TRANSMITTER_TIMEOUT = 900000; // 900000 ms = 15 min + const uint32_t TRANSMITTER_TIMEOUT = 900000; // 900000 ms = 15 min // Countdown to disable transmitter after 15 minutes Countdown transmitterCountdown; diff --git a/mission/utility/TmFunnel.h b/mission/utility/TmFunnel.h index b0980c28..f11dce63 100644 --- a/mission/utility/TmFunnel.h +++ b/mission/utility/TmFunnel.h @@ -43,7 +43,6 @@ class TmFunnel : public AcceptsTelemetryIF, public ExecutableObjectIF, public Sy StorageManagerIF* tmStore = nullptr; - ReturnValue_t handlePacket(TmTcMessage* message); };