KSat/fsfw
15
4
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 1 Releases Wiki Activity
5,501 Commits 7 Branches 1 Tag 25 MiB
1eceef4645
Commit Graph

5501 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robin.Mueller
33039f8c60 include guard correction 2020-09-01 12:57:56 +02:00
gaisser
75f6cacd10 Merge branch 'master' into mueller_FIFO_static_normal 2020-09-01 12:56:41 +02:00
gaisser
b32ea6e316 Merge pull request 'RingBuffer, static CTOR' (#132) from KSat/fsfw:mueller_ringBufferStatic into master 
Reviewed-on: fsfw/fsfw#132
 2020-09-01 12:56:23 +02:00
Robin.Mueller
bec562ece0 FIFO updates 2020-09-01 12:54:33 +02:00
gaisser
5308cb6237 Merge branch 'master' into mueller_ringBufferStatic 2020-09-01 12:54:08 +02:00
Robin.Mueller
4f3869de8d Merge branch 'mueller_FIFO_static_normal' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller_FIFO_static_normal 2020-09-01 12:54:02 +02:00
Robin.Mueller
b522b3c29c fifo updates 2020-09-01 12:53:53 +02:00
Robin.Mueller
a634875b4b dynamic fifo update 2020-09-01 12:50:17 +02:00
Robin.Mueller
7cf79c17a9 fifo update 2020-09-01 12:48:51 +02:00
Robin.Mueller
f7f134ac20 corrections 2020-09-01 12:48:11 +02:00
Robin Müller
02cfa8bcd5 Merge branch 'master' into mueller_FIFO_static_normal 2020-09-01 12:45:25 +02:00
gaisser
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
gaisser
f85e4eb22f Merge branch 'master' into mueller/parameter-updates 2020-09-01 12:44:14 +02:00
Robin.Mueller
edde2ee58b offsetr update 2020-09-01 12:43:50 +02:00
Robin.Mueller
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
Robin.Mueller
695a4e7842 offset is size_t now 2020-09-01 12:42:52 +02:00
gaisser
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
gaisser
636e5fb888 Merge branch 'master' into gaisser_fixes_fixedMap 2020-09-01 12:35:53 +02:00
gaisser
77927363ce Merge branch 'master' into mueller/eventmanager-improvements 2020-09-01 12:29:16 +02:00
gaisser
5d87650833 Merge branch 'master' into mueller/parameter-updates 2020-09-01 12:28:53 +02:00
gaisser
e949637271 Merge branch 'master' into mueller_FIFO_static_normal 2020-09-01 12:24:41 +02:00
gaisser
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
gaisser
a9e5b54238 Merge branch 'master' into mueller/feature/DHBupdate 2020-09-01 12:22:14 +02:00
gaisser
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
gaisser
7059d5f158 Merge branch 'master' into mueller/devices/FDIR 2020-09-01 12:21:28 +02:00
Robin.Mueller
b07b19327c renormalize CHB 2020-09-01 11:52:18 +02:00
Robin.Mueller
4abdc436fb Revert "renormalize CHB" 
This reverts commit a4d9c761a7.
 2020-09-01 11:51:43 +02:00
Robin.Mueller
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
Robin.Mueller
a4d9c761a7 renormalize CHB 2020-09-01 11:49:43 +02:00
Steffen Gaisser
cc5c944c84 Merge branch 'master' into gaisser_fixes_fixedMap 2020-09-01 11:41:03 +02:00
Robin Müller
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
gaisser
c0ed474373 Update 'serialize/SerializeIF.h' 2020-09-01 11:34:28 +02:00
gaisser
f12c56c75f Merge branch 'master' into mueller/feature/DHBupdate 2020-09-01 11:20:21 +02:00
Robin.Mueller
15bb0aee98 handler ID cached, debug output improved 2020-08-29 19:08:10 +02:00
Robin.Mueller
6c02776975 added srv9 2020-08-29 00:16:40 +02:00
Robin.Mueller
b0673c7fa6 typo fixes 2020-08-28 18:47:11 +02:00
Robin.Mueller
7a5c70e753 typo fixes 2020-08-28 18:46:47 +02:00
Robin.Mueller
b6a19f911d include guards improved 2020-08-28 18:45:19 +02:00
Robin.Mueller
1b9c8446b7 renormalized line endings 2020-08-28 18:33:29 +02:00
gaisser
478b88d7a2 Merge branch 'master' into gaisser_comments_serialize 2020-08-28 18:15:41 +02:00
Robin.Mueller
b54d63edcb event manager improvements 2020-08-28 18:10:02 +02:00
Robin.Mueller
9abd796e6f updated map packet extraction 2020-08-28 17:58:36 +02:00
Robin.Mueller
8596810fe2 Merge branch 'event/git-update' into mueller/master 2020-08-28 17:58:31 +02:00
Robin.Mueller
b71cab3993 integrated all changes 2020-08-28 17:55:13 +02:00
Robin.Mueller
9f522466f0 wrapped info output in additonal ifdef 2020-08-28 17:52:13 +02:00
Robin.Mueller
e800aad979 event git update 2020-08-28 17:44:10 +02:00
Robin.Mueller
d2ef2b2be4 taken over datalinklayer form upstream 2020-08-28 17:40:53 +02:00
Robin.Mueller
5ce954672b taken over coordinates from upstream 2020-08-28 17:40:21 +02:00
Robin Müller
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
Robin.Mueller
8862f35ad1 git is weird 2020-08-28 17:35:27 +02:00