eive/fsfw
15
1 Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

Merge upstream and apply auto-formatter #63

Merged
meierj merged 14 commits from merge-upstream into eive/develop 2022-04-21 13:54:24 +02:00
Conversation 1 Commits 14 Files Changed 21
+93 -95
muellerr commented 2022-04-21 10:38:13 +02:00
Owner
Copy link
Copy source
No description provided.
muellerr added 14 commits 2022-04-21 10:38:15 +02:00
get alternative reply from device command info 6c1db8473b
Merge branch 'development' into meier/alternativeReply c05184e1c4
progagate reply returnvalue 17771c0497
Merge pull request 'Alternative reply ID activation' (#595) from meier/alternativeReply into development afe006e234 
Reviewed-on: fsfw/fsfw#595
Merge branch 'development' into mueller/propagate-pool-manage-retval fe739aa81a
check serialize result as well acc4c8d975
delete data from ipc store if reply fails 7761b66fe2
Merge branch 'mueller/propagate-pool-manage-retval' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/propagate-pool-manage-retval c0f80680ef
added missing empty implementation 6aa54fe1d4
Merge pull request 'progagate reply returnvalue' (#597) from eive/fsfw:mueller/propagate-pool-manage-retval into development c04ca704d2 
Reviewed-on: fsfw/fsfw#597
added related PR in changelog 7c2e50b665
Merge branch 'development' into mueller/small-stm32-hal-bugifx b03a6684f9
Merge pull request 'added missing empty implementation in STM32 SPI HAL' (#599) from mueller/small-stm32-hal-bugifx into development 5ac88f2b15 
Reviewed-on: fsfw/fsfw#599
Merge remote-tracking branch 'upstream/development' into merge-upstream b128ef9da9
muellerr requested review from meierj 2022-04-21 10:38:20 +02:00
muellerr added a new dependency 2022-04-21 10:41:16 +02:00
#64 LIS3 handler nullptr check
meierj approved these changes 2022-04-21 13:54:10 +02:00
meierj merged commit 9798b6b4ab into eive/develop 2022-04-21 13:54:24 +02:00
muellerr deleted branch merge-upstream 2022-04-21 14:00:24 +02:00
Sign in to join this conversation.
Reviewers
No Reviewers
meierj
Labels
Clear labels
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 labels
Milestone
No items
No Milestone
Assignees
Clear assignees
ahinkel (Andy Hinkel) jenkins_buildfix lkoester meggert (Marius Eggert) meierj (Jakob Meier) mkoller mkranz mohr (Ulrich Mohr) msenger (Mikael Senger) muellerr (Robin Müller) rschweigert steinertm (Michael Steinert) zinkj
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Blocks
#64 LIS3 handler nullptr check
eive/fsfw
Reference: eive/fsfw#63