Commit Graph

3333 Commits

Author SHA1 Message Date
37f4cc4644 taken over stopwatch changes 2020-09-18 12:28:29 +02:00
0f0ddfc375 stopwatch update 2020-09-18 12:27:40 +02:00
0c6514a682 clock uses getUptime again 2020-09-17 22:31:28 +02:00
6ef5e3e550 queue factory host OS fix 2020-09-16 21:22:53 +02:00
96f2b68a22 Merge remote-tracking branch 'upstream/master' into mueller/SimpleRingBufferUpdate2 2020-09-16 19:56:13 +02:00
53723b0795 include fix 2020-09-16 19:38:43 +02:00
b0a816490e fixed includes 2020-09-16 19:37:17 +02:00
963015513f added time stamper to framework 2020-09-16 19:36:15 +02:00
85d6e81881 added srv9 to class IDs 2020-09-16 19:17:00 +02:00
b31bee4fda added srv9 2020-09-16 19:11:50 +02:00
ae426c50ba space replaced by tab 2020-09-16 19:09:51 +02:00
a5c6be9dd9 added srv17 2020-09-16 19:05:25 +02:00
e5dac30e98 new include used now 2020-09-15 17:37:43 +02:00
0d5724e3d4 include improvements taken over 2020-09-15 17:34:07 +02:00
347d591def uses new define and config file now 2020-09-15 17:33:21 +02:00
7643af8607 include guard fix 2020-09-15 17:15:22 +02:00
b8ad17639c include guard fix 2020-09-15 17:02:31 +02:00
21346e40a5 some improvements 2020-09-15 16:58:38 +02:00
589b95d28b Merge branch 'master' into mueller/feature/windowsUdpBridge 2020-09-15 16:56:55 +02:00
d38e13f9d3 Merge branch 'master' into mueller/FixedTimeslotUpdate 2020-09-15 16:53:04 +02:00
3fcbb988ae new file for typedef to avoid circular include 2020-09-15 16:47:01 +02:00
850a4a3e3d header file renamed 2020-09-15 16:44:48 +02:00
15891b3cf0 fixed some message queue includes 2020-09-15 16:42:17 +02:00
ad98a63e87 changes taken over from upstream master 2020-09-15 16:02:58 +02:00
e707c5e051 fixes taken over 2020-09-15 15:58:12 +02:00
e96ab12312 comment and calculation fix 2020-09-15 15:55:35 +02:00
f3d42de399 Merge branch 'master' into mueller/ipc-updates 2020-09-15 15:47:14 +02:00
db697f16de Merge branch 'master' into mueller_StoreAccessor 2020-09-15 15:46:11 +02:00
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
9061d6d67e Merge branch 'master' into mueller/HealthHelperIdFix 2020-09-15 15:45:42 +02:00
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
d77d370c8a Merge branch 'master' into mueller/serialize-convergence 2020-09-15 15:42:12 +02:00
21094c4926 Merge pull request 'added host osal' (#165) from KSat/fsfw:mueller/hostosal into master
Reviewed-on: fsfw/fsfw#165
2020-09-15 15:33:51 +02:00
51cf13428b Merge branch 'mueller/hostosal' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/hostosal 2020-09-15 15:28:37 +02:00
b4ca42f1fb ccsds time update 2020-09-15 15:28:05 +02:00
bff08a69fa Merge branch 'master' into mueller/hostosal 2020-09-15 15:08:58 +02:00
4f5b233505 Merge pull request 'init after task creation moved to task functionality' (#178) from KSat/fsfw:mueller/TaskUpdates into master
Reviewed-on: fsfw/fsfw#178
2020-09-15 15:08:18 +02:00
9334a705f8 Merge branch 'master' into mueller/TaskUpdates 2020-09-15 15:05:45 +02:00
2c6a239d5e Merge pull request 'added new periodic op divider' (#195) from KSat/fsfw:mueller/feature/periodicOpDivider into master
Reviewed-on: fsfw/fsfw#195
2020-09-15 15:04:30 +02:00
fbd75f947a Merge branch 'master' into mueller/feature/periodicOpDivider 2020-09-15 15:02:34 +02:00
4c17ef7be5 Merge pull request 'DLE encoder doc added' (#177) from KSat/fsfw:mueller/dledoc into master
Reviewed-on: fsfw/fsfw#177
2020-09-15 15:01:07 +02:00
e8de2fc47a added srv3 2020-09-14 18:29:19 +02:00
2d2316a0c7 hk message continued 2020-09-14 18:01:48 +02:00
f9612afe06 added report status toggler 2020-09-11 14:06:08 +02:00
71125c075a added new setter function 2020-09-10 21:05:50 +02:00
2d2d0de35c local data pool manager bugfixes 2020-09-10 20:24:49 +02:00
4f48ed9756 added new periodic op divider 2020-09-10 19:53:52 +02:00
d7bbd4b652 severla bugfixes, new periodic op divider added 2020-09-10 19:51:17 +02:00
6362de5bc0 Merge branch 'master' into mueller/FixedTimeslotUpdate 2020-09-10 18:20:17 +02:00
058a036bac Merge branch 'master' into mueller/oldPoolRenaming 2020-09-10 16:47:21 +02:00