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 +4 -7
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8106722a08 - Show all commits

3
bsp_q7s/OBSWConfig.h.in
View File

@ -10,9 +10,6 @@
#include "q7sConfig.h"
#include "OBSWVersion.h"
// Set to 1 when software is build for EM
#define EM 0
/*******************************************************************/
/** All of the following flags should be enabled for mission code */
muellerr marked this conversation as resolved Outdated
muellerr commented 2022-05-27 14:36:10 +02:00
Outdated
Review
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`
/*******************************************************************/

4
bsp_q7s/core/ObjectFactory.cpp
View File

@ -102,11 +102,11 @@ void Factory::setStaticFrameworkObjectIds() {
CommandingServiceBase::defaultPacketSource = objects::PUS_PACKET_DISTRIBUTOR;
CommandingServiceBase::defaultPacketDestination = objects::TM_FUNNEL;
#if EM == 1
#if OBSW_Q7S_EM == 1
muellerr marked this conversation as resolved Outdated
muellerr commented 2022-05-27 14:36:22 +02:00
Outdated
Review
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`
DeviceHandlerBase::powerSwitcherId = objects::NO_OBJECT;
#else
DeviceHandlerBase::powerSwitcherId = objects::PCDU_HANDLER;
#endif /* EM == 1 */
#endif /* OBSW_Q7S_EM == 1 */
#if OBSW_TM_TO_PTME == 1
TmFunnel::downlinkDestination = objects::CCSDS_HANDLER;

4
bsp_q7s/em/emObjectFactory.cpp
View File

@ -38,11 +38,11 @@ void ObjectFactory::produce(void* args) {
createSolarArrayDeploymentComponents();
createPlPcduComponents(gpioComIF, spiMainComIF, pwrSwitcher);
#if OBSW_ADD_SYRLINKS == 1
#if EM == 1
#if OBSW_Q7S_EM == 1
muellerr marked this conversation as resolved Outdated
muellerr commented 2022-05-27 14:36:28 +02:00
Outdated
Review
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`
createSyrlinksComponents(nullptr);
#else
createSyrlinksComponents(pwrSwitcher);
#endif /* EM == 1 */
#endif /* OBSW_Q7S_EM == 1 */
#endif /* OBSW_ADD_SYRLINKS == 1 */
createRtdComponents(q7s::SPI_DEFAULT_DEV, gpioComIF, pwrSwitcher, spiMainComIF);
createPayloadComponents(gpioComIF);