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

4801 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Robin Müller
4f91db2ff8 Merge branch 'master' into mueller/FixedOrdMultimapTpp 2020-10-01 13:59:42 +02:00
Robin.Mueller
c86d654fdf tpp file added 2020-10-01 13:58:20 +02:00
Robin.Mueller
26454356f8 tpp extraction 2020-10-01 13:57:34 +02:00
Robin Müller
878796f546 Merge branch 'master' into mueller/newLocalDataPools 2020-10-01 13:31:00 +02:00
Steffen Gaisser
1f3a10b375 Fixes and comments in FixedOrderedMultimap 2020-10-01 13:30:28 +02:00
Robin Müller
b8261854cb Merge branch 'master' into mueller/tcDistribution 2020-10-01 13:25:16 +02:00
Robin.Mueller
89c4370d91 tc distribution improvements 2020-10-01 13:23:06 +02:00
Robin.Mueller
315777d265 tc distribution equalization 2020-10-01 13:21:23 +02:00
Robin Müller
565859a6f4 Merge branch 'master' into mueller/feature/windowsUdpBridge 2020-10-01 12:35:57 +02:00
gaisser
1f994d9933 Merge pull request 'ArrayList and FixedMap improvements' (#218) from KSat/fsfw:mueller/ArrayList into master 
Reviewed-on: fsfw/fsfw#218
 2020-10-01 12:31:24 +02:00
Robin.Mueller
196cde4075 DHB update 2020-10-01 12:30:53 +02:00
Robin.Mueller
322ff54f58 added new message types 2020-10-01 12:28:25 +02:00
Robin.Mueller
a43e8ea603 added srv3 object ID 2020-10-01 12:27:28 +02:00
Robin.Mueller
424d75ef1d Merge branch 'mueller/oldPoolRenaming' into mueller/newLocalDataPools 2020-10-01 12:06:55 +02:00
Robin.Mueller
b313043e43 added new local data pool files 2020-10-01 12:05:24 +02:00
Robin.Mueller
f979d603b4 Merge branch 'mueller/oldPoolRenaming' into mueller/newLocalDataPools 2020-10-01 12:04:33 +02:00
Robin Müller
1d837a8570 Merge branch 'master' into mueller/oldPoolRenaming 2020-10-01 12:03:48 +02:00
Robin Müller
5342dc4bc8 Merge branch 'master' into mueller/MQMQ_IF_UpdateFreeRTOS 2020-10-01 11:46:55 +02:00
Robin Müller
a5a850eb41 Merge branch 'master' into mueller/MQM_IF_UpdateLinux 2020-10-01 11:45:44 +02:00
Robin.Mueller
c77bded505 Merge remote-tracking branch 'upstream/master' into mueller/MQMQ_IF_UpdateFreeRTOS 2020-10-01 11:15:42 +02:00
Robin Müller
acc03d3e8b Merge branch 'master' into mueller/ArrayList 2020-10-01 11:11:02 +02:00
Robin Müller
d647c63da3 Merge pull request 'Added a compile time check in FixedArrayList and fixed copying' (#222) from gaisser/fsfw:gaisser_fixedArrayList_assert into master 
Reviewed-on: fsfw/fsfw#222
 2020-10-01 11:10:53 +02:00
Robin Müller
ea13008aa2 Merge branch 'master' into gaisser_fixedArrayList_assert 2020-10-01 11:08:10 +02:00
Robin.Mueller
32ebca48b8 FIFO updates 2020-10-01 11:07:46 +02:00
Robin.Mueller
43b44c57b6 placement fact update 2020-10-01 11:07:20 +02:00
Robin.Mueller
7c3f99ed2d Revert "DH IF and DH message form improved" 
This reverts commit adf528fce9.
 2020-10-01 11:06:46 +02:00
Robin.Mueller
2344efb3ac Merge remote-tracking branch 'upstream/master' 2020-10-01 11:06:21 +02:00
Robin Müller
236a833d0b Merge pull request 'Added null pointer checks for FIFO Base' (#224) from gaisser/fsfw:gaisser_fifobase_nullptr_check into master 
Reviewed-on: fsfw/fsfw#224
 2020-10-01 11:04:55 +02:00
Robin Müller
6c4ec713f3 Merge branch 'master' into gaisser_fifobase_nullptr_check 2020-10-01 11:04:22 +02:00
Robin Müller
b2a7859549 Merge pull request 'Added Documentation to PlacementFactory' (#223) from gaisser/fsfw:gaisser_documentation_placementFactory into master 
Reviewed-on: fsfw/fsfw#223
 2020-10-01 11:04:08 +02:00
Robin Müller
8178be9dc5 Merge branch 'master' into gaisser_documentation_placementFactory 2020-10-01 11:02:46 +02:00
Robin.Mueller
adf528fce9 DH IF and DH message form improved 2020-10-01 11:01:52 +02:00
Robin.Mueller
aed2d7fc93 slight formatting 2020-09-30 23:42:18 +02:00
Robin.Mueller
d44428f49c DH IF and DH message improved 2020-09-30 23:38:54 +02:00
Robin.Mueller
d8392de058 made define more generic 2020-09-30 20:28:33 +02:00
gaisser
6efdf170f4 Merge pull request 'Removed old test files' (#226) from gaisser/fsfw:master into master 
Reviewed-on: fsfw/fsfw#226
 2020-09-30 20:26:08 +02:00
Steffen Gaisser
a14558ef1f Removed old test files 2020-09-30 20:25:02 +02:00
Robin Müller
77a9a190aa Merge branch 'master' into mueller/ArrayList 2020-09-30 19:09:24 +02:00
Robin.Mueller
a0098e8b17 non member comp operator for iterators 2020-09-30 18:57:30 +02:00
Steffen Gaisser
fcabf93af3 Added a few comments 2020-09-30 16:27:18 +02:00
Steffen Gaisser
ab9858b0c7 Added comments 2020-09-30 16:15:48 +02:00