Commit Graph

2757 Commits

Author SHA1 Message Date
5a8431e82b Merge branch 'master' into mueller/action-update 2020-10-29 13:04:48 +01:00
97f6dace26 some fixes for master 2020-10-29 12:42:29 +01:00
c8fd698b3a some changes 2020-10-29 12:23:27 +01:00
50151310dc Merge branch 'master' into mueller/unittest-integration-from-master 2020-10-29 12:20:38 +01:00
565fd63d08 makefile moved 2020-10-29 12:07:48 +01:00
29187fbc4b some config adaptions 2020-10-29 11:59:50 +01:00
a38c3e5005 config folder renamed 2020-10-29 11:47:03 +01:00
a9b4874904 new defines added 2020-10-28 22:49:19 +01:00
b860d8bce7 include fixes 2020-10-28 22:34:41 +01:00
6325eb7647 include fixes 2020-10-28 22:11:13 +01:00
24cb83498a include fix 2020-10-28 21:28:59 +01:00
82ccd14692 added new tests 2020-10-28 21:25:11 +01:00
ea04e7d4d6 removed catch2 2020-10-28 21:13:00 +01:00
3244487eae slight improvements 2020-10-28 20:18:58 +01:00
dcb24360d8 form improvements taken over 2020-10-28 20:17:50 +01:00
d1a399a1a8 tm packet store update 2020-10-28 19:46:27 +01:00
53e98df37d tm packet stored 2020-10-28 19:44:37 +01:00
90bdb844e7 taken over some changes 2020-10-28 19:27:00 +01:00
cb71a18277 ack fields improved 2020-10-28 19:21:33 +01:00
546db47db4 more refactoring 2020-10-28 02:20:12 +01:00
ce322ed121 Merge remote-tracking branch 'upstream/master' into mueller_tcPacketBase 2020-10-27 23:31:23 +01:00
744d3a2346 Merge branch 'master' into mueller/defaultcfg 2020-10-27 15:18:53 +01:00
c89a24a248 Merge pull request 'Fixes #161' (#244) from gaisser/fsfw:gaisser_fix_dhb_stream_reset into master
Reviewed-on: fsfw/fsfw#244
2020-10-27 15:17:18 +01:00
6651622a16 Merge branch 'master' into gaisser_fix_dhb_stream_reset 2020-10-27 15:16:58 +01:00
410094ed28 Fixes #161 2020-10-27 15:16:14 +01:00
2eb1a5c1a0 Merge branch 'master' into mueller/enhanced-controller 2020-10-27 15:11:39 +01:00
b6456c7b69 Merge branch 'master' into mueller/DHB-update 2020-10-27 15:04:35 +01:00
8b21324815 Merge branch 'master' into mueller/action-update 2020-10-27 14:30:12 +01:00
f40b432e43 Merge pull request 'added FIFO to SharedRingBuffer' (#208) from KSat/fsfw:mueller/sharedRingBufferFIFO into master
Reviewed-on: fsfw/fsfw#208
2020-10-27 14:29:48 +01:00
67dd153511 Merge branch 'master' into mueller/sharedRingBufferFIFO 2020-10-27 13:36:59 +01:00
342a70d109 Merge branch 'master' into mueller_tcPacketBase 2020-10-27 12:24:12 +01:00
e7210a34f9 output tweaked 2020-10-22 14:34:52 +02:00
742cc6eb76 no command added 2020-10-21 18:19:51 +02:00
c5da6c9464 Merge branch 'master' into mueller/LocalPoolRefactoring 2020-10-21 14:32:24 +02:00
b9f3c1ee84 takne over defaultcfg 2020-10-20 17:53:47 +02:00
6cce062d62 some more fixes 2020-10-20 17:52:43 +02:00
29a796ebdb include names fixed 2020-10-20 17:51:13 +02:00
ede00dfdcc double files removed, versioning files renamed 2020-10-20 17:50:10 +02:00
e4d323683d readme fix 2020-10-20 17:47:52 +02:00
4d4300cee6 Merge branch 'mueller/defaultcfg' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/defaultcfg 2020-10-20 17:44:35 +02:00
1940a2acf0 some fixes 2020-10-20 17:44:27 +02:00
279682351a Merge branch 'master' into mueller/defaultcfg 2020-10-20 17:41:33 +02:00
057f3b859e added readme and efaultcfg 2020-10-20 17:39:48 +02:00
247c9f2947 added readme 2020-10-20 17:39:11 +02:00
482b77ff05 added defaultcfg config folder 2020-10-20 17:38:41 +02:00
9309562716 defaultcfg folder added 2020-10-20 17:24:53 +02:00
bb53c71f70 fsfs config update 2020-10-20 17:21:20 +02:00
72b9adb684 Merge branch 'master' into mueller/unittest-integration-from-master 2020-10-20 17:15:30 +02:00
7033328962 unittest folder added 2020-10-20 17:12:56 +02:00
865ea3386c unittest now contained directly 2020-10-20 17:11:23 +02:00