Commit Graph

760 Commits

Author SHA1 Message Date
c86d654fdf tpp file added 2020-10-01 13:58:20 +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
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
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
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
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
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
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
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
37c605c4fb Merge pull request 'Fixes #194 Small Map Issues' (#209) from gaisser/fsfw:gaisser_small_map_issues into master
Reviewed-on: fsfw/fsfw#209
2020-09-29 14:59:55 +02:00
e55f8f583d Merge branch 'master' into gaisser_small_map_issues 2020-09-29 14:58:35 +02:00
a700f6a96d Merge pull request 'New StoreAccessors and separation of implementation for storagemanager classes' (#92) from KSat/fsfw:mueller_StoreAccessor into master
Reviewed-on: fsfw/fsfw#92
2020-09-29 14:57:06 +02:00
6c86cf88f3 Merge branch 'master' into mueller_StoreAccessor 2020-09-29 14:56:20 +02:00
352ce13fb3 removed line break 2020-09-29 14:55:17 +02:00
1ed1b7ea06 include guard fix 2020-09-29 14:51:08 +02:00
a58e47623f update 2020-09-29 14:50:16 +02:00
622c7a5a0d debug output removed 2020-09-29 14:45:23 +02:00
bed4e7affa nullptr replacement 2020-09-29 14:43:23 +02:00
1ff85c88b2 store accessor small changes 2020-09-29 14:42:48 +02:00
cef84b13d9 renormalization 2020-09-29 14:35:05 +02:00
6f965c74ac Merge remote-tracking branch 'upstream/master' into mueller_StoreAccessor 2020-09-29 14:34:49 +02:00
dae79f30d7 Merge pull request 'timeslot update' (#179) from KSat/fsfw:mueller/FixedTimeslotUpdate into master
Reviewed-on: fsfw/fsfw#179
2020-09-29 14:30:59 +02:00
c01d904552 Merge branch 'mueller/FixedTimeslotUpdate' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/FixedTimeslotUpdate 2020-09-29 14:30:05 +02:00
7dbb73b7d8 removed dbeug printout 2020-09-29 14:29:57 +02:00
9f7dad31eb Merge branch 'master' into mueller/FixedTimeslotUpdate 2020-09-29 14:21:02 +02:00