eive/fsfw
eive
/
fsfw
forked from fsfw/fsfw
14
1
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity
786 Commits 28 Branches 1 Tag 24 MiB
Commit Graph

786 Commits

Author SHA1 Message Date
Robin Müller 865ea3386c unittest now contained directly 2020-10-20 17:11:23 +02:00
Robin Müller c677358343 include adaption 2020-10-20 17:06:09 +02:00
Robin Müller 7821cc2870 submodule added 2020-10-20 16:52:34 +02:00
Steffen 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
Steffen 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
Steffen 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
Steffen 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
Steffen 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 Müller c86d654fdf tpp file added 2020-10-01 13:58:20 +02:00
Steffen Gaisser 1f3a10b375 Fixes and comments in FixedOrderedMultimap 2020-10-01 13:30:28 +02:00
Steffen 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 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 Müller 7c3f99ed2d Revert "DH IF and DH message form improved" 
This reverts commit adf528fce9.
 2020-10-01 11:06:46 +02:00
Robin Müller 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 Müller adf528fce9 DH IF and DH message form improved 2020-10-01 11:01:52 +02:00
Steffen 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 Müller 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
Steffen Gaisser 823bae1a2a Added null pointer checks for FIFO Base 2020-09-30 16:06:17 +02:00
Steffen Gaisser 2f61bd0a0f A few typos and more docu 2020-09-30 14:38:46 +02:00
Steffen Gaisser aeeef53508 Added Documentation to placement factory 2020-09-30 14:34:02 +02:00
Steffen Gaisser 8d8e918aeb Fixed copying of FixedArrayList 2020-09-30 13:05:55 +02:00
Steffen Gaisser ecc4bdf11a Added a compile time check for MAX_SIZE 
Compiler may warn if MAX_SIZE value overflows by itself but this checks
gives a more verbose warning
 2020-09-30 12:50:52 +02:00
Steffen Gaisser 5340b9c58e Merge pull request 'Typo in FixedOrderedMultimap' (#220) from gaisser/fsfw:gaisser_another_small_fix into master 
Reviewed-on: fsfw/fsfw#220
 2020-09-30 10:58:26 +02:00
Steffen Gaisser 659671e1df Merge branch 'master' into gaisser_another_small_fix 2020-09-30 10:57:50 +02:00
Steffen Gaisser 5fc583117d Typo in FixedOrderedMultimap 2020-09-30 10:55:34 +02:00
Robin Müller f5ded3fa4b Merge branch 'master' into mueller/ArrayList 2020-09-29 18:03:44 +02:00
Robin Müller e104cd18e6 Merge pull request 'Hotfix Linux include' (#219) from mueller/hotfix-linuxinclude into master 
Reviewed-on: fsfw/fsfw#219
 2020-09-29 17:57:58 +02:00
Robin Müller 71f2f34aab Merge remote-tracking branch 'upstream/master' into mueller/hotfix-linuxinclude 2020-09-29 17:57:20 +02:00
Robin Müller 6c0bb23ed6 non member bool operator 2020-09-29 17:51:16 +02:00
Steffen Gaisser 303fcec9f6 Added a missing include 2020-09-29 17:49:04 +02:00
Robin Müller f73f798a4d lines removed 2020-09-29 17:28:37 +02:00
Robin Müller 4fce0377a9 missing include for linux 2020-09-29 17:28:02 +02:00
Robin Müller 4eef7bfc01 changes taken over 2020-09-29 16:12:43 +02:00
Robin Müller 17d5de15c9 slight changes ,size t replacement 2020-09-29 16:10:35 +02:00
Robin Müller cdadf48f38 Merge pull request 'Returns failed now in Service 200 when mode answer is negative' (#217) from gaisser/fsfw:gaisser_service200_returns into master 
Reviewed-on: fsfw/fsfw#217
 2020-09-29 16:02:02 +02:00