|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
72b9adb684
|
Merge branch 'master' into mueller/unittest-integration-from-master
|
2020-10-20 17:15:30 +02:00 |
|
|
|
865ea3386c
|
unittest now contained directly
|
2020-10-20 17:11:23 +02:00 |
|
|
|
c677358343
|
include adaption
|
2020-10-20 17:06:09 +02:00 |
|
|
|
7821cc2870
|
submodule added
|
2020-10-20 16:52:34 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
fa67f82462
|
structure improved
|
2020-10-20 15:04:28 +02:00 |
|
|
|
407df913d3
|
Merge branch 'master' into mueller/tcDistribution
|
2020-10-20 14:56:53 +02:00 |
|
|
|
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 |
|
|
|
12369d8d4b
|
Merge remote-tracking branch 'upstream/master' into mueller/MQMQ_IF_UpdateFreeRTOS
|
2020-10-20 14:51:38 +02:00 |
|
|
|
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 |
|
|
|
8cea7b05db
|
include improvement
|
2020-10-20 14:42:58 +02:00 |
|
|
|
17548605ec
|
Merge branch 'master' into mueller/MQMQ_IF_UpdateFreeRTOS
|
2020-10-20 14:37:22 +02:00 |
|
|
|
ea8ef8b874
|
important bugfix
|
2020-10-03 14:19:42 +02:00 |
|
|
|
54af54927b
|
Merge branch 'master' into mueller/tcDistribution
|
2020-10-01 19:05:09 +02:00 |
|
|
|
9bf0026b8a
|
Merge branch 'master' into mueller/MQM_IF_UpdateLinux
|
2020-10-01 19:04:53 +02:00 |
|
|
|
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 |
|
|
|
6776ca86eb
|
Made tpp file less cluttered and added inline qualifier
|
2020-10-01 17:44:23 +02:00 |
|
|
|
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 |
|
|
|
0a9a8cf867
|
Merge branch 'master' into gaisser_fix_multimap3
|
2020-10-01 17:37:34 +02:00 |
|
|
|
f1bc9972f3
|
Fixed bugs
|
2020-10-01 17:36:46 +02:00 |
|
|
|
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 |
|
|
|
587f87d270
|
Feedback from Robin
|
2020-10-01 17:27:24 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
4f91db2ff8
|
Merge branch 'master' into mueller/FixedOrdMultimapTpp
|
2020-10-01 13:59:42 +02:00 |
|
|
|
c86d654fdf
|
tpp file added
|
2020-10-01 13:58:20 +02:00 |
|
|
|
1f3a10b375
|
Fixes and comments in FixedOrderedMultimap
|
2020-10-01 13:30:28 +02:00 |
|
|
|
b8261854cb
|
Merge branch 'master' into mueller/tcDistribution
|
2020-10-01 13:25:16 +02:00 |
|
|
|
89c4370d91
|
tc distribution improvements
|
2020-10-01 13:23:06 +02:00 |
|
|
|
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 |
|
|
|
5342dc4bc8
|
Merge branch 'master' into mueller/MQMQ_IF_UpdateFreeRTOS
|
2020-10-01 11:46:55 +02:00 |
|
|
|
a5a850eb41
|
Merge branch 'master' into mueller/MQM_IF_UpdateLinux
|
2020-10-01 11:45:44 +02:00 |
|
|
|
c77bded505
|
Merge remote-tracking branch 'upstream/master' into mueller/MQMQ_IF_UpdateFreeRTOS
|
2020-10-01 11:15:42 +02:00 |
|
|
|
acc03d3e8b
|
Merge branch 'master' into mueller/ArrayList
|
2020-10-01 11:11:02 +02:00 |
|
|
|
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 |
|
|
|
ea13008aa2
|
Merge branch 'master' into gaisser_fixedArrayList_assert
|
2020-10-01 11:08:10 +02:00 |
|
|
|
7c3f99ed2d
|
Revert "DH IF and DH message form improved"
This reverts commit adf528fce9.
|
2020-10-01 11:06:46 +02:00 |
|
|
|
2344efb3ac
|
Merge remote-tracking branch 'upstream/master'
|
2020-10-01 11:06:21 +02:00 |
|
|
|
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 |
|
|
|
6c4ec713f3
|
Merge branch 'master' into gaisser_fifobase_nullptr_check
|
2020-10-01 11:04:22 +02:00 |
|
|
|
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 |
|
