Commit Graph

4903 Commits

Author SHA1 Message Date
2e23fc1201 Merge pull request 'git is weird' (#15) from mueller/action-git-update into mueller/master
Reviewed-on: KSat/fsfw#15
2020-08-28 17:37:29 +02:00
8862f35ad1 git is weird 2020-08-28 17:35:27 +02:00
468ebfb809 include improvement 2020-08-28 17:18:11 +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
3ec7162832 Merge branch 'master' into mueller_FIFO_static_normal 2020-08-28 17:08:06 +02:00
b4978e7df3 Merge pull request 'Fixed a shadowing issue with moving a declaration to inner scope' (#163) from gaisser/fsfw:gaisser_small_bugfix_subsystem into master
Reviewed-on: fsfw/fsfw#163
2020-08-28 17:01:16 +02:00
5ca26a72ea fixed some shadowing issues 2020-08-28 17:00:16 +02:00
543e2f7d5d Merge remote-tracking branch 'upstream/master' into mueller/SimpleRingBufferUpdate2 2020-08-28 13:31:23 +02:00
053f75968b Merge remote-tracking branch 'upstream/master' into mueller/SimpleRingBufferUpdate2 2020-08-28 13:30:44 +02:00
b87a8ba086 Merge remote-tracking branch 'upstream/master' into mueller/sharedRingBufferPullRequest 2020-08-28 13:28:13 +02:00
2362b1d165 Merge branch 'master' into gaisser_small_bugfix_subsystem 2020-08-28 13:25:34 +02:00
ce4d010b5c Merge pull request 'Semaphore Initialization - Linux and FreeRTOS' (#89) from KSat/fsfw:mueller_binSemaphoreInit into master
Reviewed-on: fsfw/fsfw#89
2020-08-28 13:25:05 +02:00
eb503ae030 include guard fix 2020-08-27 20:19:27 +02:00
795b1e5245 Merge remote-tracking branch 'upstream/master' into mueller_FIFO_static_normal 2020-08-27 20:18:06 +02:00
54112acf62 chb update 2020-08-27 20:11:36 +02:00
c4c607776c important fix, 0 init removed 2020-08-27 20:07:03 +02:00
42dd665e26 include improvement 2020-08-27 20:06:19 +02:00
ed70f38612 some renaming 2020-08-27 20:04:17 +02:00
a6e99e443a took over dHB failure isolation base fixes 2020-08-27 20:00:36 +02:00
8f2d5a5528 DH fdir improvements 2020-08-27 19:58:35 +02:00
2a74c8d150 Merge remote-tracking branch 'upstream/master' into mueller/devices/FDIR 2020-08-27 19:55:22 +02:00
dfe3658a85 removed hk stuff 2020-08-27 19:52:25 +02:00
386b153ede Merge remote-tracking branch 'upstream/master' into mueller/feature/DHBupdate 2020-08-27 19:50:02 +02:00
df4fb17a45 Merge remote-tracking branch 'upstream/master' into mueller/feature/TmTcUnixBridge 2020-08-27 17:31:16 +02:00
4d1b1ba506 additonal doc for freeRTOS semaphores 2020-08-27 17:24:40 +02:00
0fedad6da0 semaphore factory update 2020-08-27 17:14:49 +02:00
b9314cffb9 small improvements 2020-08-27 17:13:52 +02:00
3be253efd6 include fix 2020-08-27 17:07:42 +02:00
73db79a3fe updated linux implementation 2020-08-27 17:06:10 +02:00
5aa664648e linux semaph update 2020-08-27 17:03:54 +02:00
7723ee13b3 Merge remote-tracking branch 'upstream/master' into mueller_binSemaphoreInit 2020-08-27 16:28:50 +02:00
073f168b95 task management function taken over from master 2020-08-27 16:27:54 +02:00
aacda3afc2 interface adapted 2020-08-27 16:26:00 +02:00
64022212f9 removed is empty flag 2020-08-27 16:20:32 +02:00
fd42d8cd46 periodic task taken over from master 2020-08-27 16:14:42 +02:00
4530b19548 header update 2020-08-27 16:13:36 +02:00
89d3fe5095 integrated change manually 2020-08-27 16:11:40 +02:00
66cf2d3559 timeslot update for FreeRTOS 2020-08-27 16:05:31 +02:00
02be87aa03 init after task creation moved to task functionality 2020-08-27 15:57:47 +02:00
6d3fdab944 adapted semaphore IF to mutex IF 2020-08-27 15:52:55 +02:00
1dfdd65662 new initializeSequence func 2020-08-27 14:42:10 +02:00
790e0399b7 Merge branch 'mueller/project/distribDatapool' into mueller/master 2020-08-27 14:23:14 +02:00
67ab1f6240 initialize after task crteation moved 2020-08-27 14:17:13 +02:00
76f145ddcf Update 'globalfunctions/DleEncoder.cpp'
Just a missing char
2020-08-26 19:59:58 +02:00
281f13e27b Update 'globalfunctions/DleEncoder.h'
Corrected some spelling mistakes
2020-08-26 19:58:18 +02:00
df850116ff dle encoder doc added 2020-08-26 17:43:47 +02:00
a8f2cf910b taken over dle encoder from upstream master 2020-08-26 17:43:20 +02:00
2748a8b93b added doc to dle encoder 2020-08-26 17:42:13 +02:00
0f9930524b some minor improvements 2020-08-26 15:54:13 +02:00