Commit Graph

3101 Commits

Author SHA1 Message Date
muellerr 5e3f40a2c1 changes taken over from pull request 2020-09-18 13:40:48 +02:00
muellerr 721793a058 added author tag back 2020-09-18 13:38:53 +02:00
muellerr 8ea0a38658 shoulddo fix 2020-09-18 13:37:38 +02:00
muellerr 6062192bf0 dded back retval expalanation 2020-09-18 13:37:06 +02:00
muellerr 85f21b0516 object manager convergence 2020-09-18 13:32:53 +02:00
muellerr 3a043b5773 object manager tweaks complete 2020-09-18 13:31:51 +02:00
muellerr f50a80fc3c minor tweaks 2020-09-18 13:29:42 +02:00
muellerr 4d4166071c added pus services to framework objects 2020-09-18 13:28:20 +02:00
muellerr 1b5c3786b6 taken over serviceinterface folder 2020-09-18 13:24:06 +02:00
muellerr 386f347574 renormalized files 2020-09-18 13:15:14 +02:00
muellerr b429359864 renormalize files 2020-09-18 13:14:01 +02:00
muellerr 57c88059e5 DHB small improvements 2020-09-18 13:12:07 +02:00
muellerr 7b0ddb3941 quick fix DHB 2020-09-18 13:09:23 +02:00
muellerr 56ff2aef26 include replacement 2020-09-18 13:03:48 +02:00
muellerr ad8c6f3528 commented out code added back 2020-09-18 12:58:38 +02:00
muellerr e70e9e3f1f added uptime seconds functions 2020-09-18 12:57:30 +02:00
muellerr 19632b8fb1 linux fixes 2020-09-18 12:36:36 +02:00
muellerr e0b2e0b00a fxed linux message queues 2020-09-18 12:31:11 +02:00
muellerr 37f4cc4644 taken over stopwatch changes 2020-09-18 12:28:29 +02:00
muellerr 0f0ddfc375 stopwatch update 2020-09-18 12:27:40 +02:00
muellerr 0c6514a682 clock uses getUptime again 2020-09-17 22:31:28 +02:00
muellerr 6ef5e3e550 queue factory host OS fix 2020-09-16 21:22:53 +02:00
muellerr 96f2b68a22 Merge remote-tracking branch 'upstream/master' into mueller/SimpleRingBufferUpdate2 2020-09-16 19:56:13 +02:00
muellerr 53723b0795 include fix 2020-09-16 19:38:43 +02:00
muellerr b0a816490e fixed includes 2020-09-16 19:37:17 +02:00
muellerr 963015513f added time stamper to framework 2020-09-16 19:36:15 +02:00
muellerr 85d6e81881 added srv9 to class IDs 2020-09-16 19:17:00 +02:00
muellerr b31bee4fda added srv9 2020-09-16 19:11:50 +02:00
muellerr ae426c50ba space replaced by tab 2020-09-16 19:09:51 +02:00
muellerr a5c6be9dd9 added srv17 2020-09-16 19:05:25 +02:00
muellerr e5dac30e98 new include used now 2020-09-15 17:37:43 +02:00
muellerr 0d5724e3d4 include improvements taken over 2020-09-15 17:34:07 +02:00
muellerr 347d591def uses new define and config file now 2020-09-15 17:33:21 +02:00
muellerr 7643af8607 include guard fix 2020-09-15 17:15:22 +02:00
muellerr b8ad17639c include guard fix 2020-09-15 17:02:31 +02:00
muellerr 21346e40a5 some improvements 2020-09-15 16:58:38 +02:00
gaisser 589b95d28b Merge branch 'master' into mueller/feature/windowsUdpBridge 2020-09-15 16:56:55 +02:00
gaisser d38e13f9d3 Merge branch 'master' into mueller/FixedTimeslotUpdate 2020-09-15 16:53:04 +02:00
muellerr 3fcbb988ae new file for typedef to avoid circular include 2020-09-15 16:47:01 +02:00
muellerr 850a4a3e3d header file renamed 2020-09-15 16:44:48 +02:00
muellerr 15891b3cf0 fixed some message queue includes 2020-09-15 16:42:17 +02:00
muellerr ad98a63e87 changes taken over from upstream master 2020-09-15 16:02:58 +02:00
muellerr e707c5e051 fixes taken over 2020-09-15 15:58:12 +02:00
muellerr e96ab12312 comment and calculation fix 2020-09-15 15:55:35 +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: fsfw/fsfw#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: fsfw/fsfw#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