|
|
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 |
|
|
|
565859a6f4
|
Merge branch 'master' into mueller/feature/windowsUdpBridge
|
2020-10-01 12:35:57 +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 |
|
|
|
8178be9dc5
|
Merge branch 'master' into gaisser_documentation_placementFactory
|
2020-10-01 11:02:46 +02:00 |
|
|
|
adf528fce9
|
DH IF and DH message form improved
|
2020-10-01 11:01:52 +02:00 |
|
|
|
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 |
|
|
|
a14558ef1f
|
Removed old test files
|
2020-09-30 20:25:02 +02:00 |
|
|
|
77a9a190aa
|
Merge branch 'master' into mueller/ArrayList
|
2020-09-30 19:09:24 +02:00 |
|
|
|
a0098e8b17
|
non member comp operator for iterators
|
2020-09-30 18:57:30 +02:00 |
|
|
|
fcabf93af3
|
Added a few comments
|
2020-09-30 16:27:18 +02:00 |
|
|
|
ab9858b0c7
|
Added comments
|
2020-09-30 16:15:48 +02:00 |
|
|
|
823bae1a2a
|
Added null pointer checks for FIFO Base
|
2020-09-30 16:06:17 +02:00 |
|
|
|
2f61bd0a0f
|
A few typos and more docu
|
2020-09-30 14:38:46 +02:00 |
|
|
|
aeeef53508
|
Added Documentation to placement factory
|
2020-09-30 14:34:02 +02:00 |
|
|
|
8d8e918aeb
|
Fixed copying of FixedArrayList
|
2020-09-30 13:05:55 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
659671e1df
|
Merge branch 'master' into gaisser_another_small_fix
|
2020-09-30 10:57:50 +02:00 |
|
|
|
5fc583117d
|
Typo in FixedOrderedMultimap
|
2020-09-30 10:55:34 +02:00 |
|
|
|
86a1ae4a8a
|
Merge remote-tracking branch 'upstream/master' into mueller/MQM_IF_UpdateLinux
|
2020-09-29 18:05:36 +02:00 |
|
|
|
195bf6b89f
|
Merge remote-tracking branch 'upstream/master' into mueller/MQM_IF_UpdateLinux
|
2020-09-29 18:05:10 +02:00 |
|
|
|
f5ded3fa4b
|
Merge branch 'master' into mueller/ArrayList
|
2020-09-29 18:03:44 +02:00 |
|
|
|
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 |
|
|
|
71f2f34aab
|
Merge remote-tracking branch 'upstream/master' into mueller/hotfix-linuxinclude
|
2020-09-29 17:57:20 +02:00 |
|
|
|
6c0bb23ed6
|
non member bool operator
|
2020-09-29 17:51:16 +02:00 |
|
|
|
303fcec9f6
|
Added a missing include
|
2020-09-29 17:49:04 +02:00 |
|
|
|
f73f798a4d
|
lines removed
|
2020-09-29 17:28:37 +02:00 |
|
|
|
4fce0377a9
|
missing include for linux
|
2020-09-29 17:28:02 +02:00 |
|
|
|
4eef7bfc01
|
changes taken over
|
2020-09-29 16:12:43 +02:00 |
|
|
|
17d5de15c9
|
slight changes ,size t replacement
|
2020-09-29 16:10:35 +02:00 |
|
|
|
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 |
|
|
|
896302c506
|
Merge branch 'master' into gaisser_service200_returns
|
2020-09-29 15:43:18 +02:00 |
|
|
|
1bdccedabe
|
Fixes #86
|
2020-09-29 15:39:24 +02:00 |
|
