Commit Graph

1515 Commits

Author SHA1 Message Date
5210bce64d Merge remote-tracking branch 'upstream/master' into mueller_ringBufferStatic 2020-08-24 14:51:13 +02:00
26b63d63b9 small fix 2020-08-24 14:47:53 +02:00
1b4c4de3fa getter/setter functions for serial buffer adapter 2020-08-24 14:38:59 +02:00
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
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
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
6b4fa0cc04 fdir update 2020-08-08 13:28:59 +02:00
e61fdd0d5e freeRTOS task management init 2020-08-08 13:15:41 +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
20f7217501 Merge remote-tracking branch 'upstream/master' into mueller_MutexImprovements 2020-08-07 22:32:19 +02:00
11e23420f2 Merge remote-tracking branch 'upstream/master' into mueller/Linux-SetTaskIF-Fix 2020-08-07 22:31:11 +02:00
3905b72b08 Merge pull request 'linux hotfix' (#155) from KSat/fsfw:mueller/LinuxHotfix into master 2020-08-07 22:29:29 +02:00
90a3e2b8c5 linux hotfix 2020-08-07 22:26:01 +02:00
54825dca6b periodic posix task hotfix 2020-08-07 22:19:13 +02:00
caeb2f9dd6 mutex api changes 2020-08-07 22:16:10 +02:00
7b3fddfd42 implemented mutex if changes 2020-08-07 22:10:58 +02:00
9d90348175 Merge remote-tracking branch 'upstream/master' into mueller_MutexImprovements 2020-08-07 22:07:37 +02:00
9102eec4ab interface change for freeRTOS 2020-08-04 15:20:43 +02:00
c42b5283af periodic task IF: setting task if boolean removed 2020-08-04 15:19:31 +02:00
ea9288d848 updated subsystem ID range 2020-08-04 15:17:40 +02:00
78442a8b92 Amending PR #145, forgot some documentation 2020-08-04 12:25:29 +02:00
03539a6991 Merge pull request 'HasActionsIF + CommandMessage Typo' (#145) from KSat/fsfw:mueller/feature/HasActionsIF into master 2020-08-04 12:18:29 +02:00
6ac36cec15 removed other include in framework.mk 2020-08-02 15:56:38 +02:00
d58fc5c6f7 removed includes in framework.mk 2020-08-02 15:55:56 +02:00
be6060ec94 Merge remote-tracking branch 'upstream/master' into mueller_PusServices 2020-08-02 15:55:22 +02:00
f36da8a79c Merge remote-tracking branch 'upstream/master' into mueller/feature/DHBupdate 2020-08-02 15:49:11 +02:00
2e08037e75 revertiing pool changes 2020-08-02 15:48:09 +02:00
a0ff1e0019 reverted datapool changes 2020-08-02 15:46:25 +02:00
d8bf1931cc doc correction 2020-08-01 16:55:20 +02:00