Commit Graph

262 Commits

Author SHA1 Message Date
muellerr 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
muellerr b2777faf66 queueue factory update 2020-09-22 15:29:28 +02:00
gaisser 9faa8d3896 Merge branch 'master' into mueller/ipc-updates 2020-09-22 15:25:58 +02:00
gaisser 8f2c8c838e Merge branch 'master' into mueller/FixedTimeslotUpdate 2020-09-22 15:24:07 +02:00
muellerr 156f44c268 Merge remote-tracking branch 'upstream/master' into mueller/file_renormalization 2020-09-22 15:21:12 +02:00
gaisser 3aa9ab2048 Merge branch 'master' into mueller/feature/windowsUdpBridge 2020-09-22 15:06:14 +02:00
muellerr 386f347574 renormalized files 2020-09-18 13:15:14 +02:00
muellerr ad8c6f3528 commented out code added back 2020-09-18 12:58:38 +02:00
muellerr 0f0ddfc375 stopwatch update 2020-09-18 12:27:40 +02:00
muellerr 21346e40a5 some improvements 2020-09-15 16:58:38 +02:00
gaisser 589b95d28b Merge branch 'master' into mueller/feature/windowsUdpBridge 2020-09-15 16:56:55 +02:00
gaisser d38e13f9d3 Merge branch 'master' into mueller/FixedTimeslotUpdate 2020-09-15 16:53:04 +02:00
gaisser bff08a69fa Merge branch 'master' into mueller/hostosal 2020-09-15 15:08:58 +02:00
gaisser 9334a705f8 Merge branch 'master' into mueller/TaskUpdates 2020-09-15 15:05:45 +02:00
gaisser 6362de5bc0 Merge branch 'master' into mueller/FixedTimeslotUpdate 2020-09-10 18:20:17 +02:00
gaisser b3af2b5fbc Merge branch 'master' into mueller/feature/windowsUdpBridge 2020-09-08 14:14:03 +02:00
muellerr 6c42189371 some minor improvements 2020-09-06 15:49:32 +02:00
muellerr a9975f5aef added new windows udp bridge 2020-09-06 15:46:49 +02:00
muellerr ba01b4578c Merge branch 'master' into mueller/TaskUpdates 2020-09-06 15:41:40 +02:00
muellerr 234fbcbf41 small bugfix in error checking 2020-09-06 09:34:06 +02:00
muellerr 902cd4d210 host osal update 2020-09-05 21:19:53 +02:00
muellerr a1155686c5 updated host osal 2020-09-05 20:18:52 +02:00
muellerr c6dbce7446 Merge remote-tracking branch 'upstream/master' into mueller/hostosal 2020-09-05 20:18:18 +02:00
muellerr 4bdac1e017 changed from mueller/master taken over 2020-09-04 14:49:59 +02:00
muellerr 381914886d initAfterTaskCreation added for linux 2020-09-04 14:43:53 +02:00
muellerr 0eb4c3817e added initialize after taks creation for linux 2020-09-04 14:31:39 +02:00
muellerr 92c7369276 include guard fix 2020-09-04 13:56:12 +02:00
muellerr 5eaf6cfd1f renormalizing pull request step1 2020-09-04 13:52:02 +02:00
muellerr 7ad5274803 Merge remote-tracking branch 'upstream/master' into mueller/FixedTimeslotUpdate 2020-09-04 13:51:09 +02:00
muellerr aec557a8c0 updated unix udp bridge 2020-08-28 17:14:20 +02:00
muellerr 6c0defed5e Merge remote-tracking branch 'upstream/master' into mueller/feature/TmTcUnixBridge 2020-08-28 17:08:54 +02:00
muellerr df4fb17a45 Merge remote-tracking branch 'upstream/master' into mueller/feature/TmTcUnixBridge 2020-08-27 17:31:16 +02:00
muellerr 0fedad6da0 semaphore factory update 2020-08-27 17:14:49 +02:00
muellerr 73db79a3fe updated linux implementation 2020-08-27 17:06:10 +02:00
muellerr 7723ee13b3 Merge remote-tracking branch 'upstream/master' into mueller_binSemaphoreInit 2020-08-27 16:28:50 +02:00
muellerr 073f168b95 task management function taken over from master 2020-08-27 16:27:54 +02:00
muellerr aacda3afc2 interface adapted 2020-08-27 16:26:00 +02:00
muellerr 4530b19548 header update 2020-08-27 16:13:36 +02:00
muellerr 89d3fe5095 integrated change manually 2020-08-27 16:11:40 +02:00
muellerr 66cf2d3559 timeslot update for FreeRTOS 2020-08-27 16:05:31 +02:00
muellerr 02be87aa03 init after task creation moved to task functionality 2020-08-27 15:57:47 +02:00
muellerr 561becf6aa Merge remote-tracking branch 'upstream/master' into mueller/hostosal 2020-08-25 18:31:17 +02:00
muellerr f13e7b4255 include replacements 2020-08-25 18:30:11 +02:00
muellerr d9ee6d0d90 include fix 2020-08-25 18:15:02 +02:00
gaisser 9245b14569 Merge pull request 'FreeRTOS Stack Size Correction' (#156) from KSat/fsfw:mueller/FreeRTOSstackSizeCorrection into master 2020-08-25 13:00:38 +02:00
muellerr 6ebe523e50 Merge remote-tracking branch 'upstream/master' into mueller/FreeRTOSstackSizeCorrection 2020-08-25 12:51:57 +02:00
gaisser b5d6d5a178 Merge pull request 'freeRTOS task management init' (#157) from KSat/fsfw:mueller/FreeRTOS/TaskManagement into master 2020-08-25 12:42:42 +02:00
muellerr c0332a80a7 task management update 2020-08-25 12:40:06 +02:00
muellerr 043710ee56 Merge remote-tracking branch 'upstream/master' into mueller/FreeRTOS/TaskManagement 2020-08-25 12:38:23 +02:00
muellerr 7e0cf49723 author tag 2020-08-25 12:24:37 +02:00