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

fixed conflicts

Browse Source
This commit is contained in:
Jakob Meier
2022-03-14 14:35:07 +01:00
parent 1133ea08c8 e8ced3c4c4
commit 9fc1e57943
398 changed files with 38751 additions and 31799 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

7
linux/fsfwconfig/pollingsequence/pollingSequenceFactory.h
View File

@ -32,7 +32,7 @@ class FixedTimeslotTaskIF;
namespace pst {
/* 0.4 second period init*/
ReturnValue_t pstGpio(FixedTimeslotTaskIF *thisSequence);
ReturnValue_t pstGpio(FixedTimeslotTaskIF* thisSequence);
/**
* @brief This function creates the PST for all gomspace devices.
@ -40,7 +40,7 @@ ReturnValue_t pstGpio(FixedTimeslotTaskIF *thisSequence);
* Scheduled in a separate PST because the gomspace library uses blocking calls when requesting
* data from devices.
*/
ReturnValue_t pstGompaceCan(FixedTimeslotTaskIF *thisSequence);
ReturnValue_t pstGompaceCan(FixedTimeslotTaskIF* thisSequence);
ReturnValue_t pstUart(FixedTimeslotTaskIF* thisSequence);
@ -62,7 +62,6 @@ ReturnValue_t pstTest(FixedTimeslotTaskIF* thisSequence);
ReturnValue_t pollingSequenceTE0720(FixedTimeslotTaskIF* thisSequence);
#endif
}
} // namespace pst
#endif /* POLLINGSEQUENCEINIT_H_ */