Commit Graph

1474 Commits

Author SHA1 Message Date
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
db5890c15a Merge branch 'mueller/feature/windowsUdpBridge' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/feature/windowsUdpBridge 2020-09-29 15:37:06 +02:00
72f924813d .mk fix 2020-09-29 15:36:54 +02:00
dffda771ac Merge branch 'master' into mueller/feature/windowsUdpBridge 2020-09-29 15:35:44 +02:00
06f5b816e4 Merge branch 'master' into mueller/MQMQ_IF_UpdateFreeRTOS 2020-09-29 15:29:01 +02:00
3d830a9e20 Merge branch 'master' into mueller/MQM_IF_UpdateLinux 2020-09-29 15:28:37 +02:00
13b30f8de6 Merge pull request 'Removed comments and added include in tmtcservices/PusVerificationReporter' (#216) from gaisser/fsfw:gaisser_removed_unused into master
Reviewed-on: fsfw/fsfw#216
2020-09-29 15:28:16 +02:00
e71020d631 Removed comments and added include 2020-09-29 15:24:29 +02:00
046eec6c18 Merge branch 'mueller/MQM_IF_UpdateLinux' into mueller/MQMQ_IF_UpdateFreeRTOS 2020-09-29 15:24:12 +02:00
47c21cfc6c include fix 2020-09-29 15:22:38 +02:00
00f89bb193 Merge branch 'mueller/MQM_IF_UpdateLinux' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/MQM_IF_UpdateLinux 2020-09-29 15:21:42 +02:00
6879045ef3 include fix 2020-09-29 15:21:33 +02:00
c9005783b2 Merge branch 'master' into mueller/MQM_IF_UpdateLinux 2020-09-29 15:20:48 +02:00
4010d8d960 Merge remote-tracking branch 'upstream/master' into mueller/MQM_IF_UpdateLinux 2020-09-29 15:20:32 +02:00
a3235ced17 Merge pull request 'include added' (#215) from KSat/fsfw:mueller/VerifHotfix into master
Reviewed-on: fsfw/fsfw#215
2020-09-29 15:18:02 +02:00
d3ce6d147e Merge branch 'master' into mueller/VerifHotfix 2020-09-29 15:13:43 +02:00
ce983953ff Merge pull request 'Modes and Memory convergence' (#214) from KSat/fsfw:mueller/modes-memory into master
Reviewed-on: fsfw/fsfw#214
2020-09-29 15:13:34 +02:00
a71528551a include added 2020-09-29 15:10:08 +02:00
6a5268f5b0 typo fix 2020-09-29 15:05:18 +02:00
392d0299a9 Merge remote-tracking branch 'upstream/master' into mueller/modes-memory 2020-09-29 15:04:42 +02:00
8ade9e33c1 Merge branch 'master' into mueller/feature/windowsUdpBridge 2020-09-29 15:00:07 +02:00