Commit Graph

5147 Commits

Author SHA1 Message Date
76416f523d
better naming for parameter 2021-10-07 10:44:44 +02:00
5749e159e4
minor updates for PUS services 2021-10-07 10:39:16 +02:00
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
80b41e937b Merge branch 'development' into mueller/fsfw-default-value-pus-c-cfg 2021-10-05 18:26:34 +02:00
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
146e1e3282 bumped version to 2.0.0 for next release 2021-10-04 14:47:32 +02:00
857a1624c6 Merge branch 'development' into mueller/fsfw-default-value-pus-c-cfg 2021-10-04 14:45:13 +02:00
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
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
198fdbba62 Merge remote-tracking branch 'upstream/development' into mueller/tcp-keep-open-pr 2021-10-04 14:41:51 +02:00
53400c8bfa Merge branch 'development' into mueller/dle-possible-bugfix 2021-10-04 14:40:47 +02:00
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
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
2439613f21 preserve STX char 2021-10-04 14:38:46 +02:00
1c8f86364d Merge branch 'development' into mueller/increase-absolute-packet-stored-limit 2021-10-04 14:37:09 +02:00
4e1c52f465 Merge branch 'development' into gaisser_countdown_timer 2021-10-02 15:50:49 +02:00
c7c6d78f4b Merge branch 'development' into mueller/fsfw-default-value-pus-c-cfg 2021-10-02 15:44:46 +02:00
9f856761e2 Merge branch 'development' into mueller/dle-possible-bugfix 2021-10-02 12:24:38 +02:00
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
afb472996c refactoring, code more understandable 2021-09-30 16:51:07 +02:00
f76f462022
test added 2021-09-30 11:27:14 +02:00
0f90d50065 Merge remote-tracking branch 'origin/development' into mueller/dle-possible-bugfix 2021-09-30 11:27:07 +02:00
b0cbd40e64
possible bugfix for DLE encoder 2021-09-30 11:25:42 +02:00
1c1433e797 Merge branch 'development' into mueller/increase-absolute-packet-stored-limit 2021-09-29 16:17:22 +02:00
7671c93095 Merge branch 'development' into mueller/check-for-empty-pst 2021-09-29 16:16:57 +02:00
0df5491193 Merge branch 'development' into mueller/tcp-keep-open-pr 2021-09-29 16:16:26 +02:00
897d8b37ad Merge branch 'development' into mueller/fsfw-default-value-pus-c-cfg 2021-09-29 16:16:11 +02:00
ba4249d658 Merge branch 'development' into gaisser_countdown_timer 2021-09-29 14:27:48 +02:00
de7542c9c1 Merge pull request 'Minor fixes for device handler' (#489) from mueller/dev-handler-fixes into development
Reviewed-on: fsfw/fsfw#489
2021-09-29 14:27:48 +02:00
5a30dd969f Merge branch 'development' into mueller/dev-handler-fixes 2021-09-29 14:27:37 +02:00
05ed25d397 Merge branch 'development' into mueller/fsfw-default-value-pus-c-cfg 2021-09-29 14:27:20 +02:00
0a2c912f29 Merge pull request 'small fix for DLE unittest' (#490) from mueller/dle-encoder-test-fix into development
Reviewed-on: fsfw/fsfw#490
2021-09-29 14:27:10 +02:00
65f4433fad
Merge remote-tracking branch 'origin/development' into mueller/fsfw-default-value-pus-c-cfg 2021-09-29 12:07:06 +02:00
febe3cc4d4
define fix 2021-09-29 12:05:24 +02:00
f388878b99
added more defines 2021-09-29 12:05:15 +02:00
faa7e1e24f
default values for PUS c config 2021-09-29 12:00:59 +02:00
9002c12cf1
update FSFW.h.in 2021-09-29 11:55:20 +02:00
2b15f9e644 Merge branch 'development' into mueller/dle-encoder-test-fix 2021-09-29 11:51:05 +02:00
42b5f8a79d
small fix for DLE unittest 2021-09-29 11:49:45 +02:00
0a6a32a130
printout separation 2021-09-29 11:45:20 +02:00
cffd77ed32
put functions in namespace 2021-09-28 17:42:29 +02:00
b1a9c90087 this should work for both OSes 2021-09-28 17:39:07 +02:00
a619087fef
Merge remote-tracking branch 'upstream/mueller/tcp-windows-fixes' into mueller/tcp-keep-open-pr 2021-09-28 17:35:07 +02:00
32b5060c62 all windows fixes 2021-09-28 17:28:54 +02:00
936bac5abd
class id renamed 2021-09-28 16:33:50 +02:00
bf02f14772 C++11 adaptions 2021-09-28 16:33:20 +02:00
358ee0fbf2 removed C++14 featue 2021-09-28 15:47:12 +02:00
4f08b2d342 removed include 2021-09-28 15:47:01 +02:00
1622e23f1c delay configurable 2021-09-28 15:33:31 +02:00
a4d6421510
documentation and bugfixes 2021-09-28 15:30:01 +02:00