eive/fsfw
eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity
539 Commits 28 Branches 1 Tag 24 MiB
e7444912d5
Commit Graph

539 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robin Müller
e7444912d5 corrected include guard 2020-09-10 15:29:19 +02:00
Robin Müller
b8d638cb69 Merge branch 'master' into gaisser_fixes_fixedMap 2020-09-10 15:27:15 +02:00
Robin Müller
db2a31aef4 Merge pull request 'Implements #192' (#193) from gaisser/fsfw:gaisser_serialize_c11_update into master 
Reviewed-on: fsfw/fsfw#193
 2020-09-10 15:13:54 +02:00
Robin Müller
de46cf5b08 Merge branch 'master' into gaisser_serialize_c11_update 2020-09-10 15:06:05 +02:00
Robin Müller
a364f36f38 Merge pull request 'Fixes for #190 and #189' (#191) from gaisser/fsfw:gaisser_bugs_fixedMap_FIFO into master 
Reviewed-on: fsfw/fsfw#191
 2020-09-10 15:00:34 +02:00
gaisser
976fd54f5e Merge branch 'master' into gaisser_fixes_fixedMap 2020-09-08 14:17:53 +02:00
gaisser
d87cf0a612 Merge branch 'master' into gaisser_bugs_fixedMap_FIFO 2020-09-08 14:14:38 +02:00
taheran
fb36c55419 Merge pull request 'new tmtc unix udp bridge' (#141) from KSat/fsfw:mueller/feature/TmTcUnixBridge into master 
Reviewed-on: fsfw/fsfw#141
 2020-09-08 14:14:00 +02:00
taheran
5dd08877a5 Merge pull request 'tmtc bridge update, uses dynamic FIFO now' (#187) from KSat/fsfw:mueller/TmTcBridgeUpdate into master 
Reviewed-on: fsfw/fsfw#187
 2020-09-08 14:12:43 +02:00
Steffen Gaisser
0258ce62f0 Added documentation 2020-09-07 18:35:25 +02:00
Steffen Gaisser
b65789824c Removed old hacks and replaced by standard c++ 
Added overflow check in SerializeAdapter
 2020-09-07 18:06:08 +02:00
Steffen Gaisser
278053a342 Another fix in DynamicFIFO 2020-09-07 15:49:28 +02:00
Steffen Gaisser
2a28114b49 Fixes for #190 and #189 2020-09-07 15:43:48 +02:00
Robin Müller
67b11c0535 Merge branch 'master' into mueller/feature/TmTcUnixBridge 2020-09-06 15:51:34 +02:00
Robin.Mueller
6c42189371 some minor improvements 2020-09-06 15:49:32 +02:00
Robin.Mueller
2439ac455b tmtc bridge update, uses dynamic FIFO now 2020-09-06 15:48:30 +02:00
Robin.Mueller
234fbcbf41 small bugfix in error checking 2020-09-06 09:34:06 +02:00
gaisser
b3d08cd40b Merge pull request 'FIFO is StaticFIFO now, new FIFO using vector' (#127) from KSat/fsfw:mueller_FIFO_static_normal into master 
Reviewed-on: fsfw/fsfw#127
 2020-09-01 13:08:58 +02:00
Robin.Mueller
d5accd16ba Merge branch 'mueller_FIFO_static_normal' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller_FIFO_static_normal 2020-09-01 12:58:38 +02:00
Robin.Mueller
03b2ca679d include guard correction 2020-09-01 12:58:29 +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
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 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
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
7a5c70e753 typo fixes 2020-08-28 18:46:47 +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