Commit Graph

3073 Commits

Author SHA1 Message Date
a4d9c761a7 renormalize CHB 2020-09-01 11:49:43 +02:00
cc5c944c84 Merge branch 'master' into gaisser_fixes_fixedMap 2020-09-01 11:41:03 +02:00
f645fe6607 Merge pull request 'Comments in serializeIF' (#174) from gaisser/fsfw:gaisser_comments_serialize into master
Reviewed-on: fsfw/fsfw#174
2020-09-01 11:37:21 +02:00
c0ed474373 Update 'serialize/SerializeIF.h' 2020-09-01 11:34:28 +02:00
f12c56c75f Merge branch 'master' into mueller/feature/DHBupdate 2020-09-01 11:20:21 +02:00
15bb0aee98 handler ID cached, debug output improved 2020-08-29 19:08:10 +02:00
6c02776975 added srv9 2020-08-29 00:16:40 +02:00
b0673c7fa6 typo fixes 2020-08-28 18:47:11 +02:00
7a5c70e753 typo fixes 2020-08-28 18:46:47 +02:00
b6a19f911d include guards improved 2020-08-28 18:45:19 +02:00
1b9c8446b7 renormalized line endings 2020-08-28 18:33:29 +02:00
478b88d7a2 Merge branch 'master' into gaisser_comments_serialize 2020-08-28 18:15:41 +02:00
b54d63edcb event manager improvements 2020-08-28 18:10:02 +02:00
9abd796e6f updated map packet extraction 2020-08-28 17:58:36 +02:00
8596810fe2 Merge branch 'event/git-update' into mueller/master 2020-08-28 17:58:31 +02:00
b71cab3993 integrated all changes 2020-08-28 17:55:13 +02:00
9f522466f0 wrapped info output in additonal ifdef 2020-08-28 17:52:13 +02:00
e800aad979 event git update 2020-08-28 17:44:10 +02:00
d2ef2b2be4 taken over datalinklayer form upstream 2020-08-28 17:40:53 +02:00
5ce954672b taken over coordinates from upstream 2020-08-28 17:40:21 +02:00
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