From 964e0a3d8ee663aa321908621817ece5c089bf7a Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 10 Oct 2022 17:41:52 +0200 Subject: [PATCH 1/3] re-run afmt --- bsp_hosted/ObjectFactory.cpp | 1 + bsp_q7s/core/InitMission.cpp | 2 +- linux/ObjectFactory.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bsp_hosted/ObjectFactory.cpp b/bsp_hosted/ObjectFactory.cpp index ef5d3c98..28762871 100644 --- a/bsp_hosted/ObjectFactory.cpp +++ b/bsp_hosted/ObjectFactory.cpp @@ -43,6 +43,7 @@ #include #include #include + #include "dummies/helpers.h" #include "mission/utility/GlobalConfigHandler.h" diff --git a/bsp_q7s/core/InitMission.cpp b/bsp_q7s/core/InitMission.cpp index 4e5efe52..a5cc3df9 100644 --- a/bsp_q7s/core/InitMission.cpp +++ b/bsp_q7s/core/InitMission.cpp @@ -217,7 +217,7 @@ void initmission::initTasks() { #if OBSW_ADD_TCS_CTRL == 1 tcsTask->addComponent(objects::THERMAL_CONTROLLER); #endif - + #if OBSW_ADD_STAR_TRACKER == 1 PeriodicTaskIF* strHelperTask = factory->createPeriodicTask( "STR_HELPER", 20, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.2, missedDeadlineFunc); diff --git a/linux/ObjectFactory.cpp b/linux/ObjectFactory.cpp index c68d27df..ff7060fb 100644 --- a/linux/ObjectFactory.cpp +++ b/linux/ObjectFactory.cpp @@ -328,7 +328,7 @@ void ObjectFactory::createScexComponents(std::string uartDev, PowerSwitchIF* pwr std::optional switchId) { auto* cookie = new UartCookie(objects::SCEX, uartDev, uart::SCEX_BAUD, 4096); cookie->setTwoStopBits(); - //cookie->setParityEven(); + // cookie->setParityEven(); auto scexUartReader = new ScexUartReader(objects::SCEX_UART_READER); auto scexHandler = new ScexDeviceHandler(objects::SCEX, *scexUartReader, cookie, mountedIF); if (onImmediately) { From 74f053ae5d80335208cce339b147fc6fcb71812a Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 10 Oct 2022 17:44:58 +0200 Subject: [PATCH 2/3] bump subversion --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9200010b..04362a82 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ cmake_minimum_required(VERSION 3.13) set(OBSW_VERSION_MAJOR_IF_GIT_FAILS 1) -set(OBSW_VERSION_MINOR_IF_GIT_FAILS 13) +set(OBSW_VERSION_MINOR_IF_GIT_FAILS 14) set(OBSW_VERSION_REVISION_IF_GIT_FAILS 0) # set(CMAKE_VERBOSE TRUE) From 7f3d827a6e0cd74267aa2b9d9cad7448bbe28a6e Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 10 Oct 2022 18:00:43 +0200 Subject: [PATCH 3/3] move finish action call --- mission/devices/ScexDeviceHandler.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mission/devices/ScexDeviceHandler.cpp b/mission/devices/ScexDeviceHandler.cpp index c49192a7..1cc2cd39 100644 --- a/mission/devices/ScexDeviceHandler.cpp +++ b/mission/devices/ScexDeviceHandler.cpp @@ -98,7 +98,6 @@ ReturnValue_t ScexDeviceHandler::buildCommandFromCommand(DeviceCommandId_t devic prepareScexCmd(cmdTyped, {cmdBuf.data(), cmdBuf.size()}, rawPacketLen, {commandData + 1, commandDataLen - 1}, tempCheck); updatePeriodicReply(true, deviceCommand); - finishAction(true, deviceCommand, OK); break; } case (ONE_CELL): { @@ -108,7 +107,6 @@ ReturnValue_t ScexDeviceHandler::buildCommandFromCommand(DeviceCommandId_t devic prepareScexCmd(cmdTyped, {cmdBuf.data(), cmdBuf.size()}, rawPacketLen, {commandData + 1, commandDataLen - 1}, tempCheck); updatePeriodicReply(true, deviceCommand); - finishAction(true, deviceCommand, OK); break; } case (ALL_CELLS_CMD): { @@ -117,7 +115,6 @@ ReturnValue_t ScexDeviceHandler::buildCommandFromCommand(DeviceCommandId_t devic finishCountdown.resetTimer(); prepareScexCmd(cmdTyped, {cmdBuf.data(), cmdBuf.size()}, rawPacketLen, {commandData + 1, commandDataLen - 1}, tempCheck); - finishAction(true, deviceCommand, OK); updatePeriodicReply(true, deviceCommand); break; } @@ -175,14 +172,17 @@ ReturnValue_t ScexDeviceHandler::handleValidReply(size_t remSize, DeviceCommandI sif::info << "ScexDeviceHandler::handleValidReply: RemMillis: " << remainingMillis << std::endl; } + finishAction(true, helper.getCmd(), OK); result = APERIODIC_REPLY; break; } case (ONE_CELL): { + finishAction(true, helper.getCmd(), OK); result = APERIODIC_REPLY; break; } case (ALL_CELLS_CMD): { + finishAction(true, helper.getCmd(), OK); result = APERIODIC_REPLY; break; }