Commit Graph

4394 Commits

Author SHA1 Message Date
a634875b4b dynamic fifo update 2020-09-01 12:50:17 +02:00
7cf79c17a9 fifo update 2020-09-01 12:48:51 +02:00
f7f134ac20 corrections 2020-09-01 12:48:11 +02:00
02cfa8bcd5 Merge branch 'master' into mueller_FIFO_static_normal 2020-09-01 12:45:25 +02:00
96c421b72c Merge pull request 'parameter improvements' (#181) from KSat/fsfw:mueller/parameter-updates into master
Reviewed-on: fsfw/fsfw#181
2020-09-01 12:45:20 +02:00
f85e4eb22f Merge branch 'master' into mueller/parameter-updates 2020-09-01 12:44:14 +02:00
edde2ee58b offsetr update 2020-09-01 12:43:50 +02:00
66bc60f176 Merge branch 'mueller/parameter-updates' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/parameter-updates 2020-09-01 12:43:02 +02:00
695a4e7842 offset is size_t now 2020-09-01 12:42:52 +02:00
f068df9028 Merge pull request 'event manager improvements' (#180) from KSat/fsfw:mueller/eventmanager-improvements into master
Reviewed-on: fsfw/fsfw#180
2020-09-01 12:39:33 +02:00
636e5fb888 Merge branch 'master' into gaisser_fixes_fixedMap 2020-09-01 12:35:53 +02:00
77927363ce Merge branch 'master' into mueller/eventmanager-improvements 2020-09-01 12:29:16 +02:00
5d87650833 Merge branch 'master' into mueller/parameter-updates 2020-09-01 12:28:53 +02:00
e949637271 Merge branch 'master' into mueller_FIFO_static_normal 2020-09-01 12:24:41 +02:00
4a80872c3c Merge pull request 'DHB Update' (#144) from KSat/fsfw:mueller/feature/DHBupdate into master
Reviewed-on: fsfw/fsfw#144
2020-09-01 12:24:19 +02:00
a9e5b54238 Merge branch 'master' into mueller/feature/DHBupdate 2020-09-01 12:22:14 +02:00
e77c294360 Merge pull request 'fdir update' (#158) from KSat/fsfw:mueller/devices/FDIR into master
Reviewed-on: fsfw/fsfw#158
2020-09-01 12:21:48 +02:00
7059d5f158 Merge branch 'master' into mueller/devices/FDIR 2020-09-01 12:21:28 +02:00
b07b19327c renormalize CHB 2020-09-01 11:52:18 +02:00
4abdc436fb Revert "renormalize CHB"
This reverts commit a4d9c761a7.
2020-09-01 11:51:43 +02:00
d644a40e14 Merge branch 'mueller/feature/DHBupdate' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/feature/DHBupdate 2020-09-01 11:49:53 +02:00
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: #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