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

14 Commits

Author SHA1 Message Date
Robin Müller b128ef9da9
Merge remote-tracking branch 'upstream/development' into merge-upstream 2022-04-21 10:37:01 +02:00
Steffen Gaisser 5ac88f2b15 Merge pull request 'added missing empty implementation in STM32 SPI HAL' (#599) from mueller/small-stm32-hal-bugifx into development
Reviewed-on: fsfw/fsfw#599
2022-04-11 17:48:48 +02:00
Robin Müller b03a6684f9 Merge branch 'development' into mueller/small-stm32-hal-bugifx 2022-04-11 17:34:39 +02:00
Robin Mueller 7c2e50b665
added related PR in changelog 2022-04-11 17:32:01 +02:00
Steffen Gaisser c04ca704d2 Merge pull request 'progagate reply returnvalue' (#597) from eive/fsfw:mueller/propagate-pool-manage-retval into development
Reviewed-on: fsfw/fsfw#597
2022-04-11 17:31:54 +02:00
Robin Mueller 6aa54fe1d4
added missing empty implementation 2022-04-11 17:30:27 +02:00
Robin Müller c0f80680ef Merge branch 'mueller/propagate-pool-manage-retval' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/propagate-pool-manage-retval 2022-04-11 14:35:28 +02:00
Robin Müller 7761b66fe2
delete data from ipc store if reply fails 2022-04-11 14:35:16 +02:00
Robin Müller acc4c8d975
check serialize result as well 2022-04-11 14:33:28 +02:00
Robin Müller fe739aa81a Merge branch 'development' into mueller/propagate-pool-manage-retval 2022-04-11 14:26:34 +02:00
Steffen Gaisser afe006e234 Merge pull request 'Alternative reply ID activation' (#595) from meier/alternativeReply into development
Reviewed-on: fsfw/fsfw#595
2022-04-11 14:18:52 +02:00
Robin Müller 17771c0497
progagate reply returnvalue 2022-04-11 13:57:18 +02:00
Steffen Gaisser c05184e1c4 Merge branch 'development' into meier/alternativeReply 2022-04-04 14:25:08 +02:00
Jakob Meier 6c1db8473b get alternative reply from device command info 2022-03-31 14:36:45 +02:00