Commit Graph

188 Commits

Author SHA1 Message Date
af06969905
Merge remote-tracking branch 'upstream/mohr/dhb2normal' into mohr/dhb2normal 2022-10-28 10:15:40 +02:00
2461209169
Merge remote-tracking branch 'upstream/development' into develop 2022-10-28 10:10:20 +02:00
33530f2819 adding Impressum and Datenschutz to lcov output 2022-09-23 17:04:35 +02:00
3d2fc28468
Merge remote-tracking branch 'upstream/mueller/new-cfdp-update-with-handlers' into cfdp-integration 2022-09-16 11:10:35 +02:00
bd594123a2 Merge remote-tracking branch 'upstream/development' into mohr/merge-upstream 2022-09-14 12:54:15 +02:00
4dadef34fd Merge remote-tracking branch 'origin/development' into mueller/cfdp-routers 2022-09-13 15:35:59 +02:00
62cd39e573 Merge pull request 'SerialBufferAdapter refactoring' (#677) from mueller/refactor-serial-buffer-adapter into development
Reviewed-on: fsfw/fsfw#677
2022-09-12 14:30:51 +02:00
07ef9a0ec3
bump catch2 version 2022-09-06 15:47:04 +02:00
16688316a8
rename setBuffer to setConstBuffer 2022-09-05 16:31:56 +02:00
a5d1c38b22
Merge branch 'mueller/refactor-tmtc-stack' into mueller/cfdp-routers 2022-09-05 16:19:34 +02:00
f5421e9abd
refactor tm helper 2022-09-05 16:10:06 +02:00
80355910ee
better warning 2022-09-02 09:05:10 +02:00
2339c48756
Merge branch 'mueller/refactor-tmtc-stack' into mueller/cfdp-routers 2022-08-15 19:07:22 +02:00
d3cabd8984
afmt 2022-08-15 11:26:29 +02:00
7f89022f5b
Merge branch 'mueller/group-mgm-data' into develop 2022-08-15 10:50:10 +02:00
b28c26b288
group MGM data in local pool vectors 2022-08-15 10:49:00 +02:00
8b4253bc46
update cmakelists.txt 2022-08-12 13:02:30 +02:00
fdcfd89ed2
add some Linux HAL options 2022-08-12 12:55:31 +02:00
8970a7379a
Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream 2022-08-12 12:21:50 +02:00
902a4bfa9c
unittests for TC and CCSDS distributor 2022-08-01 17:16:37 +02:00
74794bb71b
apply auto-formatter 2022-07-18 16:08:06 +02:00
6f751c2cf9 Merge branch 'development' into v5.0.0 2022-07-18 15:12:21 +02:00
f6ede7cd3e
bump version 2022-07-18 14:46:36 +02:00
78b09ed0c9
fixes includes 2022-07-18 11:58:55 +02:00
fdf35232ee
some fixes 2022-07-18 11:47:00 +02:00
3b23fb77b4
add obsolete add_subdirectory calls 2022-07-18 09:01:45 +02:00
a4247cd723
Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream 2022-07-04 10:53:52 +02:00
5a9db72814
test public linkage 2022-07-04 10:27:14 +02:00
5abbf42e9f
some form updates 2022-06-21 00:49:58 +02:00
732b615cb3 Merge branch 'development' into mueller/new-cicd-cmake-opts 2022-06-20 16:34:13 +02:00
4b33aa8262 bump ETL version 2022-06-20 14:25:39 +02:00
800aa131fa reverted some unrelated changes 2022-06-08 12:12:09 +02:00
51d7df2dba Merge branch 'development' into mueller/new-cicd-cmake-opts 2022-06-08 11:13:13 +02:00
c697d0f8ab
bump etl to 20.28.0 2022-05-30 10:34:03 +02:00
4b323053ec
Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream 2022-05-16 15:27:58 +02:00
816550b69c Merge remote-tracking branch 'upstream/development' into mueller/new-cicd-cmake-opts 2022-05-16 14:58:25 +02:00
970f039e85
Merge remote-tracking branch 'origin/development' into mueller/extend-version-class 2022-05-13 13:21:01 +02:00
2708b71d77
Merge remote-tracking branch 'origin/development' into mueller/new-cicd-cmake-opts 2022-05-13 12:00:40 +02:00
02473a0cd7
Merge remote-tracking branch 'origin/develop' into mueller/health-if-extension-eive 2022-05-12 20:11:45 +02:00
2e4b9bcd7c
Merge remote-tracking branch 'origin/development' into mueller/new-cicd-cmake-opts 2022-05-12 17:42:49 +02:00
3046822e88
run cmake-format 2022-05-12 17:27:39 +02:00
6442dd0c38 Merge branch 'mueller/amft-cmakelists' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/amft-cmakelists 2022-05-12 17:16:15 +02:00
9b6fa646ed
Merge remote-tracking branch 'origin/development' into mueller/amft-cmakelists 2022-05-12 17:16:10 +02:00
e77bde459b
Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class 2022-05-12 17:12:26 +02:00
5941c21adf
Merge remote-tracking branch 'origin/develop' into mueller/spi-speed-mode-getter 2022-05-11 10:58:13 +02:00
e05c72b062
minor formatting fix 2022-05-10 13:08:14 +02:00
377c3325d2
update cmake-modules file 2022-05-10 12:16:38 +02:00
25775614de
only check IPO support if enabled 2022-05-10 11:56:51 +02:00
efb3d982f3
added missing prefix 2022-05-10 11:52:40 +02:00
dd986fefd3
experimenting with PRE_BUILD command 2022-05-10 11:51:25 +02:00