KSat/fsfw
15
4
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 1 Releases Wiki Activity
1,500 Commits 7 Branches 1 Tag 25 MiB
c9913ea53a
Commit Graph

1500 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
gaisser
67dd153511 Merge branch 'master' into mueller/sharedRingBufferFIFO 2020-10-27 13:36:59 +01:00
gaisser
342a70d109 Merge branch 'master' into mueller_tcPacketBase 2020-10-27 12:24:12 +01:00
Robin Müller
c5da6c9464 Merge branch 'master' into mueller/LocalPoolRefactoring 2020-10-21 14:32:24 +02:00
Robin.Mueller
6cce062d62 some more fixes 2020-10-20 17:52:43 +02:00
Robin.Mueller
29a796ebdb include names fixed 2020-10-20 17:51:13 +02:00
Robin.Mueller
ede00dfdcc double files removed, versioning files renamed 2020-10-20 17:50:10 +02:00
Robin.Mueller
e4d323683d readme fix 2020-10-20 17:47:52 +02:00
Robin.Mueller
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
Robin.Mueller
1940a2acf0 some fixes 2020-10-20 17:44:27 +02:00
Robin Müller
279682351a Merge branch 'master' into mueller/defaultcfg 2020-10-20 17:41:33 +02:00
Robin.Mueller
247c9f2947 added readme 2020-10-20 17:39:11 +02:00
Robin.Mueller
482b77ff05 added defaultcfg config folder 2020-10-20 17:38:41 +02:00
Robin Müller
72b9adb684 Merge branch 'master' into mueller/unittest-integration-from-master 2020-10-20 17:15:30 +02:00
Robin.Mueller
865ea3386c unittest now contained directly 2020-10-20 17:11:23 +02:00
Robin.Mueller
c677358343 include adaption 2020-10-20 17:06:09 +02:00
Robin.Mueller
7821cc2870 submodule added 2020-10-20 16:52:34 +02:00
gaisser
ef0122ab54 Merge branch 'master' into mueller/enhanced-controller 2020-10-20 16:34:36 +02:00
gaisser
756df4f37f Merge branch 'master' into mueller/action-update 2020-10-20 16:04:29 +02:00
gaisser
0b1b9c11eb Merge pull request 'TC Distribution convergence' (#229) from KSat/fsfw:mueller/tcDistribution into master 
Reviewed-on: fsfw/fsfw#229
 2020-10-20 15:11:27 +02:00
Robin.Mueller
ddacc66b1f Merge branch 'mueller/tcDistribution' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/tcDistribution 2020-10-20 15:04:45 +02:00
Robin.Mueller
fa67f82462 structure improved 2020-10-20 15:04:28 +02:00
gaisser
407df913d3 Merge branch 'master' into mueller/tcDistribution 2020-10-20 14:56:53 +02:00
Robin Müller
f7b84c4732 Merge branch 'master' into mueller/DHB-update 2020-10-20 14:56:45 +02:00
Robin Müller
b29376bd71 Merge branch 'master' into mueller/feature/windowsUdpBridge 2020-10-20 14:55:04 +02:00
gaisser
3580ec0e09 Merge pull request 'MQM IF used by FreeRTOS' (#212) from KSat/fsfw:mueller/MQMQ_IF_UpdateFreeRTOS into master 
Reviewed-on: fsfw/fsfw#212
 2020-10-20 14:52:58 +02:00
Robin.Mueller
12369d8d4b Merge remote-tracking branch 'upstream/master' into mueller/MQMQ_IF_UpdateFreeRTOS 2020-10-20 14:51:38 +02:00
gaisser
6b2df54204 Merge pull request 'Message QueueMessage IF used in Linux' (#207) from KSat/fsfw:mueller/MQM_IF_UpdateLinux into master 
Reviewed-on: fsfw/fsfw#207
 2020-10-20 14:50:47 +02:00
Robin.Mueller
8cea7b05db include improvement 2020-10-20 14:42:58 +02:00
gaisser
17548605ec Merge branch 'master' into mueller/MQMQ_IF_UpdateFreeRTOS 2020-10-20 14:37:22 +02:00
Robin.Mueller
bd2f8b3e8c packet matcher uses refactored pool now 2020-10-15 13:45:47 +02:00
Robin.Mueller
7d358483dd added back config includes 2020-10-15 13:44:59 +02:00
Robin.Mueller
67e33918e0 event manager uses refactored pool now 2020-10-15 13:44:09 +02:00
Robin.Mueller
73215baf11 init commit 2020-10-15 13:43:23 +02:00
Robin.Mueller
dbcd06527e separate step for performOp now 2020-10-12 18:28:07 +02:00
Robin.Mueller
140aa3ab42 form improvements DHB 2020-10-12 18:18:41 +02:00
Robin.Mueller
829be0f082 doc correction, action helper new helper function 2020-10-12 16:58:04 +02:00
Robin.Mueller
b6a23727f2 added extended controller base 2020-10-12 15:40:27 +02:00
Robin.Mueller
17ea3127a7 minor form improvements, include guards 2020-10-10 17:04:43 +02:00
Robin.Mueller
ea8ef8b874 important bugfix 2020-10-03 14:19:42 +02:00
gaisser
54af54927b Merge branch 'master' into mueller/tcDistribution 2020-10-01 19:05:09 +02:00
gaisser
9bf0026b8a Merge branch 'master' into mueller/MQM_IF_UpdateLinux 2020-10-01 19:04:53 +02:00
gaisser
335e146735 Merge pull request 'Made tpp file less cluttered and added inline qualifier' (#234) from gaisser/fsfw:master into master 
Reviewed-on: fsfw/fsfw#234
 2020-10-01 17:45:11 +02:00
Steffen Gaisser
6776ca86eb Made tpp file less cluttered and added inline qualifier 2020-10-01 17:44:23 +02:00
gaisser
f172c07876 Merge pull request 'Fixed issue with tpp File' (#233) from gaisser/fsfw:gaisser_fix_multimap3 into master 
Reviewed-on: fsfw/fsfw#233
 2020-10-01 17:37:52 +02:00
gaisser
0a9a8cf867 Merge branch 'master' into gaisser_fix_multimap3 2020-10-01 17:37:34 +02:00
Steffen Gaisser
f1bc9972f3 Fixed bugs 2020-10-01 17:36:46 +02:00
gaisser
7c7b3de14f Merge pull request 'Fixes and comments in FixedOrderedMultimap' (#231) from gaisser/fsfw:gaisser_fix_multimap2 into master 
Reviewed-on: fsfw/fsfw#231
 2020-10-01 17:32:44 +02:00
Steffen Gaisser
587f87d270 Feedback from Robin 2020-10-01 17:27:24 +02:00
Steffen Gaisser
cd2cb410e4 Merge branch 'master' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw.git 
into gaisser_fix_multimap2

Conflicts:
	container/FixedOrderedMultimap.h
 2020-10-01 14:59:26 +02:00
gaisser
b292c5c927 Merge pull request 'FixedOrderedMultimap Implementation moved to TPP file' (#232) from KSat/fsfw:mueller/FixedOrdMultimapTpp into master 
Reviewed-on: fsfw/fsfw#232
 2020-10-01 14:02:41 +02:00