Commit Graph

3844 Commits

Author SHA1 Message Date
Robin Müller b00f61445d
works 2021-10-11 15:07:52 +02:00
Robin Müller ad117e07e0
FSFW_CONFIG_PATH update 2021-10-11 15:03:03 +02:00
Robin Müller c26c2a5a96
hardcoding config path 2021-10-11 14:56:42 +02:00
Robin Müller e02ac05097
fixed a bug for default cfg path 2021-10-11 13:57:00 +02:00
Robin Müller a827ec6a92
removed another include 2021-10-11 13:51:08 +02:00
Robin Müller 12321a5d49 Merge branch 'mueller/integrated-unittests' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/integrated-unittests 2021-10-11 13:48:28 +02:00
Robin Müller ad3238aa19
removed problematic includes 2021-10-11 13:48:17 +02:00
Robin Müller f67868516c Merge branch 'development' into mueller/integrated-unittests 2021-10-11 13:40:09 +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 Müller dd1631a456
updated CMakeLists.txt
- More information about FSFW build
2021-10-07 14:20:34 +02:00
Robin Müller cd6d616806
using .h.in version fle now 2021-10-07 13:26:31 +02:00
Robin Müller ade15ad16d
tests can now be built as part of FSFW
This PR refactores the tests so they are built as part of the FSFW.
This is done by adding Catch2 with the FetchContent directive.

A future implementation might also use a system installation of Catch2
by first checking whether Catch2 can already be found as a package

The custom configuration folder testcfg was moved from the user folder
to the actual unittest folder.

The tests can be built by setting the CMake FSFW_BUILD_UNITTESTS option
to TRUE/ON. They are built with the static library and dropped inside
the build folders fsfw directory.
2021-10-07 13:24:46 +02:00
Robin Müller 76416f523d
better naming for parameter 2021-10-07 10:44:44 +02:00
Robin Müller 5749e159e4
minor updates for PUS services 2021-10-07 10:39:16 +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
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
Steffen Gaisser 53400c8bfa Merge branch 'development' into mueller/dle-possible-bugfix 2021-10-04 14:40:47 +02:00
Robin Müller 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
Steffen 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 Müller 2439613f21 preserve STX char 2021-10-04 14:38:46 +02:00
Steffen 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 Müller afb472996c refactoring, code more understandable 2021-09-30 16:51:07 +02:00
Robin Müller f76f462022
test added 2021-09-30 11:27:14 +02:00
Robin Müller 0f90d50065 Merge remote-tracking branch 'origin/development' into mueller/dle-possible-bugfix 2021-09-30 11:27:07 +02:00
Robin Müller 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
Steffen Gaisser ba4249d658 Merge branch 'development' into gaisser_countdown_timer 2021-09-29 14:27:48 +02:00
Robin Müller 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
Robin Müller 5a30dd969f Merge branch 'development' into mueller/dev-handler-fixes 2021-09-29 14:27:37 +02:00
Robin Müller 05ed25d397 Merge branch 'development' into mueller/fsfw-default-value-pus-c-cfg 2021-09-29 14:27:20 +02:00
Robin Müller 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
Robin Müller 65f4433fad
Merge remote-tracking branch 'origin/development' into mueller/fsfw-default-value-pus-c-cfg 2021-09-29 12:07:06 +02:00
Robin Müller febe3cc4d4
define fix 2021-09-29 12:05:24 +02:00
Robin Müller f388878b99
added more defines 2021-09-29 12:05:15 +02:00
Robin Müller faa7e1e24f
default values for PUS c config 2021-09-29 12:00:59 +02:00
Robin Müller 9002c12cf1
update FSFW.h.in 2021-09-29 11:55:20 +02:00
Robin Müller 2b15f9e644 Merge branch 'development' into mueller/dle-encoder-test-fix 2021-09-29 11:51:05 +02:00
Robin Müller 42b5f8a79d
small fix for DLE unittest 2021-09-29 11:49:45 +02:00
Robin Müller 358ee0fbf2 removed C++14 featue 2021-09-28 15:47:12 +02:00