4314 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Müller	aacaf52fd9	Merge branch 'development' into mueller/new-cicd-cmake-opts	2022-05-09 15:34:36 +02:00
Steffen Gaisser	118f1da8dd	Merge pull request 'Bump C++ standard to C++17' (#622) from mueller/cpp17-update into development ... Reviewed-on: #622	2022-05-09 15:33:52 +02:00
Robin Mueller	89f83f4e3d	update changelog	2022-05-09 15:33:03 +02:00
Robin Mueller	39b7976056	new cmake options for CICD build	2022-05-09 15:26:38 +02:00
Steffen Gaisser	83de5b4ec1	Merge branch 'development' into mueller/cpp17-update	2022-05-09 15:13:50 +02:00
Steffen Gaisser	fe1c51ae6d	Merge pull request 'CMake move some directives up top' (#621) from mueller/cmake-fixes into development ... Reviewed-on: #621	2022-05-09 15:13:02 +02:00
Robin Mueller	10cc954d27	update changelog	2022-05-09 15:09:07 +02:00
Robin Mueller	73ff9b97db	bump CMAKE_CXX_STANDARD to C++17	2022-05-09 15:07:46 +02:00
Robin Mueller	b0d71597f0	update changelog	2022-05-09 14:58:39 +02:00
Robin Mueller	226f28dc7b	Move some directives up top	2022-05-09 14:53:52 +02:00
Robin Müller	1a07864a5f	Merge pull request 'CCSDS Time CUC Tests' (#593) from gaisser/fsfw:gaisser_cuc_tests into development ... Reviewed-on: #593	2022-05-02 15:29:48 +02:00
Steffen Gaisser	3e9d6bdbb9	Merge branch 'development' into gaisser_cuc_tests	2022-05-02 15:24:32 +02:00
Steffen Gaisser	c295539c79	Merge pull request 'Fixes to allow compilation on MacOS' (#611) from mueller/mac-os into development ... Reviewed-on: #611	2022-05-02 15:22:19 +02:00
Robin Müller	cddf16f941	Merge branch 'development' into mueller/mac-os	2022-05-02 15:15:53 +02:00
Robin Müller	a3dee05fe3	Merge pull request 'space packet bug fix' (#607) from meier/spacePacketBugFix into development ... Reviewed-on: #607	2022-05-02 15:15:28 +02:00
Steffen Gaisser	8edf4c3c8d	Merge branch 'development' into meier/spacePacketBugFix	2022-05-02 15:10:32 +02:00
Steffen Gaisser	8cc94a55ab	Merge pull request 'Bump Catch2 dependency & Catch2 pre-installed for CI/CD' (#605) from mueller/bump-catch2 into development ... Reviewed-on: #605	2022-05-02 15:03:08 +02:00
Robin Müller	daffb6b666	Merge branch 'development' into gaisser_cuc_tests	2022-05-02 14:45:33 +02:00
Robin Müller	7cfb1e6076	Merge branch 'development' into mueller/bump-catch2	2022-05-02 14:36:44 +02:00
Steffen Gaisser	cc36baff78	Merge pull request 'Hotfix CMake & ETL' (#604) from mueller/hotfix-etl into development ... Reviewed-on: #604	2022-05-02 14:36:29 +02:00
Robin Müller	4c65109ac0	Merge branch 'development' into meier/spacePacketBugFix	2022-05-02 14:36:24 +02:00
Robin Müller	861bd15eda	Merge branch 'development' into mueller/hotfix-etl	2022-05-02 14:20:40 +02:00
Steffen Gaisser	7b979eadff	Merge pull request 'fix compiler warnings and auto-formatting' (#598) from eive/fsfw:mueller/compiler-warning-fixes-upstream-2 into development ... Reviewed-on: #598	2022-05-02 14:17:00 +02:00
Steffen Gaisser	16714ceb40	Merge branch 'development' into gaisser_cuc_tests	2022-05-02 13:58:17 +02:00
Robin Mueller	fea301bcc9	Merge remote-tracking branch 'origin/mueller/hotfix-etl' into mueller/mac-os	2022-05-02 09:35:28 +02:00
Robin Mueller	77450eb4b7	removed flag which does not exist	2022-05-02 09:09:41 +02:00
Robin	28015c4735	it compiles and runs	2022-05-01 17:48:49 +02:00
Robin	7d61e67d20	more macos changes	2022-04-30 19:02:41 +02:00
Robin	afcbc8be0a	changes for MacOS	2022-04-30 18:40:22 +02:00
Robin Müller	7a2269262b	Merge branch 'development' into meier/spacePacketBugFix	2022-04-29 08:45:10 +02:00
Jakob Meier	9731dc1e61	space packet bug fix	2022-04-29 07:47:23 +02:00
Robin Mueller	8642b13fd1	Merge branch 'mueller/hotfix-etl' into mueller/bump-catch2	2022-04-27 21:55:45 +02:00
Robin Mueller	6aa72892ed	clean usage of FetchContent_MakeAvailable	2022-04-27 21:53:57 +02:00
Robin Mueller	70f0a72f1b	added explicit checkout of v3.0.0-preview5	2022-04-27 13:54:15 +02:00
Robin Mueller	b5d890eedd	install Catch2 for docker_d2 and update Jenkinsfile	2022-04-27 13:43:49 +02:00
Robin Mueller	50b1b48678	link Catch2 issue	2022-04-27 13:36:26 +02:00
Robin Mueller	0e0dbc74aa	Merge branch 'mueller/hotfix-etl' into mueller/bump-catch2	2022-04-27 09:45:42 +02:00
Robin Mueller	8c34051d8b	bump Catch2 revision	2022-04-27 09:45:20 +02:00
Robin Mueller	b00d83cb1a	bump ETL revision	2022-04-27 09:41:16 +02:00
Robin Mueller	17e609c3a5	some more var replacements	2022-04-27 09:37:11 +02:00
Robin Mueller	64f0166b64	hotfix for new ETL dependency	2022-04-27 09:16:52 +02:00
Robin Mueller	c80f06fbcb	hotfix for ETL lib dep	2022-04-27 09:08:17 +02:00
Robin Mueller	70eb8325a0	Merge remote-tracking branch 'upstream/development' into mueller/compiler-warning-fixes-upstream-2	2022-04-27 08:47:45 +02:00
Robin Müller	e796f82203	Merge pull request 'gpio bug fix' (#602) from KSat/fsfw:hoffmann/gpioBugfix into development ... Reviewed-on: #602	2022-04-27 08:41:54 +02:00
Robin Mueller	5b7ca8c13c	update CHANGELOG.md, apply afmt	2022-04-27 08:39:21 +02:00
Robin Müller	031739ef51	Merge branch 'development' into hoffmann/gpioBugfix	2022-04-25 15:45:21 +02:00
Robin Mueller	80be937d9d	Merge remote-tracking branch 'upstream/development' into mueller/compiler-warning-fixes-upstream-2	2022-04-25 15:24:17 +02:00
Steffen Gaisser	b8516b15cb	Merge pull request 'Added an additional conversion function' (#584) from eive/fsfw:mueller/clock-addition into development ... Reviewed-on: #584	2022-04-25 15:22:07 +02:00
Steffen Gaisser	ac5a54b5da	Merge branch 'development' into mueller/clock-addition	2022-04-25 15:12:24 +02:00
Robin Mueller	29015b340b	update changelog	2022-04-25 15:10:50 +02:00