eive/fsfw
eive
/
fsfw
forked from fsfw/fsfw
14
1
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity
786 Commits 28 Branches 1 Tag 24 MiB
Commit Graph

786 Commits

Author SHA1 Message Date
Steffen 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
Robin Müller 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
Steffen Gaisser e71020d631 Removed comments and added include 2020-09-29 15:24:29 +02:00
Steffen Gaisser 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
Steffen Gaisser d3ce6d147e Merge branch 'master' into mueller/VerifHotfix 2020-09-29 15:13:43 +02:00
Steffen Gaisser 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
Robin Müller a71528551a include added 2020-09-29 15:10:08 +02:00
Robin Müller 6a5268f5b0 typo fix 2020-09-29 15:05:18 +02:00
Robin Müller 392d0299a9 Merge remote-tracking branch 'upstream/master' into mueller/modes-memory 2020-09-29 15:04:42 +02:00
Robin Müller 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
Steffen Gaisser e55f8f583d Merge branch 'master' into gaisser_small_map_issues 2020-09-29 14:58:35 +02:00
Steffen Gaisser 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
Robin Müller 6c86cf88f3 Merge branch 'master' into mueller_StoreAccessor 2020-09-29 14:56:20 +02:00
Robin Müller 352ce13fb3 removed line break 2020-09-29 14:55:17 +02:00
Robin Müller 1ed1b7ea06 include guard fix 2020-09-29 14:51:08 +02:00
Robin Müller a58e47623f update 2020-09-29 14:50:16 +02:00
Robin Müller 622c7a5a0d debug output removed 2020-09-29 14:45:23 +02:00
Robin Müller bed4e7affa nullptr replacement 2020-09-29 14:43:23 +02:00
Robin Müller 1ff85c88b2 store accessor small changes 2020-09-29 14:42:48 +02:00
Robin Müller cef84b13d9 renormalization 2020-09-29 14:35:05 +02:00
Robin Müller 6f965c74ac Merge remote-tracking branch 'upstream/master' into mueller_StoreAccessor 2020-09-29 14:34:49 +02:00
Steffen Gaisser 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
Robin Müller 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
Robin Müller 7dbb73b7d8 removed dbeug printout 2020-09-29 14:29:57 +02:00
Steffen Gaisser 9f7dad31eb Merge branch 'master' into mueller/FixedTimeslotUpdate 2020-09-29 14:21:02 +02:00
Steffen Gaisser 21cbb19410 Merge pull request 'ipc update' (#176) from KSat/fsfw:mueller/ipc-updates into master 
Reviewed-on: fsfw/fsfw#176
 2020-09-29 14:20:18 +02:00
Steffen Gaisser 170217e2e8 Merge branch 'master' into mueller/ipc-updates 2020-09-29 14:15:13 +02:00
Steffen Gaisser 291a62eeb9 Merge branch 'master' into gaisser_small_map_issues 2020-09-29 14:14:48 +02:00
Steffen 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: fsfw/fsfw#213
 2020-09-29 14:14:27 +02:00
Robin Müller 183b6a4193 small bugfix 2020-09-29 13:34:27 +02:00
Robin Müller 6d2266f7d0 equalization complete 2020-09-26 14:58:53 +02:00
Robin Müller 9d4c2b90f3 removed proxy/ not used&working? 2020-09-26 14:54:23 +02:00
Robin Müller 7b57f372bf starting convergence 2020-09-26 14:51:00 +02:00
Robin Müller 496251bd68 Merge branch 'master' into mueller/ipc-updates 2020-09-26 14:21:05 +02:00
Robin Müller 22d9b77165 added documentation 2020-09-26 14:19:51 +02:00
Robin Müller 40558835c7 Merge branch 'master' into mueller/FixedTimeslotUpdate 2020-09-26 14:14:50 +02:00
Steffen Gaisser 842c21684a Merge branch 'master' into gaisser_small_map_issues 2020-09-22 18:37:51 +02:00
Steffen Gaisser d1fb512c1f Merge pull request 'Small fix with new pus services' (#210) from gaisser/fsfw:gaisser_small_fix_subsystem_id into master 
Reviewed-on: fsfw/fsfw#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
Steffen 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
Robin Müller 59e4b95b62 Merge pull request 'srv17 id added, include fix for linux' (#206) from KSat/fsfw:mueller/include_fix_srv17_id into master 
Reviewed-on: fsfw/fsfw#206
 2020-09-22 16:03:23 +02:00
Robin Müller ab0f4d8c87 service 9 ID added 2020-09-22 16:01:34 +02:00
Robin Müller 98333b92ef srv17 id added, include fix for linux 2020-09-22 15:57:26 +02:00
Robin Müller 74b9aef36b freeRTOS update 2020-09-22 15:33:28 +02:00
Robin Müller 7dc3a7ecbd fix so it compiles 2020-09-22 15:31:15 +02:00
Robin Müller 4248e4000c Merge branch 'mueller/ipc-updates' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/ipc-updates 2020-09-22 15:29:38 +02:00