5188 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Steffen Gaisser	288d453978	Merge pull request 'Version Getter Function' (#575) from eive/fsfw:mueller/version-getter-upstream into development ... Reviewed-on: #575	2022-03-14 14:44:37 +01:00
Robin Mueller	522cbc7f3d	Merge remote-tracking branch 'upstream/development' into mueller/version-getter-upstream	2022-03-14 14:38:27 +01:00
Robin Mueller	ce5bcc5897	bugfix	2022-03-14 14:37:41 +01:00
Robin Mueller	97c93afeff	Merge remote-tracking branch 'upstream/development' into mueller/version-getter-upstream	2022-03-14 14:24:43 +01:00
Ulrich Mohr	8704b9ab06	Merge pull request 'Fixed test issue with overflow of times' (#574) from gaisser/fsfw:gaisser_ccsds_time_tests into development ... Reviewed-on: #574	2022-03-14 14:23:35 +01:00
Ulrich Mohr	5a1585bd00	Merge pull request 'SPI HAL improvement' (#573) from eive/fsfw:mueller/spi-initialize-line-state into development ... Reviewed-on: #573	2022-03-14 14:18:03 +01:00
Robin Mueller	5d6de90859	Merge remote-tracking branch 'upstream/development' into mueller/spi-initialize-line-state	2022-03-14 14:15:13 +01:00
Ulrich Mohr	378c6c8006	Merge pull request 'HAL: Update for GPIO code' (#572) from eive/fsfw:mueller/gpio-update into development ... Reviewed-on: #572	2022-03-14 14:13:33 +01:00
Ulrich Mohr	f4922a8686	Merge pull request 'small test device handler fixes' (#571) from eive/fsfw:mueller/small-dh-test-foxes into development ... Reviewed-on: #571	2022-03-14 14:11:44 +01:00
Robin Mueller	0bdcb40609	minor event changes	2022-03-11 14:25:34 +01:00
Robin Mueller	fec5f83f4f	minor event changes	2022-03-11 14:25:01 +01:00
Robin Mueller	17262a1da9	Merge branch 'mueller/version-getter-upstream' into mueller/master	2022-03-10 09:59:18 +01:00
Robin Mueller	e684680d60	avoid namespace pollution	2022-03-10 09:58:37 +01:00
Robin Mueller	aa5d1042f0	undef major and minor	2022-03-10 09:57:37 +01:00
Robin Mueller	b5d6b9745f	undef major and minor	2022-03-10 09:56:23 +01:00
Robin Mueller	60639f56dc	Merge branch 'mueller/version-getter' into mueller/master	2022-03-10 09:47:32 +01:00
Robin Mueller	3aa0bbde68	Merge branch 'mueller/version-getter-upstream' into mueller/version-getter	2022-03-10 09:47:10 +01:00
Robin Mueller	14ac852b7e	this tests even a bit more	2022-03-10 09:44:06 +01:00
Robin Mueller	6b1a81ee92	minor tweaks	2022-03-10 09:40:34 +01:00
Robin Mueller	3779b44813	added some more minor tests	2022-03-10 09:37:57 +01:00
Robin Mueller	949549178a	update changelog	2022-03-10 09:36:36 +01:00
Robin Mueller	7daa9812ff	added tests	2022-03-10 09:35:10 +01:00
Robin Mueller	97bc71a3ff	added tests	2022-03-10 09:34:29 +01:00
Robin Mueller	06577ed78a	Merge branch 'mueller/version-getter' into mueller/master	2022-03-09 19:11:57 +01:00
Robin Mueller	ca508bfe61	getter not required anymore	2022-03-09 19:10:33 +01:00
Robin Mueller	b27f3b84aa	getter not required anymore	2022-03-09 19:10:05 +01:00
Robin Mueller	345a799031	improved version.h	2022-03-09 19:08:17 +01:00
Robin Mueller	9509847b84	Merge branch 'mueller/version-getter' into mueller/master	2022-03-09 19:05:30 +01:00
Robin Mueller	45b51f9ac8	improved version.h	2022-03-09 19:05:07 +01:00
Steffen Gaisser	445d5dd6f0	Added Checks for CDSShort in unittests	2022-03-09 18:56:08 +01:00
Jakob.Meier	d5ff6da40b	Merge pull request 'function to get fsfw version' (#43) from mueller/version-getter into eive/develop ... Reviewed-on: eive/fsfw#43	2022-03-08 12:04:13 +01:00
Jakob.Meier	e498136273	Merge pull request 'call setTimeout' (#44) from mueller/countdown-improvement into eive/develop ... Reviewed-on: eive/fsfw#44	2022-03-08 12:03:13 +01:00
Robin Mueller	238baa8597	call setTimeout	2022-03-08 11:54:20 +01:00
Robin Mueller	47d158156b	call setTimeout	2022-03-08 11:52:33 +01:00
Robin Mueller	d63c01b96f	set timeout in countdown ctor	2022-03-08 11:50:47 +01:00
Robin Mueller	3b497dbb8d	Merge branch 'mueller/version-getter' into mueller/master	2022-03-08 10:16:56 +01:00
Robin Mueller	bf733162eb	Merge remote-tracking branch 'origin/eive/develop' into mueller/master	2022-03-08 10:15:54 +01:00
Robin Mueller	7932afc315	small form change	2022-03-08 10:13:11 +01:00
Robin Mueller	d1e3dc4d49	define FSFW_DISABLE_PRINTOUT in any case	2022-03-08 10:12:02 +01:00
Jakob.Meier	73f0b9c0dc	Merge pull request 'define FSFW_DISABLE_PRINTOUT in any case' (#42) from mueller/define-fsfw-disabled-printout into eive/develop ... Reviewed-on: eive/fsfw#42	2022-03-08 10:11:45 +01:00
Jakob.Meier	b5e55f64b0	Merge pull request 'Another HasModesIF improvement' (#41) from mueller/master into eive/develop ... Reviewed-on: eive/fsfw#41	2022-03-08 10:11:05 +01:00
Robin Mueller	77e5fba7fd	update changelog	2022-03-08 10:08:53 +01:00
Robin Mueller	ca70c8c614	function to get fsfw version	2022-03-08 10:07:07 +01:00
Robin Mueller	7ca6d1a695	function to get fsfw version	2022-03-08 10:05:18 +01:00
Robin Müller	cc3210f366	Merge branch 'eive/develop' into mueller/define-fsfw-disabled-printout	2022-03-08 09:57:43 +01:00
Robin Mueller	155d66e534	define FSFW_DISABLE_PRINTOUT in any case	2022-03-08 09:57:11 +01:00
Robin Mueller	d4c76a7e46	Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/master	2022-03-08 09:56:39 +01:00
Robin Mueller	dba3c27b99	define FSFW_DISABLE_PRINTOUT in any case	2022-03-08 09:56:24 +01:00
Robin Müller	202cfc6dbb	Merge branch 'eive/develop' into mueller/master	2022-03-08 09:47:37 +01:00
Robin Mueller	84f95e8d76	this is better	2022-03-08 09:45:58 +01:00