muellerr
a4c8577cd3
Merge remote-tracking branch 'origin/development' into mueller/master
2021-10-13 10:44:55 +02:00
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
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
muellerr
08926f9b70
Merge remote-tracking branch 'upstream/master' into mueller/tm-stack-robustness-cherry-picked
2021-10-11 17:57:33 +02:00
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
muellerr
d2371b3e71
removed unneeded static constexpr
2021-10-11 16:47:57 +02:00
muellerr
ffa38a81b7
using pus version enum now
2021-10-11 16:47:37 +02:00
muellerr
ae689408f3
using correct version number now
2021-10-11 16:47:28 +02:00
muellerr
155432663b
moved store failure to separate function
2021-10-11 16:37:14 +02:00
muellerr
ecdbf98ca4
added printouts for PUS A
2021-10-11 16:37:04 +02:00
muellerr
54a6c1b0aa
bugfix for PUS A
2021-10-11 16:36:49 +02:00
muellerr
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
muellerr
f15460c7ab
Merge remote-tracking branch 'ksat/mueller/integrated-unittests' into mueller/master
2021-10-11 14:34:45 +02:00
muellerr
7539dfffe3
dedicated test config objects list used now
2021-10-11 14:34:20 +02:00
muellerr
d0b7a1ecf2
some tests
2021-10-11 14:22:57 +02:00
muellerr
f35e8e52e8
Merge remote-tracking branch 'ksat/mueller/integrated-unittests' into mueller/master
2021-10-11 14:15:20 +02:00
muellerr
cc74ae777a
removed some configure files
2021-10-11 14:14:49 +02:00
muellerr
e02ac05097
fixed a bug for default cfg path
2021-10-11 13:57:00 +02:00
muellerr
e51385aadc
Merge remote-tracking branch 'ksat/mueller/integrated-unittests' into mueller/master
2021-10-11 13:51:29 +02:00
muellerr
a827ec6a92
removed another include
2021-10-11 13:51:08 +02:00
muellerr
1d18ad5ebf
Merge remote-tracking branch 'ksat/mueller/integrated-unittests' into mueller/master
2021-10-11 13:49:38 +02:00
muellerr
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
muellerr
ad3238aa19
removed problematic includes
2021-10-11 13:48:17 +02:00
muellerr
4534468d8e
Merge remote-tracking branch 'ksat/mueller/integrated-unittests' into mueller/master
2021-10-11 13:45:43 +02:00
muellerr
f67868516c
Merge branch 'development' into mueller/integrated-unittests
2021-10-11 13:40:09 +02:00
muellerr
992784d7ae
Merge remote-tracking branch 'origin/development' into mueller/master
2021-10-11 12:49:25 +02:00
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
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
muellerr
dd1631a456
updated CMakeLists.txt
...
- More information about FSFW build
2021-10-07 14:20:34 +02:00
muellerr
cd6d616806
using .h.in version fle now
2021-10-07 13:26:31 +02:00
muellerr
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
muellerr
76416f523d
better naming for parameter
2021-10-07 10:44:44 +02:00
muellerr
5749e159e4
minor updates for PUS services
2021-10-07 10:39:16 +02:00
muellerr
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
muellerr
80b41e937b
Merge branch 'development' into mueller/fsfw-default-value-pus-c-cfg
2021-10-05 18:26:34 +02:00
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
mohr
146e1e3282
bumped version to 2.0.0 for next release
2021-10-04 14:47:32 +02:00
muellerr
857a1624c6
Merge branch 'development' into mueller/fsfw-default-value-pus-c-cfg
2021-10-04 14:45:13 +02:00
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
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
53400c8bfa
Merge branch 'development' into mueller/dle-possible-bugfix
2021-10-04 14:40:47 +02:00
muellerr
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
muellerr
2439613f21
preserve STX char
2021-10-04 14:38:46 +02:00
muellerr
d81ed334d8
preserve STX char
2021-10-04 14:38:10 +02:00
1c8f86364d
Merge branch 'development' into mueller/increase-absolute-packet-stored-limit
2021-10-04 14:37:09 +02:00
muellerr
4e1c52f465
Merge branch 'development' into gaisser_countdown_timer
2021-10-02 15:50:49 +02:00
muellerr
c7c6d78f4b
Merge branch 'development' into mueller/fsfw-default-value-pus-c-cfg
2021-10-02 15:44:46 +02:00
muellerr
9f856761e2
Merge branch 'development' into mueller/dle-possible-bugfix
2021-10-02 12:24:38 +02:00
muellerr
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
muellerr
mohr
gaisser