From ace01e2742303a6f6c6cfa5d47c226f1ce20177b Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 13 Mar 2023 11:05:21 +0100 Subject: [PATCH] afmt --- .../devicedefinitions/PlocMPSoCDefinitions.h | 72 +++++++++---------- linux/devices/ploc/PlocMPSoCHandler.cpp | 18 ++--- mission/controller/acs/ActuatorCmd.cpp | 2 +- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/linux/devices/devicedefinitions/PlocMPSoCDefinitions.h b/linux/devices/devicedefinitions/PlocMPSoCDefinitions.h index 7895adf9..ef769eef 100644 --- a/linux/devices/devicedefinitions/PlocMPSoCDefinitions.h +++ b/linux/devices/devicedefinitions/PlocMPSoCDefinitions.h @@ -675,24 +675,24 @@ class TcCamTakePic : public TcBase { : TcBase(params, apid::TC_CAM_TAKE_PIC, sequenceCount) {} ReturnValue_t initPacket(const uint8_t* commandData, size_t commandDataLen) override { - if (commandDataLen > MAX_DATA_LENGTH) { - return INVALID_LENGTH; - } - std::string fileName(reinterpret_cast(commandData)); - if (fileName.size() + sizeof(NULL_TERMINATOR) > MAX_FILENAME_SIZE) { - return FILENAME_TOO_LONG; - } - if (commandDataLen - (fileName.size() + sizeof(NULL_TERMINATOR)) != PARAMETER_SIZE) { - return INVALID_LENGTH; - } - spParams.setFullPayloadLen(commandDataLen + CRC_SIZE); - std::memcpy(payloadStart, commandData, commandDataLen); - return returnvalue::OK; + if (commandDataLen > MAX_DATA_LENGTH) { + return INVALID_LENGTH; } + std::string fileName(reinterpret_cast(commandData)); + if (fileName.size() + sizeof(NULL_TERMINATOR) > MAX_FILENAME_SIZE) { + return FILENAME_TOO_LONG; + } + if (commandDataLen - (fileName.size() + sizeof(NULL_TERMINATOR)) != PARAMETER_SIZE) { + return INVALID_LENGTH; + } + spParams.setFullPayloadLen(commandDataLen + CRC_SIZE); + std::memcpy(payloadStart, commandData, commandDataLen); + return returnvalue::OK; + } - private: - static const size_t MAX_DATA_LENGTH = 286; - static const size_t PARAMETER_SIZE = 28; + private: + static const size_t MAX_DATA_LENGTH = 286; + static const size_t PARAMETER_SIZE = 28; }; /** @@ -704,20 +704,20 @@ class TcSimplexSendFile : public TcBase { : TcBase(params, apid::TC_SIMPLEX_SEND_FILE, sequenceCount) {} ReturnValue_t initPacket(const uint8_t* commandData, size_t commandDataLen) override { - if (commandDataLen > MAX_DATA_LENGTH) { - return INVALID_LENGTH; - } - std::string fileName(reinterpret_cast(commandData)); - if (fileName.size() + sizeof(NULL_TERMINATOR) > MAX_FILENAME_SIZE) { - return FILENAME_TOO_LONG; - } - spParams.setFullPayloadLen(commandDataLen + CRC_SIZE); - std::memcpy(payloadStart, commandData, commandDataLen); - return returnvalue::OK; + if (commandDataLen > MAX_DATA_LENGTH) { + return INVALID_LENGTH; } + std::string fileName(reinterpret_cast(commandData)); + if (fileName.size() + sizeof(NULL_TERMINATOR) > MAX_FILENAME_SIZE) { + return FILENAME_TOO_LONG; + } + spParams.setFullPayloadLen(commandDataLen + CRC_SIZE); + std::memcpy(payloadStart, commandData, commandDataLen); + return returnvalue::OK; + } - private: - static const size_t MAX_DATA_LENGTH = 256; + private: + static const size_t MAX_DATA_LENGTH = 256; }; /** @@ -729,16 +729,16 @@ class TcDownlinkDataModulate : public TcBase { : TcBase(params, apid::TC_DOWNLINK_DATA_MODULATE, sequenceCount) {} ReturnValue_t initPacket(const uint8_t* commandData, size_t commandDataLen) override { - if (commandDataLen > MAX_DATA_LENGTH) { - return INVALID_LENGTH; - } - spParams.setFullPayloadLen(commandDataLen + CRC_SIZE); - std::memcpy(payloadStart, commandData, commandDataLen); - return returnvalue::OK; + if (commandDataLen > MAX_DATA_LENGTH) { + return INVALID_LENGTH; } + spParams.setFullPayloadLen(commandDataLen + CRC_SIZE); + std::memcpy(payloadStart, commandData, commandDataLen); + return returnvalue::OK; + } - private: - static const size_t MAX_DATA_LENGTH = 11; + private: + static const size_t MAX_DATA_LENGTH = 11; }; class TcCamcmdSend : public TcBase { diff --git a/linux/devices/ploc/PlocMPSoCHandler.cpp b/linux/devices/ploc/PlocMPSoCHandler.cpp index f756bff9..5b53e089 100644 --- a/linux/devices/ploc/PlocMPSoCHandler.cpp +++ b/linux/devices/ploc/PlocMPSoCHandler.cpp @@ -260,20 +260,20 @@ ReturnValue_t PlocMPSoCHandler::buildCommandFromCommand(DeviceCommandId_t device break; } case (mpsoc::TC_CAM_TAKE_PIC): { - result = prepareTcCamTakePic(commandData, commandDataLen); + result = prepareTcCamTakePic(commandData, commandDataLen); break; } case (mpsoc::TC_SIMPLEX_SEND_FILE): { - result = prepareTcSimplexSendFile(commandData, commandDataLen); + result = prepareTcSimplexSendFile(commandData, commandDataLen); break; } case (mpsoc::TC_DOWNLINK_DATA_MODULATE): { - result = prepareTcDownlinkDataModulate(commandData, commandDataLen); + result = prepareTcDownlinkDataModulate(commandData, commandDataLen); break; } case (mpsoc::TC_MODE_SNAPSHOT): { - result = prepareTcModeSnapshot(); - break; + result = prepareTcModeSnapshot(); + break; } default: sif::debug << "PlocMPSoCHandler::buildCommandFromCommand: Command not implemented" @@ -572,7 +572,7 @@ ReturnValue_t PlocMPSoCHandler::prepareTcCamTakePic(const uint8_t* commandData, } ReturnValue_t PlocMPSoCHandler::prepareTcSimplexSendFile(const uint8_t* commandData, - size_t commandDataLen) { + size_t commandDataLen) { ReturnValue_t result = returnvalue::OK; mpsoc::TcSimplexSendFile tcSimplexSendFile(spParams, sequenceCount); result = tcSimplexSendFile.buildPacket(commandData, commandDataLen); @@ -1187,9 +1187,9 @@ std::string PlocMPSoCHandler::getStatusString(uint16_t status) { break; } default: - std::stringstream ss; - ss << "0x" << std::hex << status; - return ss.str(); + std::stringstream ss; + ss << "0x" << std::hex << status; + return ss.str(); break; } return ""; diff --git a/mission/controller/acs/ActuatorCmd.cpp b/mission/controller/acs/ActuatorCmd.cpp index 457cacce..d2fe2d65 100644 --- a/mission/controller/acs/ActuatorCmd.cpp +++ b/mission/controller/acs/ActuatorCmd.cpp @@ -49,7 +49,7 @@ void ActuatorCmd::cmdSpeedToRws(int32_t speedRw0, int32_t speedRw1, int32_t spee } else if (rwCmdSpeed[i] < -maxRwSpeed) { rwCmdSpeed[i] = -maxRwSpeed; } - } + } } void ActuatorCmd::cmdDipolMtq(const double *dipolMoment, int16_t *dipolMomentActuator,