fsfw/fsfw
fsfw
/
fsfw
10
3
Fork 6
Code Issues 31 Pull Requests 4 Releases 10 Wiki Activity
651 Commits 27 Branches 22 Tags 31 MiB
Commit Graph

651 Commits

Author SHA1 Message Date
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
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: #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
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: #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
Steffen 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
Robin Müller 522433e1b5 Merge branch 'mueller/file_renormalization' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/file_renormalization 2020-09-22 15:21:17 +02:00
Robin Müller 156f44c268 Merge remote-tracking branch 'upstream/master' into mueller/file_renormalization 2020-09-22 15:21:12 +02:00
Steffen Gaisser 56c6f971e1 Merge branch 'master' into mueller/file_renormalization 2020-09-22 15:11:02 +02:00
Steffen 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
Steffen Gaisser f575c923d7 Merge branch 'master' into mueller/sharedRingBufferPullRequest 2020-09-22 15:08:06 +02:00
Steffen 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
Steffen Gaisser bb896faeb4 Merge branch 'master' into mueller/SimpleRingBufferUpdate2 2020-09-22 15:07:25 +02:00
Steffen 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
Steffen Gaisser 90b3ebd390 Merge branch 'master' into mueller/objectManager-convergence 2020-09-22 15:00:51 +02:00
Steffen 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
Steffen Gaisser 108f897102 Merge branch 'master' into mueller/feature/timeStamper 2020-09-22 14:57:56 +02:00
Steffen 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
Steffen Gaisser ade9c32ff3 Merge branch 'master' into mueller/pusSrv9 2020-09-22 14:56:21 +02:00
Steffen 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
Robin Müller 4587fbb76d srv9 func removed 2020-09-22 14:52:24 +02:00
Steffen Gaisser af53bf6643 Merge branch 'master' into mueller/Stopwatch-Update 2020-09-22 14:52:20 +02:00
Steffen Gaisser d8c5c4d85d Merge branch 'master' into mueller/pusSrv9 2020-09-22 14:49:39 +02:00
Steffen 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
Robin Müller 5e974877fe Merge branch 'master' into mueller/pusSrv17 2020-09-22 14:34:05 +02:00
Steffen Gaisser 447b69bf03 Merge branch 'master' into mueller/SimpleRingBufferUpdate2 2020-09-22 14:20:51 +02:00
Steffen Gaisser 37cf7566f9 Merge branch 'master' into mueller/sharedRingBufferPullRequest 2020-09-22 14:20:11 +02:00
Steffen 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
Robin Müller 7851a71a8e commanding service base hotfix 2020-09-22 14:00:18 +02:00
Robin Müller 721793a058 added author tag back 2020-09-18 13:38:53 +02:00
Robin Müller 8ea0a38658 shoulddo fix 2020-09-18 13:37:38 +02:00
Robin Müller 6062192bf0 dded back retval expalanation 2020-09-18 13:37:06 +02:00
Robin Müller 85f21b0516 object manager convergence 2020-09-18 13:32:53 +02:00
Robin Müller 386f347574 renormalized files 2020-09-18 13:15:14 +02:00
Robin Müller 56ff2aef26 include replacement 2020-09-18 13:03:48 +02:00
Robin Müller ad8c6f3528 commented out code added back 2020-09-18 12:58:38 +02:00
Robin Müller 0f0ddfc375 stopwatch update 2020-09-18 12:27:40 +02:00
Robin Müller 96f2b68a22 Merge remote-tracking branch 'upstream/master' into mueller/SimpleRingBufferUpdate2 2020-09-16 19:56:13 +02:00
Robin Müller 53723b0795 include fix 2020-09-16 19:38:43 +02:00
Robin Müller b0a816490e fixed includes 2020-09-16 19:37:17 +02:00
Robin Müller 963015513f added time stamper to framework 2020-09-16 19:36:15 +02:00
Robin Müller 85d6e81881 added srv9 to class IDs 2020-09-16 19:17:00 +02:00
Robin Müller b31bee4fda added srv9 2020-09-16 19:11:50 +02:00
Robin Müller ae426c50ba space replaced by tab 2020-09-16 19:09:51 +02:00
Robin Müller a5c6be9dd9 added srv17 2020-09-16 19:05:25 +02:00
Steffen 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
Steffen Gaisser 9061d6d67e Merge branch 'master' into mueller/HealthHelperIdFix 2020-09-15 15:45:42 +02:00