Commit Graph

2838 Commits

Author SHA1 Message Date
1b8f134029 Merge remote-tracking branch 'upstream/master' into mueller_MutexImprovements 2020-08-19 17:30:08 +02:00
5b4e49e966 Merge remote-tracking branch 'upstream/master' into mueller/devices/FDIR 2020-08-19 17:26:50 +02:00
180d997b03 Merge remote-tracking branch 'upstream/master' into mueller/Linux-SetTaskIF-Fix 2020-08-19 17:25:01 +02:00
a2c8b3f75b Merge remote-tracking branch 'upstream/master' into mueller/FreeRTOSstackSizeCorrection 2020-08-19 17:20:44 +02:00
f90bd01282 added srv17 and srv201 2020-08-19 17:00:50 +02:00
7b998268cb error message improvement 2020-08-19 13:17:40 +02:00
31f398cec9 small fix 2020-08-19 13:16:08 +02:00
e59022dd43 old .mk file removed 2020-08-19 13:15:14 +02:00
c63665c257 renamed framework.mk to fsfw.mk 2020-08-19 13:13:57 +02:00
a1d94ec556 added aditional comment 2020-08-18 20:51:13 +02:00
5af50cfbf7 renamed .mk file 2020-08-18 20:50:24 +02:00
fbecda7549 include replacements 2020-08-18 13:09:15 +02:00
49d4b6ebc7 Merge pull request 'All includes are relative now #147' (#164) from gaisser/fsfw:gaisser_relative_paths into master 2020-08-18 12:07:40 +02:00
549ad97bd3 shared ring buffer pull request 2020-08-18 11:25:57 +02:00
111f9dce7d added host osal 2020-08-16 23:06:32 +02:00
9e0a905096 Two paths gone wrong 2020-08-13 20:58:49 +02:00
d5dedce294 Relative Paths 2020-08-13 20:53:35 +02:00
287a83c54c Another shadowing error 2020-08-13 19:11:23 +02:00
3d89bc83e5 Another shadowing, altough again no problem 2020-08-13 18:08:17 +02:00
4a2ef6d97f Fixed a shadowing issue of with moving to inner scope 2020-08-13 17:58:42 +02:00
b484e4d5ad Removed unused function 2020-08-13 10:27:16 +02:00
7dbab61ab7 Merge remote-tracking branch 'origin/master' into gaisser_fixes_fixedMap 2020-08-12 10:10:39 +02:00
e535bc1427 Merge pull request 'PUS: PUS Services' (#139) from KSat/fsfw:mueller_PusServices into master 2020-08-12 10:07:36 +02:00
18105e2d16 Merge pull request 'CSB improvements' (#143) from KSat/fsfw:mueller/feature/CSBupdate into master 2020-08-12 10:05:43 +02:00
ebc11bd777 Merge pull request 'Corrected warning in framework mk to fit name of setting' (#160) from gaisser_framework_mk_small_change into master 2020-08-11 17:21:06 +02:00
3d4daa51d5 Corrected warning to fit name of setting 2020-08-11 17:17:50 +02:00
e963aca02a Fixed an issue with memmove in FixedOrderedMultimap 2020-08-11 17:02:19 +02:00
8c722feafb Fixes #47 and #36 2020-08-11 16:21:59 +02:00
f39b8bdb41 several simplifications 2020-08-10 18:33:28 +02:00
87eb31b65a local data pool manager uses new packet now 2020-08-09 20:06:29 +02:00
9e7d92b387 some renaming , hk packets finished 2020-08-09 19:46:37 +02:00
a181f19c02 Merge branch 'mueller/master' into mueller/project/distribDatapool 2020-08-09 17:13:58 +02:00
5d09ae3221 additional comment 2020-08-08 23:47:44 +02:00
f9ce1d9eb9 more simplifications for shared ring buffer 2020-08-08 23:46:21 +02:00
6484c1a276 shared ring buffer simplified 2020-08-08 23:45:18 +02:00
b092850dfc internal housekeeping packet finished 2020-08-08 21:32:15 +02:00
b828d7c6d7 continued with local datapool manager 2020-08-08 19:56:42 +02:00
e7d28d630c continued with implementation 2020-08-08 19:43:28 +02:00
03cd5780f9 null initializations in header 2020-08-08 13:29:38 +02:00
6b4fa0cc04 fdir update 2020-08-08 13:28:59 +02:00
121e94a385 local pool var update 2020-08-08 13:20:02 +02:00
e61fdd0d5e freeRTOS task management init 2020-08-08 13:15:41 +02:00
5c85d03c39 additional check for freeRTOS 2020-08-08 13:04:31 +02:00
fba8775f49 some renaming 2020-08-08 12:51:31 +02:00
f766398b20 some bugfixes 2020-08-08 12:49:20 +02:00
944226c2ed periodic task if fix 2020-08-08 12:47:14 +02:00
a0f41d3238 stack size is bytes now 2020-08-08 12:46:06 +02:00
af11c8fcf9 freeRTOS corrections 2020-08-08 12:38:39 +02:00
a6a1e65607 local data set fix 2020-08-08 12:17:27 +02:00
4afb19be51 Merge branch 'mueller/master' into mueller/project/distribDatapool 2020-08-08 12:04:52 +02:00