fsfw/fsfw
12
3
Fork 6
Code Issues 32 Pull Requests 4 Releases 10 Wiki Activity
867 Commits 28 Branches 22 Tags
9af5855ece0310e53c33a81ba2409b909ebbee98
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
gaisser 096643971b Merge pull request 'TMTC Packet Base improvements' (#80) from KSat/fsfw:mueller_tcPacketBase into master 
Reviewed-on: #80
 2020-10-29 13:17:35 +01:00
gaisser 744d3a2346 Merge branch 'master' into mueller/defaultcfg 2020-10-27 15:18:53 +01:00
gaisser c89a24a248 Merge pull request 'Fixes #161' (#244) from gaisser/fsfw:gaisser_fix_dhb_stream_reset into master 
Reviewed-on: #244
 2020-10-27 15:17:18 +01:00
gaisser 6651622a16 Merge branch 'master' into gaisser_fix_dhb_stream_reset 2020-10-27 15:16:58 +01:00
Steffen Gaisser 410094ed28 Fixes #161 2020-10-27 15:16:14 +01:00
gaisser f40b432e43 Merge pull request 'added FIFO to SharedRingBuffer' (#208) from KSat/fsfw:mueller/sharedRingBufferFIFO into master 
Reviewed-on: #208
 2020-10-27 14:29:48 +01:00
gaisser 67dd153511 Merge branch 'master' into mueller/sharedRingBufferFIFO 2020-10-27 13:36:59 +01:00
gaisser 342a70d109 Merge branch 'master' into mueller_tcPacketBase 2020-10-27 12:24:12 +01:00
gaisser 0b1b9c11eb Merge pull request 'TC Distribution convergence' (#229) from KSat/fsfw:mueller/tcDistribution into master 
Reviewed-on: #229
 2020-10-20 15:11:27 +02:00
gaisser 407df913d3 Merge branch 'master' into mueller/tcDistribution 2020-10-20 14:56:53 +02:00
gaisser 3580ec0e09 Merge pull request 'MQM IF used by FreeRTOS' (#212) from KSat/fsfw:mueller/MQMQ_IF_UpdateFreeRTOS into master 
Reviewed-on: #212
 2020-10-20 14:52:58 +02:00
gaisser 6b2df54204 Merge pull request 'Message QueueMessage IF used in Linux' (#207) from KSat/fsfw:mueller/MQM_IF_UpdateLinux into master 
Reviewed-on: #207
 2020-10-20 14:50:47 +02:00
gaisser 17548605ec Merge branch 'master' into mueller/MQMQ_IF_UpdateFreeRTOS 2020-10-20 14:37:22 +02:00
gaisser 54af54927b Merge branch 'master' into mueller/tcDistribution 2020-10-01 19:05:09 +02:00
gaisser 9bf0026b8a Merge branch 'master' into mueller/MQM_IF_UpdateLinux 2020-10-01 19:04:53 +02:00
gaisser 335e146735 Merge pull request 'Made tpp file less cluttered and added inline qualifier' (#234) from gaisser/fsfw:master into master 
Reviewed-on: #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
gaisser f172c07876 Merge pull request 'Fixed issue with tpp File' (#233) from gaisser/fsfw:gaisser_fix_multimap3 into master 
Reviewed-on: #233
 2020-10-01 17:37:52 +02:00
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
gaisser 7c7b3de14f Merge pull request 'Fixes and comments in FixedOrderedMultimap' (#231) from gaisser/fsfw:gaisser_fix_multimap2 into master 
Reviewed-on: #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
gaisser b292c5c927 Merge pull request 'FixedOrderedMultimap Implementation moved to TPP file' (#232) from KSat/fsfw:mueller/FixedOrdMultimapTpp into master 
Reviewed-on: #232
 2020-10-01 14:02:41 +02:00
Steffen Gaisser 1f3a10b375 Fixes and comments in FixedOrderedMultimap 2020-10-01 13:30:28 +02:00
gaisser 1f994d9933 Merge pull request 'ArrayList and FixedMap improvements' (#218) from KSat/fsfw:mueller/ArrayList into master 
Reviewed-on: #218
 2020-10-01 12:31:24 +02:00
gaisser 6efdf170f4 Merge pull request 'Removed old test files' (#226) from gaisser/fsfw:master into master 
Reviewed-on: #226
 2020-09-30 20:26:08 +02:00
Steffen Gaisser a14558ef1f Removed old test files 2020-09-30 20:25:02 +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
gaisser 5340b9c58e Merge pull request 'Typo in FixedOrderedMultimap' (#220) from gaisser/fsfw:gaisser_another_small_fix into master 
Reviewed-on: #220
 2020-09-30 10:58:26 +02:00
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
Steffen Gaisser 303fcec9f6 Added a missing include 2020-09-29 17:49:04 +02:00
gaisser 896302c506 Merge branch 'master' into gaisser_service200_returns 2020-09-29 15:43:18 +02:00
Steffen Gaisser 1bdccedabe Fixes #86 2020-09-29 15:39:24 +02:00
Steffen Gaisser e71020d631 Removed comments and added include 2020-09-29 15:24:29 +02:00
gaisser a3235ced17 Merge pull request 'include added' (#215) from KSat/fsfw:mueller/VerifHotfix into master 
Reviewed-on: #215
 2020-09-29 15:18:02 +02:00
gaisser d3ce6d147e Merge branch 'master' into mueller/VerifHotfix 2020-09-29 15:13:43 +02:00
gaisser ce983953ff Merge pull request 'Modes and Memory convergence' (#214) from KSat/fsfw:mueller/modes-memory into master 
Reviewed-on: #214
 2020-09-29 15:13:34 +02:00
gaisser e55f8f583d Merge branch 'master' into gaisser_small_map_issues 2020-09-29 14:58:35 +02:00
gaisser d6e82f64e7 Merge branch 'master' into mueller_tcPacketBase 2020-09-29 14:58:19 +02:00
gaisser a700f6a96d Merge pull request 'New StoreAccessors and separation of implementation for storagemanager classes' (#92) from KSat/fsfw:mueller_StoreAccessor into master 
Reviewed-on: #92
 2020-09-29 14:57:06 +02:00
gaisser b2677ae040 Merge branch 'master' into mueller_tcPacketBase 2020-09-29 14:34:16 +02:00
gaisser dae79f30d7 Merge pull request 'timeslot update' (#179) from KSat/fsfw:mueller/FixedTimeslotUpdate into master 
Reviewed-on: #179
 2020-09-29 14:30:59 +02:00
gaisser 9f7dad31eb Merge branch 'master' into mueller/FixedTimeslotUpdate 2020-09-29 14:21:02 +02:00
gaisser 21cbb19410 Merge pull request 'ipc update' (#176) from KSat/fsfw:mueller/ipc-updates into master 
Reviewed-on: #176
 2020-09-29 14:20:18 +02:00
gaisser 170217e2e8 Merge branch 'master' into mueller/ipc-updates 2020-09-29 14:15:13 +02:00
gaisser bf5e7241b6 Merge branch 'master' into mueller/MQM_IF_UpdateLinux 2020-09-29 14:14:56 +02:00
gaisser 291a62eeb9 Merge branch 'master' into gaisser_small_map_issues 2020-09-29 14:14:48 +02:00
gaisser 945f49bbe9 Merge pull request 'Object Id and Verif Reporter Improvements' (#213) from KSat/fsfw:mueller/objectIdImprovement into master 
User have to change instantiation to the objectId of the new PUS Services

Reviewed-on: #213
 2020-09-29 14:14:27 +02:00
gaisser 842c21684a Merge branch 'master' into gaisser_small_map_issues 2020-09-22 18:37:51 +02:00
gaisser d1fb512c1f Merge pull request 'Small fix with new pus services' (#210) from gaisser/fsfw:gaisser_small_fix_subsystem_id into master 
Reviewed-on: #210
 2020-09-22 17:10:09 +02:00
Steffen Gaisser 59f72d1031 Small fix with new pus services 2020-09-22 16:59:13 +02:00
Steffen Gaisser 74a4c98ca7 Small format stuff 2020-09-22 16:23:35 +02:00
gaisser d0f912f32b Merge branch 'master' into mueller/FixedTimeslotUpdate 2020-09-22 16:20:07 +02:00
Steffen Gaisser b681a76f29 Merge branch 'master' into gaisser_small_map_issues 2020-09-22 16:18:55 +02:00
Steffen Gaisser ed80768c66 Fixes #194 2020-09-22 16:13:45 +02:00
gaisser 9faa8d3896 Merge branch 'master' into mueller/ipc-updates 2020-09-22 15:25:58 +02:00
gaisser 8f2c8c838e Merge branch 'master' into mueller/FixedTimeslotUpdate 2020-09-22 15:24:07 +02:00
gaisser 66383f78c6 Merge pull request 'renormalized files' (#201) from KSat/fsfw:mueller/file_renormalization into master 
Reviewed-on: #201
 2020-09-22 15:22:34 +02:00
gaisser 56c6f971e1 Merge branch 'master' into mueller/file_renormalization 2020-09-22 15:11:02 +02:00
gaisser 33de6851eb Merge pull request 'SharedRingBuffer' (#167) from KSat/fsfw:mueller/sharedRingBufferPullRequest into master 
Reviewed-on: #167
 2020-09-22 15:08:31 +02:00
gaisser f575c923d7 Merge branch 'master' into mueller/sharedRingBufferPullRequest 2020-09-22 15:08:06 +02:00
gaisser 40d83fe603 Merge pull request 'SimpleRingBuffer Improvements' (#172) from KSat/fsfw:mueller/SimpleRingBufferUpdate2 into master 
Reviewed-on: #172
 2020-09-22 15:07:34 +02:00
gaisser bb896faeb4 Merge branch 'master' into mueller/SimpleRingBufferUpdate2 2020-09-22 15:07:25 +02:00
gaisser 580669d49d Merge pull request 'object manager convergence' (#202) from KSat/fsfw:mueller/objectManager-convergence into master 
Reviewed-on: #202
 2020-09-22 15:03:56 +02:00
gaisser 90b3ebd390 Merge branch 'master' into mueller/objectManager-convergence 2020-09-22 15:00:51 +02:00
gaisser 1791b5af57 Merge pull request 'Default Time Stamper' (#199) from KSat/fsfw:mueller/feature/timeStamper into master 
Reviewed-on: #199
 2020-09-22 15:00:32 +02:00
gaisser 108f897102 Merge branch 'master' into mueller/feature/timeStamper 2020-09-22 14:57:56 +02:00
gaisser 9aaa5721af Merge pull request 'PUS Service 9' (#198) from KSat/fsfw:mueller/pusSrv9 into master 
Reviewed-on: #198
 2020-09-22 14:56:38 +02:00
gaisser ade9c32ff3 Merge branch 'master' into mueller/pusSrv9 2020-09-22 14:56:21 +02:00
gaisser da4f6cf447 Merge pull request 'Stopwatch-Update' (#200) from KSat/fsfw:mueller/Stopwatch-Update into master 
Reviewed-on: #200
 2020-09-22 14:56:06 +02:00
gaisser af53bf6643 Merge branch 'master' into mueller/Stopwatch-Update 2020-09-22 14:52:20 +02:00
gaisser d8c5c4d85d Merge branch 'master' into mueller/pusSrv9 2020-09-22 14:49:39 +02:00
gaisser 17583f605d Merge pull request 'PUS Service 17' (#197) from KSat/fsfw:mueller/pusSrv17 into master 
Reviewed-on: #197
 2020-09-22 14:49:30 +02:00
gaisser 447b69bf03 Merge branch 'master' into mueller/SimpleRingBufferUpdate2 2020-09-22 14:20:51 +02:00
gaisser 37cf7566f9 Merge branch 'master' into mueller/sharedRingBufferPullRequest 2020-09-22 14:20:11 +02:00
gaisser 0d8200e856 Merge pull request 'commanding service base hotfix' (#204) from KSat/fsfw:mueller/CSB-hotfix into master 
Reviewed-on: #204
 2020-09-22 14:05:21 +02:00
gaisser d38e13f9d3 Merge branch 'master' into mueller/FixedTimeslotUpdate 2020-09-15 16:53:04 +02:00
gaisser f3d42de399 Merge branch 'master' into mueller/ipc-updates 2020-09-15 15:47:14 +02:00
gaisser db697f16de Merge branch 'master' into mueller_StoreAccessor 2020-09-15 15:46:11 +02:00
gaisser 42bfedd36c Merge pull request 'health helper update' (#184) from KSat/fsfw:mueller/HealthHelperIdFix into master 
Reviewed-on: #184
 2020-09-15 15:45:56 +02:00
gaisser 9061d6d67e Merge branch 'master' into mueller/HealthHelperIdFix 2020-09-15 15:45:42 +02:00
gaisser c375e838b8 Merge pull request 'Some minor serialize file changes' (#185) from KSat/fsfw:mueller/serialize-convergence into master 
Reviewed-on: #185
 2020-09-15 15:44:40 +02:00
gaisser d77d370c8a Merge branch 'master' into mueller/serialize-convergence 2020-09-15 15:42:12 +02:00
gaisser 21094c4926 Merge pull request 'added host osal' (#165) from KSat/fsfw:mueller/hostosal into master 
Reviewed-on: #165
 2020-09-15 15:33:51 +02:00
gaisser bff08a69fa Merge branch 'master' into mueller/hostosal 2020-09-15 15:08:58 +02:00
gaisser 4f5b233505 Merge pull request 'init after task creation moved to task functionality' (#178) from KSat/fsfw:mueller/TaskUpdates into master 
Reviewed-on: #178
 2020-09-15 15:08:18 +02:00
gaisser 9334a705f8 Merge branch 'master' into mueller/TaskUpdates 2020-09-15 15:05:45 +02:00
gaisser 2c6a239d5e Merge pull request 'added new periodic op divider' (#195) from KSat/fsfw:mueller/feature/periodicOpDivider into master 
Reviewed-on: #195
 2020-09-15 15:04:30 +02:00
gaisser fbd75f947a Merge branch 'master' into mueller/feature/periodicOpDivider 2020-09-15 15:02:34 +02:00
gaisser 4c17ef7be5 Merge pull request 'DLE encoder doc added' (#177) from KSat/fsfw:mueller/dledoc into master 
Reviewed-on: #177
 2020-09-15 15:01:07 +02:00
gaisser 6362de5bc0 Merge branch 'master' into mueller/FixedTimeslotUpdate 2020-09-10 18:20:17 +02:00
gaisser 2d76c744c5 Merge branch 'master' into mueller/HealthHelperIdFix 2020-09-08 14:34:33 +02:00