Commit Graph

401 Commits

Author SHA1 Message Date
df4fb17a45 Merge remote-tracking branch 'upstream/master' into mueller/feature/TmTcUnixBridge 2020-08-27 17:31:16 +02:00
fddf31121d Merge pull request 'setTaskIF in periodic task' (#154) from KSat/fsfw:mueller/Linux-SetTaskIF-Fix into master 2020-08-25 12:29:02 +02:00
7e0cf49723 author tag 2020-08-25 12:24:37 +02:00
d0419467a7 include guard fix 2020-08-25 12:23:46 +02:00
1235e38556 rtems adaption 2020-08-25 12:20:56 +02:00
8c150fd40d Merge remote-tracking branch 'upstream/master' into mueller/Linux-SetTaskIF-Fix 2020-08-25 12:19:52 +02:00
a1d1d42e88 Merge pull request 'singly linked list improvements' (#108) from KSat/fsfw:mueller_SinglyLinkedListImprovements into master 2020-08-25 12:18:23 +02:00
a414be23bf Merge pull request 'renamed framework.mk to fsfw.mk' (#169) from KSat/fsfw:mueller/submakefile-renamed into master 2020-08-25 12:16:48 +02:00
02de6c41ec Merge pull request 'Mutex improvements' (#90) from KSat/fsfw:mueller_MutexImprovements into master 2020-08-25 12:13:30 +02:00
74dea921e0 made fixes 2020-08-25 12:10:28 +02:00
ab4c65c87a added header file changes 2020-08-25 12:08:12 +02:00
49a36d6fdc removed definitions 2020-08-25 12:06:39 +02:00
a4626aeac0 made rtems adaption 2020-08-25 12:04:59 +02:00
1b8f134029 Merge remote-tracking branch 'upstream/master' into mueller_MutexImprovements 2020-08-19 17:30:08 +02:00
180d997b03 Merge remote-tracking branch 'upstream/master' into mueller/Linux-SetTaskIF-Fix 2020-08-19 17:25:01 +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
9e0a905096 Two paths gone wrong 2020-08-13 20:58:49 +02:00
d5dedce294 Relative Paths 2020-08-13 20:53:35 +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
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
d8bf1931cc doc correction 2020-08-01 16:55:20 +02:00
2198406714 csb update 2020-08-01 16:53:17 +02:00
4213e2e081 Merge remote-tracking branch 'upstram/master' into mueller/feature/CSBupdate 2020-08-01 16:46:27 +02:00
e188e65897 Merge pull request 'important bugfix' (#152) from KSat/fsfw:hotfix/PeriodicTaskOverflowChecking into master 2020-07-30 11:22:47 +02:00
652c60c362 important bugfix
I checked all 5 cases for overflows when checking
for missed deadlines (there is current time, timeToWake
and lastWakeTime, with various combinations of overflows)

This should be the correct implementation now
2020-07-29 20:02:04 +02:00
c16675f69a Merge pull request 'SerialArrayListAdapter' (#151) from KSat/fsfw:bugfix/SerialArrayListAdapter into master 2020-07-28 13:08:10 +02:00
4bffcf17fb some formatting stuff 2020-07-28 13:04:58 +02:00
036a887ea3 bugfix 2020-07-28 13:02:43 +02:00
a87a8f527f Merge pull request 'ServiceInterfaceBuffer Bugfix #149' (#150) from gaisser_fix_service_interface_149 into master 2020-07-28 12:51:28 +02:00