From 6d322c6e7895537f988011cf686b6e6d22cecaa1 Mon Sep 17 00:00:00 2001 From: Jakob Meier Date: Sat, 30 Apr 2022 16:21:59 +0200 Subject: [PATCH] run clang format script --- bsp_q7s/main.cpp | 1 - .../devicedefinitions/PlocMPSoCDefinitions.h | 1 - .../PlocSupervisorDefinitions.h | 10 +++---- .../devicedefinitions/SupvReturnValuesIF.h | 6 ++-- linux/devices/ploc/PlocMPSoCHandler.cpp | 28 +++++++++---------- linux/devices/ploc/PlocSupervisorHandler.h | 5 ++-- linux/devices/ploc/PlocSupvHelper.h | 10 +++---- linux/devices/startracker/StrHelper.cpp | 2 +- mission/tmtc/VirtualChannel.cpp | 4 +-- mission/utility/Filenaming.cpp | 6 ++-- mission/utility/Filenaming.h | 1 + mission/utility/ProgressPrinter.cpp | 4 ++- mission/utility/ProgressPrinter.h | 2 -- 13 files changed, 38 insertions(+), 42 deletions(-) diff --git a/bsp_q7s/main.cpp b/bsp_q7s/main.cpp index 81616954..dfcaebf0 100644 --- a/bsp_q7s/main.cpp +++ b/bsp_q7s/main.cpp @@ -6,7 +6,6 @@ #include "simple/simple.h" #endif - #include /** diff --git a/linux/devices/devicedefinitions/PlocMPSoCDefinitions.h b/linux/devices/devicedefinitions/PlocMPSoCDefinitions.h index ee16339d..b2efb035 100644 --- a/linux/devices/devicedefinitions/PlocMPSoCDefinitions.h +++ b/linux/devices/devicedefinitions/PlocMPSoCDefinitions.h @@ -32,7 +32,6 @@ static const DeviceCommandId_t TM_CAM_CMD_RPT = 19; static const DeviceCommandId_t SET_UART_TX_TRISTATE = 20; static const DeviceCommandId_t RELEASE_UART_TX = 21; - // Will reset the sequence count of the OBSW static const DeviceCommandId_t OBSW_RESET_SEQ_COUNT = 50; diff --git a/linux/devices/devicedefinitions/PlocSupervisorDefinitions.h b/linux/devices/devicedefinitions/PlocSupervisorDefinitions.h index dbc7812c..4ce2b2d0 100644 --- a/linux/devices/devicedefinitions/PlocSupervisorDefinitions.h +++ b/linux/devices/devicedefinitions/PlocSupervisorDefinitions.h @@ -1564,9 +1564,8 @@ class ExecutionReport : public VerificationReport { break; } case StatusCode::NOTHING_TODO: { - sif::warning - << STATUS_PRINTOUT_PREFIX << "Nothing todo, not an error but a warning" - << std::endl; + sif::warning << STATUS_PRINTOUT_PREFIX << "Nothing todo, not an error but a warning" + << std::endl; break; } case StatusCode::POWER_FAULT: { @@ -1578,9 +1577,8 @@ class ExecutionReport : public VerificationReport { break; } case StatusCode::OUT_OF_RANGE: { - sif::warning - << STATUS_PRINTOUT_PREFIX << "Out of range, lenght check of parameter failed" - << std::endl; + sif::warning << STATUS_PRINTOUT_PREFIX << "Out of range, lenght check of parameter failed" + << std::endl; break; } case StatusCode::OUT_OF_HEAP_MEMORY: { diff --git a/linux/devices/devicedefinitions/SupvReturnValuesIF.h b/linux/devices/devicedefinitions/SupvReturnValuesIF.h index 39fa4554..307deb0e 100644 --- a/linux/devices/devicedefinitions/SupvReturnValuesIF.h +++ b/linux/devices/devicedefinitions/SupvReturnValuesIF.h @@ -50,9 +50,11 @@ class SupvReturnValuesIF { static const ReturnValue_t FILENAME_TOO_LONG = MAKE_RETURN_CODE(0xB0); //! [EXPORT] : [COMMENT] Received update status report with invalid packet length field static const ReturnValue_t UPDATE_STATUS_REPORT_INVALID_LENGTH = MAKE_RETURN_CODE(0xB1); - //! [EXPORT] : [COMMENT] Update status report does not contain expected CRC. There might be a bit flip in the update memory region. + //! [EXPORT] : [COMMENT] Update status report does not contain expected CRC. There might be a bit + //! flip in the update memory region. static const ReturnValue_t UPDATE_CRC_FAILURE = MAKE_RETURN_CODE(0xB2); - //! [EXPORT] : [COMMENT] Supervisor helper task ist currently executing a command (wait until helper tas has finished or interrupt by sending the terminate command) + //! [EXPORT] : [COMMENT] Supervisor helper task ist currently executing a command (wait until + //! helper tas has finished or interrupt by sending the terminate command) static const ReturnValue_t SUPV_HELPER_EXECUTING = MAKE_RETURN_CODE(0xB3); }; diff --git a/linux/devices/ploc/PlocMPSoCHandler.cpp b/linux/devices/ploc/PlocMPSoCHandler.cpp index da0b0071..0d943cc2 100644 --- a/linux/devices/ploc/PlocMPSoCHandler.cpp +++ b/linux/devices/ploc/PlocMPSoCHandler.cpp @@ -99,19 +99,19 @@ void PlocMPSoCHandler::performOperationHook() { ReturnValue_t PlocMPSoCHandler::executeAction(ActionId_t actionId, MessageQueueId_t commandedBy, const uint8_t* data, size_t size) { ReturnValue_t result = RETURN_OK; - switch(actionId) { - case mpsoc::SET_UART_TX_TRISTATE: { - uartIsolatorSwitch.pullLow(); - return EXECUTION_FINISHED; - break; - } - case mpsoc::RELEASE_UART_TX: { - uartIsolatorSwitch.pullHigh(); - return EXECUTION_FINISHED; - break; - default: - break; - } + switch (actionId) { + case mpsoc::SET_UART_TX_TRISTATE: { + uartIsolatorSwitch.pullLow(); + return EXECUTION_FINISHED; + break; + } + case mpsoc::RELEASE_UART_TX: { + uartIsolatorSwitch.pullHigh(); + return EXECUTION_FINISHED; + break; + default: + break; + } } if (plocMPSoCHelperExecuting) { @@ -165,7 +165,7 @@ void PlocMPSoCHandler::doStartUp() { powerState = PowerState::ON; setMode(_MODE_TO_ON); uartIsolatorSwitch.pullHigh(); -#endif/* not MSPOC_JTAG_BOOT == 1 */ +#endif /* not MSPOC_JTAG_BOOT == 1 */ #else powerState = PowerState::ON; setMode(_MODE_TO_ON); diff --git a/linux/devices/ploc/PlocSupervisorHandler.h b/linux/devices/ploc/PlocSupervisorHandler.h index efab17c0..17371021 100644 --- a/linux/devices/ploc/PlocSupervisorHandler.h +++ b/linux/devices/ploc/PlocSupervisorHandler.h @@ -2,16 +2,16 @@ #define MISSION_DEVICES_PLOCSUPERVISORHANDLER_H_ #include "OBSWConfig.h" +#include "PlocSupvHelper.h" #include "bsp_q7s/memory/SdCardManager.h" #include "devices/powerSwitcherList.h" #include "fsfw/devicehandlers/DeviceHandlerBase.h" +#include "fsfw/timemanager/Countdown.h" #include "fsfw_hal/linux/gpio/Gpio.h" #include "fsfw_hal/linux/gpio/LinuxLibgpioIF.h" #include "fsfw_hal/linux/uart/UartComIF.h" -#include "fsfw/timemanager/Countdown.h" #include "linux/devices/devicedefinitions/PlocSupervisorDefinitions.h" #include "linux/devices/devicedefinitions/SupvReturnValuesIF.h" -#include "PlocSupvHelper.h" /** * @brief This is the device handler for the supervisor of the PLOC which is programmed by @@ -59,7 +59,6 @@ class PlocSupervisorHandler : public DeviceHandlerBase { virtual ReturnValue_t doSendReadHook() override; private: - static const uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::PLOC_SUPERVISOR_HANDLER; //! [EXPORT] : [COMMENT] PLOC supervisor crc failure in telemetry packet diff --git a/linux/devices/ploc/PlocSupvHelper.h b/linux/devices/ploc/PlocSupvHelper.h index f8002baf..e4f0d40a 100644 --- a/linux/devices/ploc/PlocSupvHelper.h +++ b/linux/devices/ploc/PlocSupvHelper.h @@ -64,13 +64,11 @@ class PlocSupvHelper : public SystemObject, public ExecutableObjectIF, public Ha //! [EXPORT] : [COMMENT] Execution report failure //! P1: static const Event SUPV_EXE_FAILURE_REPORT = MAKE_EVENT(12, severity::LOW); - //! [EXPORT] : [COMMENT] Supervisor expected acknowledgment report but received space packet with other apid - //! P1: Apid of received space packet - //! P2: Internal state of supervisor helper + //! [EXPORT] : [COMMENT] Supervisor expected acknowledgment report but received space packet with + //! other apid P1: Apid of received space packet P2: Internal state of supervisor helper static const Event SUPV_ACK_INVALID_APID = MAKE_EVENT(13, severity::LOW); - //! [EXPORT] : [COMMENT] Supervisor helper expected execution report but received space packet with other apid - //! P1: Apid of received space packet - //! P2: Internal state of supervisor helper + //! [EXPORT] : [COMMENT] Supervisor helper expected execution report but received space packet + //! with other apid P1: Apid of received space packet P2: Internal state of supervisor helper static const Event SUPV_EXE_INVALID_APID = MAKE_EVENT(14, severity::LOW); //! [EXPORT] : [COMMENT] Failed to receive acknowledgment report //! P1: Return value diff --git a/linux/devices/startracker/StrHelper.cpp b/linux/devices/startracker/StrHelper.cpp index ebe7b077..b2f02f24 100644 --- a/linux/devices/startracker/StrHelper.cpp +++ b/linux/devices/startracker/StrHelper.cpp @@ -6,9 +6,9 @@ #include "OBSWConfig.h" #include "fsfw/timemanager/Countdown.h" #include "linux/devices/devicedefinitions/StarTrackerDefinitions.h" +#include "mission/utility/Filenaming.h" #include "mission/utility/ProgressPrinter.h" #include "mission/utility/Timestamp.h" -#include "mission/utility/Filenaming.h" StrHelper::StrHelper(object_id_t objectId) : SystemObject(objectId) {} diff --git a/mission/tmtc/VirtualChannel.cpp b/mission/tmtc/VirtualChannel.cpp index b2abf3f0..2dc32d0f 100644 --- a/mission/tmtc/VirtualChannel.cpp +++ b/mission/tmtc/VirtualChannel.cpp @@ -30,8 +30,8 @@ ReturnValue_t VirtualChannel::performOperation() { uint8_t data[50] = {0xa}; result = ptme->writeToVc(vcId, data, sizeof(data)); if (result != RETURN_OK) { - sif::warning << "VirtualChannel::performOperation: Failed to send test data" << std::endl; - return result; + sif::warning << "VirtualChannel::performOperation: Failed to send test data" << std::endl; + return result; } while (tmQueue->receiveMessage(&message) == RETURN_OK) { diff --git a/mission/utility/Filenaming.cpp b/mission/utility/Filenaming.cpp index b64d1f01..3f4ec997 100644 --- a/mission/utility/Filenaming.cpp +++ b/mission/utility/Filenaming.cpp @@ -1,11 +1,11 @@ #include "Filenaming.h" + #include "Timestamp.h" -Filenaming::Filenaming() { -} +Filenaming::Filenaming() {} std::string Filenaming::generateAbsoluteFilename(std::string path, std::string filename, - bool addTimestamp) { + bool addTimestamp) { std::string absoluteName; Timestamp timestamp; if (addTimestamp) { diff --git a/mission/utility/Filenaming.h b/mission/utility/Filenaming.h index 201cf78a..9c7b1cb8 100644 --- a/mission/utility/Filenaming.h +++ b/mission/utility/Filenaming.h @@ -20,6 +20,7 @@ class Filenaming { */ static std::string generateAbsoluteFilename(std::string path, std::string filename, bool addTimestamp); + private: Filenaming(); }; diff --git a/mission/utility/ProgressPrinter.cpp b/mission/utility/ProgressPrinter.cpp index 9505d7b1..50e2d14b 100644 --- a/mission/utility/ProgressPrinter.cpp +++ b/mission/utility/ProgressPrinter.cpp @@ -1,5 +1,7 @@ -#include #include "ProgressPrinter.h" + +#include + #include "fsfw/serviceinterface/ServiceInterfaceStream.h" ProgressPrinter::ProgressPrinter(std::string name, uint32_t numSteps, float percentageResolution) diff --git a/mission/utility/ProgressPrinter.h b/mission/utility/ProgressPrinter.h index 302aaa28..9db27c7d 100644 --- a/mission/utility/ProgressPrinter.h +++ b/mission/utility/ProgressPrinter.h @@ -10,7 +10,6 @@ */ class ProgressPrinter { public: - static constexpr float HALF_PERCENT = 0.5; static constexpr float ONE_PERCENT = 1; static constexpr float FIVE_PERCENT = 5; @@ -34,7 +33,6 @@ class ProgressPrinter { void print(uint32_t step); private: - std::string name = ""; uint32_t numSteps = 0; float nextProgressPrint = 0;