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

Update FSFW and minor improvements #102

Merged
meierj merged 10 commits from mueller/update-gpio into develop 2021-09-27 15:25:41 +02:00
Conversation 1 Commits 10 Files Changed 11 +225 -209
10 changed files with 225 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0e43969b63 - Show all commits

4
bsp_q7s/core/InitMission.cpp
View File

@ -173,9 +173,13 @@ void initmission::createPstTasks(TaskFactory& factory,
missedDeadlineFunc); missedDeadlineFunc);
result = pst::pstSpi(spiPst); result = pst::pstSpi(spiPst);
if (result != HasReturnvaluesIF::RETURN_OK) { if (result != HasReturnvaluesIF::RETURN_OK) {
if(result != FixedTimeslotTaskIF::SLOT_LIST_EMPTY) {
sif::error << "InitMission::initTasks: Creating PST failed!" << std::endl; sif::error << "InitMission::initTasks: Creating PST failed!" << std::endl;
} }
}
else {
taskVec.push_back(spiPst); taskVec.push_back(spiPst);
}
#endif #endif
FixedTimeslotTaskIF* uartPst = factory.createFixedTimeslotTask( FixedTimeslotTaskIF* uartPst = factory.createFixedTimeslotTask(

2
fsfw

Submodule fsfw updated: e1a85b47c5...0987a160c9

11
linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp
View File

@ -536,9 +536,16 @@ ReturnValue_t pst::pstSpi(FixedTimeslotTaskIF *thisSequence) {
} }
#endif /* OBSW_ADD_ACS_BOARD == 1 */ #endif /* OBSW_ADD_ACS_BOARD == 1 */
if (thisSequence->checkSequence() != HasReturnvaluesIF::RETURN_OK) { ReturnValue_t seqCheck = thisSequence->checkSequence();
if (seqCheck != HasReturnvaluesIF::RETURN_OK) {
if(seqCheck == FixedTimeslotTaskIF::SLOT_LIST_EMPTY) {
sif::warning << "SPI PST is empty.." << std::endl;
}
else {
sif::error << "SPI PST initialization failed" << std::endl; sif::error << "SPI PST initialization failed" << std::endl;
return HasReturnvaluesIF::RETURN_FAILED; }
return seqCheck;
} }
return HasReturnvaluesIF::RETURN_OK; return HasReturnvaluesIF::RETURN_OK;
} }