eive/eive-obsw
eive/eive-obsw
12
3
Fork 0
Code Issues 4 Pull Requests 2 Releases 119 Wiki Activity

conditional build of STR components
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller 2023-04-13 21:14:38 +02:00
parent ae66820b52
commit 3e3ac9f5be
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
linux/acs/CMakeLists.txt
View File

@ -1,6 +1,10 @@
target_sources( target_sources(${OBSW_NAME} PUBLIC AcsBoardPolling.cpp ImtqPollingTask.cpp
${OBSW_NAME} PUBLIC AcsBoardPolling.cpp ImtqPollingTask.cpp RwPollingTask.cpp RwPollingTask.cpp SusPolling.cpp)
SusPolling.cpp StrComHandler.cpp)
# Dependency on proprietary library
if(TGT_BSP MATCHES "arm/q7s")
target_sources(${OBSW_NAME} PUBLIC StrComHandler.cpp)
endif()
if(EIVE_BUILD_GPSD_GPS_HANDLER) if(EIVE_BUILD_GPSD_GPS_HANDLER)
target_sources(${OBSW_NAME} PRIVATE GpsHyperionLinuxController.cpp) target_sources(${OBSW_NAME} PRIVATE GpsHyperionLinuxController.cpp)

2
linux/acs/StrComHandler.cpp
View File

@ -451,7 +451,7 @@ ReturnValue_t StrComHandler::performFlashWrite() {
return returnvalue::OK; return returnvalue::OK;
} }
result = writeNextSegment(idx); result = writeNextSegment(idx);
if(result != returnvalue::OK) { if (result != returnvalue::OK) {
return result; return result;
} }
if (idx % 50 == 0) { if (idx % 50 == 0) {

4
mission/acs/str/ArcsecJsonParamBase.cpp
View File

@ -1,8 +1,8 @@
#include "arcsecJsonKeys.h"
#include <mission/acs/str/ArcsecJsonParamBase.h> #include <mission/acs/str/ArcsecJsonParamBase.h>
#include <mission/acs/str/arcsecJsonKeys.h> #include <mission/acs/str/arcsecJsonKeys.h>
#include "arcsecJsonKeys.h"
extern "C" { extern "C" {
#include <wire/common/genericstructs.h> #include <wire/common/genericstructs.h>
} }

4
unittest/controller/testThermalController.cpp
View File

@ -47,8 +47,8 @@ TEST_CASE("Thermal Controller", "[ThermalController]") {
CommandMessage modeMessage; CommandMessage modeMessage;
ModeMessage::setModeMessage(&modeMessage, ModeMessage::CMD_MODE_COMMAND, ModeMessage::setModeMessage(&modeMessage, ModeMessage::CMD_MODE_COMMAND, HasModesIF::MODE_ON,
HasModesIF::MODE_ON, HasModesIF::SUBMODE_NONE); HasModesIF::SUBMODE_NONE);
MessageQueueIF* commandQueue = MessageQueueIF* commandQueue =
QueueFactory::instance()->createMessageQueue(5, MessageQueueMessage::MAX_MESSAGE_SIZE); QueueFactory::instance()->createMessageQueue(5, MessageQueueMessage::MAX_MESSAGE_SIZE);