Commit Graph

70 Commits

Author SHA1 Message Date
86a1ae4a8a Merge remote-tracking branch 'upstream/master' into mueller/MQM_IF_UpdateLinux 2020-09-29 18:05:36 +02:00
f73f798a4d lines removed 2020-09-29 17:28:37 +02:00
4fce0377a9 missing include for linux 2020-09-29 17:28:02 +02:00
4010d8d960 Merge remote-tracking branch 'upstream/master' into mueller/MQM_IF_UpdateLinux 2020-09-29 15:20:32 +02:00
9f7dad31eb Merge branch 'master' into mueller/FixedTimeslotUpdate 2020-09-29 14:21:02 +02:00
496251bd68 Merge branch 'master' into mueller/ipc-updates 2020-09-26 14:21:05 +02:00
d0f912f32b Merge branch 'master' into mueller/FixedTimeslotUpdate 2020-09-22 16:20:07 +02:00
de840dcf8d last fixes for linux 2020-09-22 16:10:43 +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
cea748676e linux message queue update 2020-09-22 15:47:29 +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
b2777faf66 queueue factory update 2020-09-22 15:29:28 +02:00
8f2c8c838e Merge branch 'master' into mueller/FixedTimeslotUpdate 2020-09-22 15:24:07 +02:00
156f44c268 Merge remote-tracking branch 'upstream/master' into mueller/file_renormalization 2020-09-22 15:21:12 +02:00
386f347574 renormalized files 2020-09-18 13:15:14 +02:00
ad8c6f3528 commented out code added back 2020-09-18 12:58:38 +02:00
0f0ddfc375 stopwatch update 2020-09-18 12:27:40 +02:00
d38e13f9d3 Merge branch 'master' into mueller/FixedTimeslotUpdate 2020-09-15 16:53:04 +02:00
9334a705f8 Merge branch 'master' into mueller/TaskUpdates 2020-09-15 15:05:45 +02:00
6362de5bc0 Merge branch 'master' into mueller/FixedTimeslotUpdate 2020-09-10 18:20:17 +02:00
6c42189371 some minor improvements 2020-09-06 15:49:32 +02:00
ba01b4578c Merge branch 'master' into mueller/TaskUpdates 2020-09-06 15:41:40 +02:00
234fbcbf41 small bugfix in error checking 2020-09-06 09:34:06 +02:00
4bdac1e017 changed from mueller/master taken over 2020-09-04 14:49:59 +02:00
381914886d initAfterTaskCreation added for linux 2020-09-04 14:43:53 +02:00
0eb4c3817e added initialize after taks creation for linux 2020-09-04 14:31:39 +02:00
aec557a8c0 updated unix udp bridge 2020-08-28 17:14:20 +02:00
6c0defed5e Merge remote-tracking branch 'upstream/master' into mueller/feature/TmTcUnixBridge 2020-08-28 17:08:54 +02:00
df4fb17a45 Merge remote-tracking branch 'upstream/master' into mueller/feature/TmTcUnixBridge 2020-08-27 17:31:16 +02:00
0fedad6da0 semaphore factory update 2020-08-27 17:14:49 +02:00
73db79a3fe updated linux implementation 2020-08-27 17:06:10 +02:00
7723ee13b3 Merge remote-tracking branch 'upstream/master' into mueller_binSemaphoreInit 2020-08-27 16:28:50 +02:00
8c150fd40d Merge remote-tracking branch 'upstream/master' into mueller/Linux-SetTaskIF-Fix 2020-08-25 12:19:52 +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
d5dedce294 Relative Paths 2020-08-13 20:53:35 +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
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
9d90348175 Merge remote-tracking branch 'upstream/master' into mueller_MutexImprovements 2020-08-07 22:07:37 +02:00
c42b5283af periodic task IF: setting task if boolean removed 2020-08-04 15:19:31 +02:00
b74fbbddb9 Merge pull request 'FreeRTOS PeriodicTask improvement' (#116) from KSat/fsfw:mueller_PeriodicTaskImprovements into master 2020-07-28 12:45:27 +02:00
a9c8bea857 Merge remote-tracking branch 'upstream/master' into mueller_binSemaphoreInit 2020-07-28 12:26:56 +02:00
a0834204da Merge remote-tracking branch 'upstream/master' into mueller_MutexImprovements 2020-07-13 22:18:08 +02:00
3a2dc5eeb6 new tmtc unix udp bridge 2020-07-13 13:33:12 +02:00
6f40a8c622 Merge pull request 'mueller_stopwatch' (#30) from KSat/fsfw:mueller_stopwatch into master 2020-07-07 12:05:04 +02:00