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

3996 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robin Mueller
ad68802fe4
Merge branch 'develop' into eive/develop 2021-10-11 19:21:48 +02:00
Ulrich Mohr
f8e9042943 Merge pull request 'Merge v2.0.1 into development' (#503) from master into development 
Reviewed-on: fsfw/fsfw#503
 2021-10-11 18:19:46 +02:00
Ulrich Mohr
e6a7108614 Merge pull request 'Increased TM stack robustness' (#501) from eive/fsfw:mueller/tm-stack-robustness-cherry-picked into master 
Reviewed-on: fsfw/fsfw#501
Reviewed-by: Ulrich Mohr <mohr@irs.uni-stuttgart.de>
 2021-10-11 18:00:45 +02:00
Robin Mueller
08926f9b70
Merge remote-tracking branch 'upstream/master' into mueller/tm-stack-robustness-cherry-picked 2021-10-11 17:57:33 +02:00
Ulrich Mohr
52f0c29e99 Merge pull request 'Using correct version number now for PUS C' (#502) from eive/fsfw:mueller/fix-for-pus-c-version-number-cherry-picked into master 
Reviewed-on: fsfw/fsfw#502
Reviewed-by: Ulrich Mohr <mohr@irs.uni-stuttgart.de>
 2021-10-11 17:51:58 +02:00
Robin Mueller
d2371b3e71 removed unneeded static constexpr 2021-10-11 16:47:57 +02:00
Robin Mueller
ffa38a81b7 using pus version enum now 2021-10-11 16:47:37 +02:00
Robin Mueller
ae689408f3 using correct version number now 2021-10-11 16:47:28 +02:00
Robin Mueller
155432663b moved store failure to separate function 2021-10-11 16:37:14 +02:00
Robin Mueller
ecdbf98ca4 added printouts for PUS A 2021-10-11 16:37:04 +02:00
Robin Mueller
54a6c1b0aa bugfix for PUS A 2021-10-11 16:36:49 +02:00
Robin Mueller
9efe9e78d8 Increased TM stack robustness 
1. More nullptr check
2. returnvalue for inititalize function which can fail
 2021-10-11 16:36:28 +02:00
Robin Müller
b985bf5167 Merge pull request 'meier/tcpFix' (#23) from meier/tcpFix into eive/develop 
Reviewed-on: #23
 2021-10-09 13:28:49 +02:00
Jakob Meier
a578f0390b tcp server also parses TCs when client closes connection 2021-10-08 13:51:32 +02:00
Jakob Meier
8e65833d60 added bind call error string 2021-10-08 13:24:51 +02:00
Ulrich Mohr
12983a7143 Merge pull request 'minor updates for PUS services' (#498) from KSat/fsfw:mueller/pus-tweaks into development 
Reviewed-on: fsfw/fsfw#498
 2021-10-08 12:59:04 +02:00
Ulrich Mohr
27a3598526 Merge pull request 'better naming for parameter' (#499) from KSat/fsfw:mueller/retval-better-naming into development 
Reviewed-on: fsfw/fsfw#499
 2021-10-08 12:58:43 +02:00
Robin Mueller
76416f523d
better naming for parameter 2021-10-07 10:44:44 +02:00
Robin Mueller
5749e159e4
minor updates for PUS services 2021-10-07 10:39:16 +02:00
Jakob.Meier
b6e4b1fc72 Merge pull request 'FSFW Update' (#22) from mueller/fsfw-update into eive/develop 
Reviewed-on: #22
 2021-10-06 17:50:51 +02:00
Robin Müller
85a90a6ec5 Merge pull request 'FSFW.h.in more default values' (#491) from mueller/fsfw-default-value-pus-c-cfg into development 
Reviewed-on: fsfw/fsfw#491
 2021-10-05 18:27:13 +02:00
Robin Müller
80b41e937b Merge branch 'development' into mueller/fsfw-default-value-pus-c-cfg 2021-10-05 18:26:34 +02:00
Robin Mueller
db801a0ecc removed unneeded static constexpr 2021-10-05 13:17:34 +02:00
Robin Mueller
3502ddca7f using pus version enum now 2021-10-05 13:14:26 +02:00
Robin Mueller
2124f36e36
moved store failure to separate function 2021-10-05 12:50:39 +02:00
Robin Mueller
91f43d00a2
moved store failure to separate function 2021-10-05 12:47:30 +02:00
Robin Mueller
a8a1148c65
fixes for PUS A stored 2021-10-05 12:39:57 +02:00
Robin Mueller
94bd4c7b56
using correct version number now 2021-10-05 01:23:56 +02:00
Ulrich Mohr
ab906fa534 Merge pull request 'Merge development into master for v2.0.0' (#493) from development into master 
Reviewed-on: fsfw/fsfw#493
 2021-10-04 14:49:43 +02:00
Ulrich Mohr
146e1e3282 bumped version to 2.0.0 for next release 2021-10-04 14:47:32 +02:00
Robin Müller
857a1624c6 Merge branch 'development' into mueller/fsfw-default-value-pus-c-cfg 2021-10-04 14:45:13 +02:00
Ulrich Mohr
f11957d827 Merge pull request 'Updated Countdown and removed Timer' (#486) from gaisser_countdown_timer into development 
Reviewed-on: fsfw/fsfw#486
 2021-10-04 14:44:55 +02:00
Ulrich Mohr
a977302a53 Merge pull request 'out of bounds access in DLE encoder' (#492) from mueller/dle-possible-bugfix into development 
Reviewed-on: fsfw/fsfw#492
 2021-10-04 14:43:54 +02:00
gaisser
53400c8bfa Merge branch 'development' into mueller/dle-possible-bugfix 2021-10-04 14:40:47 +02:00
Robin Mueller
f2d0a0d9ee Merge branch 'mueller/dle-possible-bugfix' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/dle-possible-bugfix 2021-10-04 14:38:51 +02:00
gaisser
9e12f59707 Merge pull request 'TMTC Bridge: Increase limit of packets stored' (#484) from eive/fsfw:mueller/increase-absolute-packet-stored-limit into development 
Reviewed-on: fsfw/fsfw#484
 2021-10-04 14:38:46 +02:00
Robin Mueller
2439613f21 preserve STX char 2021-10-04 14:38:46 +02:00
gaisser
1c8f86364d Merge branch 'development' into mueller/increase-absolute-packet-stored-limit 2021-10-04 14:37:09 +02:00
Robin Müller
4e1c52f465 Merge branch 'development' into gaisser_countdown_timer 2021-10-02 15:50:49 +02:00
Robin Müller
c7c6d78f4b Merge branch 'development' into mueller/fsfw-default-value-pus-c-cfg 2021-10-02 15:44:46 +02:00
Robin Müller
9f856761e2 Merge branch 'development' into mueller/dle-possible-bugfix 2021-10-02 12:24:38 +02:00
Robin Müller
2f119f102d Merge pull request 'return meaningful error code for empty PST' (#485) from eive/fsfw:mueller/check-for-empty-pst into development 
Reviewed-on: fsfw/fsfw#485
 2021-10-02 12:24:03 +02:00
Robin Mueller
afb472996c refactoring, code more understandable 2021-09-30 16:51:07 +02:00
Robin Mueller
f76f462022
test added 2021-09-30 11:27:14 +02:00
Robin Mueller
0f90d50065 Merge remote-tracking branch 'origin/development' into mueller/dle-possible-bugfix 2021-09-30 11:27:07 +02:00
Robin Mueller
b0cbd40e64
possible bugfix for DLE encoder 2021-09-30 11:25:42 +02:00
Robin Müller
1c1433e797 Merge branch 'development' into mueller/increase-absolute-packet-stored-limit 2021-09-29 16:17:22 +02:00
Robin Müller
7671c93095 Merge branch 'development' into mueller/check-for-empty-pst 2021-09-29 16:16:57 +02:00
Robin Müller
897d8b37ad Merge branch 'development' into mueller/fsfw-default-value-pus-c-cfg 2021-09-29 16:16:11 +02:00
Jakob.Meier
16fb87e02e Merge pull request 'FSFW Update' (#21) from mueller/unittest-fixes into eive/develop 
Reviewed-on: #21
 2021-09-29 15:45:39 +02:00