Commit Graph

4219 Commits

Author SHA1 Message Date
7a5ce57bbc Merge branch 'development' into mueller/possible-ring-buffer-fix 2022-04-11 17:35:42 +02:00
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
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
7761b66fe2
delete data from ipc store if reply fails 2022-04-11 14:35:16 +02:00
acc4c8d975
check serialize result as well 2022-04-11 14:33:28 +02:00
fe739aa81a Merge branch 'development' into mueller/propagate-pool-manage-retval 2022-04-11 14:26:34 +02:00
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
17771c0497
progagate reply returnvalue 2022-04-11 13:57:18 +02:00
c05184e1c4 Merge branch 'development' into meier/alternativeReply 2022-04-04 14:25:08 +02:00
7e61ce1ed2 Merge pull request 'cmake lists update to suppress large warning' (#588) from eive/fsfw:mueller/catch2-find-package-quiet into development
Reviewed-on: fsfw/fsfw#588
2022-04-04 14:07:38 +02:00
Jakob Meier
6c1db8473b get alternative reply from device command info 2022-03-31 14:36:45 +02:00
4be45adae6 Merge branch 'development' into mueller/catch2-find-package-quiet 2022-03-28 16:44:23 +02:00
0d7d2203d2 Merge pull request 'Added function to add component to a periodic task by pointer' (#591) from mohr/task into development
Reviewed-on: fsfw/fsfw#591
2022-03-28 15:23:26 +02:00
cde184f428 Merge branch 'development' into mohr/task 2022-03-28 15:18:23 +02:00
df3794dfd8 Merge pull request 'delete code which is not required anymore' (#587) from eive/fsfw:mueller/small-mgmlis3-tweak into development
Reviewed-on: fsfw/fsfw#587
2022-03-28 15:08:22 +02:00
b7a316008a
increase allowed read bytes 2022-03-28 15:07:46 +02:00
d02d5c351d Merge branch 'development' into mueller/small-mgmlis3-tweak 2022-03-28 15:05:24 +02:00
f598f7030f
Merge remote-tracking branch 'upstream/development' into mueller/possible-ring-buffer-fix 2022-03-28 15:03:01 +02:00
febecd4b30 Merge pull request 'small tweaks for local datapool code' (#582) from eive/fsfw:mueller/localpool-tweaks into development
Reviewed-on: fsfw/fsfw#582
2022-03-28 14:49:42 +02:00
964e311d8b Merge branch 'development' into mueller/localpool-tweaks 2022-03-28 14:48:34 +02:00
d43caa8296 Merge pull request 'Using enums to configure baudrate and bits per word in Linux HAL UART' (#585) from mohr/hal_uart into development
Reviewed-on: fsfw/fsfw#585
2022-03-28 14:47:04 +02:00
916ed3f56a added function to add component to a periodic task by pointer 2022-03-28 13:50:42 +02:00
70f575396d Added changelog 2022-03-25 15:27:22 +01:00
ad57e6713e Fixed Unittests 2022-03-25 15:20:06 +01:00
d9d9a28ef8
delete code which is not required anymore 2022-03-24 21:04:46 +01:00
23f8e5cb41
some more tests fail 2022-03-24 21:01:21 +01:00
879223f38f
added nullptr check 2022-03-24 20:57:42 +01:00
Cleanroom Laptop L590
d95582b81b cmake lists update to suppress large warning 2022-03-24 16:54:41 +01:00
Cleanroom Laptop L590
8a44c498c5 add two additional tests for ring buffer 2022-03-24 16:50:59 +01:00
c60aa68d00 changed hal linux uart baudrate and bits per word to enums 2022-03-24 15:44:32 +01:00
a891769a02
ring buffer cfg error warning 2022-03-24 11:32:27 +01:00
df97c582d7 possibly important fix for ring buffer write 2022-03-23 16:48:17 +01:00
3e17011087
small tweaks for local datapool code 2022-03-22 17:42:56 +01:00
f441505476
update changelog 2022-03-22 17:41:49 +01:00
7c64797f03
Add more baud rates 2022-03-22 17:38:47 +01:00
e08bdd3e35 Merge pull request 'Always define FSFW_DISABLE_PRINTOUT' (#576) from eive/fsfw:mueller/define-fsfw-disabled-printout-upstream into development
Reviewed-on: fsfw/fsfw#576
2022-03-14 15:20:40 +01:00
d2dd16aef3 Merge branch 'development' into mueller/define-fsfw-disabled-printout-upstream 2022-03-14 15:12:37 +01:00
b7a617dab3 Merge pull request 'minor event changes' (#578) from eive/fsfw:mueller/event-update into development
Reviewed-on: fsfw/fsfw#578
2022-03-14 15:12:21 +01:00
bc95e7c886 Merge branch 'mueller/event-update' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/event-update 2022-03-14 15:08:54 +01:00
fca43b3d34
run auto-formatter 2022-03-14 15:08:45 +01:00
48c5c3fbd5 Merge branch 'development' into mueller/event-update 2022-03-14 15:07:25 +01:00
b694aea100 Merge pull request 'call setTimeout in Countdown ctor' (#577) from eive/fsfw:mueller/countdown-improvement-upstream into development
Reviewed-on: fsfw/fsfw#577
2022-03-14 15:04:57 +01:00
6998626ad4 Merge branch 'development' into mueller/define-fsfw-disabled-printout-upstream 2022-03-14 15:02:07 +01:00
24ad858b64 Merge branch 'development' into mueller/countdown-improvement-upstream 2022-03-14 14:46:54 +01:00
288d453978 Merge pull request 'Version Getter Function' (#575) from eive/fsfw:mueller/version-getter-upstream into development
Reviewed-on: fsfw/fsfw#575
2022-03-14 14:44:37 +01:00
522cbc7f3d
Merge remote-tracking branch 'upstream/development' into mueller/version-getter-upstream 2022-03-14 14:38:27 +01:00
ce5bcc5897
bugfix 2022-03-14 14:37:41 +01:00
97c93afeff Merge remote-tracking branch 'upstream/development' into mueller/version-getter-upstream 2022-03-14 14:24:43 +01:00
8704b9ab06 Merge pull request 'Fixed test issue with overflow of times' (#574) from gaisser/fsfw:gaisser_ccsds_time_tests into development
Reviewed-on: fsfw/fsfw#574
2022-03-14 14:23:35 +01:00
5a1585bd00 Merge pull request 'SPI HAL improvement' (#573) from eive/fsfw:mueller/spi-initialize-line-state into development
Reviewed-on: fsfw/fsfw#573
2022-03-14 14:18:03 +01:00