eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

Adaptions for EM #264

Merged
muellerr merged 2 commits from meier/q7s-em into develop 2022-05-28 12:21:50 +02:00
Conversation 0 Commits 2 Files Changed 4 +17 -5
meierj commented 2022-05-27 13:46:32 +02:00
Owner
Copy Link
  • 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...
Details
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details
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
bsp_q7s/OBSWConfig.h.in Outdated
@ -11,2 +11,4 @@
#include "OBSWVersion.h"
// Set to 1 when software is build for EM
#define EM 0
muellerr commented 2022-05-27 14:36:10 +02:00
Owner
Copy Link

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
bsp_q7s/core/ObjectFactory.cpp Outdated
@ -102,9 +102,13 @@ void Factory::setStaticFrameworkObjectIds() {
CommandingServiceBase::defaultPacketSource = objects::PUS_PACKET_DISTRIBUTOR;
CommandingServiceBase::defaultPacketDestination = objects::TM_FUNNEL;
#if EM == 1
muellerr commented 2022-05-27 14:36:22 +02:00
Owner
Copy Link

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
bsp_q7s/em/emObjectFactory.cpp Outdated
@ -38,9 +38,13 @@ void ObjectFactory::produce(void* args) {
createSolarArrayDeploymentComponents();
createPlPcduComponents(gpioComIF, spiMainComIF, pwrSwitcher);
#if OBSW_ADD_SYRLINKS == 1
#if EM == 1
muellerr commented 2022-05-27 14:36:28 +02:00
Owner
Copy Link

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
Details
EIVE/eive-obsw/pipeline/head This commit looks good
Details
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.
Reviewers
No reviewers
muellerr
Labels
Clear labels   
OPS TODO

Issues identified by OPS

  
api change

API change

  
breaking api change

API change which can break existing code

  
bug

Something is not working

  
documentation

Documentation

  
duplicate

This issue or pull request already exists

  
feature

New feature

  
help wanted

Need some help

  
invalid

Something is wrong

  
question

More information is needed

  
wontfix

This won't be fixed

No Label
OPS TODO
api change
breaking api change
bug
documentation
duplicate
feature
help wanted
invalid
question
wontfix
Milestone
Clear milestone
No items
No Milestone
v1.12.0
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: eive/eive-obsw#264
No description provided.
Delete Branch "meier/q7s-em"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?