Commit Graph

1261 Commits

Author SHA1 Message Date
cef84b13d9 renormalization 2020-09-29 14:35:05 +02:00
6f965c74ac Merge remote-tracking branch 'upstream/master' into mueller_StoreAccessor 2020-09-29 14:34:49 +02:00
b2677ae040 Merge branch 'master' into mueller_tcPacketBase 2020-09-29 14:34:16 +02:00
40fa8e5405 Merge branch 'master' into mueller/oldPoolRenaming 2020-09-29 14:31:27 +02:00
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
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
7dbb73b7d8 removed dbeug printout 2020-09-29 14:29:57 +02:00
9f7dad31eb Merge branch 'master' into mueller/FixedTimeslotUpdate 2020-09-29 14:21:02 +02:00
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
170217e2e8 Merge branch 'master' into mueller/ipc-updates 2020-09-29 14:15:13 +02:00
bf5e7241b6 Merge branch 'master' into mueller/MQM_IF_UpdateLinux 2020-09-29 14:14:56 +02:00
291a62eeb9 Merge branch 'master' into gaisser_small_map_issues 2020-09-29 14:14:48 +02:00
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
183b6a4193 small bugfix 2020-09-29 13:34:27 +02:00
75bdf96799 Merge branch 'master' into mueller/MQM_IF_UpdateLinux 2020-09-27 19:22:07 +02:00
6d2266f7d0 equalization complete 2020-09-26 14:58:53 +02:00
9d4c2b90f3 removed proxy/ not used&working? 2020-09-26 14:54:23 +02:00
7b57f372bf starting convergence 2020-09-26 14:51:00 +02:00
bf5688c8d8 last fixes 2020-09-26 14:36:56 +02:00
a0bc6b3c1f MQM IF update 2020-09-26 14:34:49 +02:00
eec022f801 Merge remote-tracking branch 'origin/mueller/ipc-updates' into mueller/MQMQ_IF_UpdateFreeRTOS 2020-09-26 14:33:35 +02:00
20279169ed Merge branch 'mueller/ipc-updates' into mueller/MQMQ_IF_UpdateFreeRTOS 2020-09-26 14:27:09 +02:00
2edc7fd096 Merge remote-tracking branch 'upstream/master' into mueller/MQMQ_IF_UpdateFreeRTOS 2020-09-26 14:25:50 +02:00
13b68f10a0 added usage of new interface 2020-09-26 14:24:09 +02:00
496251bd68 Merge branch 'master' into mueller/ipc-updates 2020-09-26 14:21:05 +02:00
22d9b77165 added documentation 2020-09-26 14:19:51 +02:00
40558835c7 Merge branch 'master' into mueller/FixedTimeslotUpdate 2020-09-26 14:14:50 +02:00
4d1492f130 event cfg file loc not explicit anymore 2020-09-26 14:13:20 +02:00
c24c0ea575 Merge branch 'master' into mueller/oldPoolRenaming 2020-09-26 14:04:41 +02:00
842c21684a Merge branch 'master' into gaisser_small_map_issues 2020-09-22 18:37:51 +02:00
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
59f72d1031 Small fix with new pus services 2020-09-22 16:59:13 +02:00
978d7514a4 added doc, changed type 2020-09-22 16:32:59 +02:00
2f73841580 include fix 2020-09-22 16:24:40 +02:00
74a4c98ca7 Small format stuff 2020-09-22 16:23:35 +02:00
0bc3807c18 added FIFO 2020-09-22 16:22:37 +02:00
d0f912f32b Merge branch 'master' into mueller/FixedTimeslotUpdate 2020-09-22 16:20:07 +02:00
b681a76f29 Merge branch 'master' into gaisser_small_map_issues 2020-09-22 16:18:55 +02:00
ed80768c66 Fixes #194 2020-09-22 16:13:45 +02:00
de840dcf8d last fixes for linux 2020-09-22 16:10:43 +02:00
e0d9a080c5 Merge remote-tracking branch 'upstream/master' into mueller/MQM_IF_UpdateLinux 2020-09-22 16:06:33 +02:00
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
ab0f4d8c87 service 9 ID added 2020-09-22 16:01:34 +02:00
98333b92ef srv17 id added, include fix for linux 2020-09-22 15:57:26 +02:00
87fb17f39a IF replacements 2020-09-22 15:52:26 +02:00
8652f2f13f message queue IF update 2020-09-22 15:50:10 +02:00
cea748676e linux message queue update 2020-09-22 15:47:29 +02:00
74b9aef36b freeRTOS update 2020-09-22 15:33:28 +02:00
7dc3a7ecbd fix so it compiles 2020-09-22 15:31:15 +02:00
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