Adaptions for EM #264

Merged
muellerr merged 2 commits from meier/q7s-em into develop 2022-05-28 12:21:50 +02:00
Owner
  • adaptions to run OBSW on Q7S EM
* adaptions to run OBSW on Q7S EM
meierj added 1 commit 2022-05-27 13:46:35 +02:00
adaptions for EM
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
9e93f1c814
meierj requested review from muellerr 2022-05-27 13:46:42 +02:00
muellerr requested changes 2022-05-27 14:36:41 +02:00
@ -11,2 +11,4 @@
#include "OBSWVersion.h"
// Set to 1 when software is build for EM
#define EM 0
Owner

There is a dedicated preprocessor define inside q7sConfig.h called OBSW_Q7S_EM

There is a dedicated preprocessor define inside `q7sConfig.h` called `OBSW_Q7S_EM`
muellerr marked this conversation as resolved
@ -102,9 +102,13 @@ void Factory::setStaticFrameworkObjectIds() {
CommandingServiceBase::defaultPacketSource = objects::PUS_PACKET_DISTRIBUTOR;
CommandingServiceBase::defaultPacketDestination = objects::TM_FUNNEL;
#if EM == 1
Owner

There is a dedicated preprocessor define inside q7sConfig.h called OBSW_Q7S_EM

There is a dedicated preprocessor define inside `q7sConfig.h` called `OBSW_Q7S_EM`
muellerr marked this conversation as resolved
@ -38,9 +38,13 @@ void ObjectFactory::produce(void* args) {
createSolarArrayDeploymentComponents();
createPlPcduComponents(gpioComIF, spiMainComIF, pwrSwitcher);
#if OBSW_ADD_SYRLINKS == 1
#if EM == 1
Owner

There is a dedicated preprocessor define inside q7sConfig.h called OBSW_Q7S_EM

There is a dedicated preprocessor define inside `q7sConfig.h` called `OBSW_Q7S_EM`
muellerr marked this conversation as resolved
muellerr added this to the v1.12.0 milestone 2022-05-27 15:27:07 +02:00
meierj added 1 commit 2022-05-27 16:24:53 +02:00
replaced EM preprocessor define
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good
8106722a08
muellerr approved these changes 2022-05-28 12:21:42 +02:00
muellerr merged commit 3d1e104fa4 into develop 2022-05-28 12:21:50 +02:00
Sign in to join this conversation.
No description provided.