5022 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Steffen Gaisser	6021d897b8	Merge branch 'development' into windows-tweaks-upstream	2022-11-14 14:13:57 +01:00
Robin Mueller	83a6f0b5f8	reenable setup function call	2022-11-14 14:12:26 +01:00
Robin Mueller	a9c6c088f2	remove leftover debugging code	2022-11-14 14:08:38 +01:00
Robin Mueller	c913fe40bf	tweaks	2022-11-09 17:54:08 +01:00
Steffen Gaisser	70ec08bf1d	Merge pull request 'missing include' (#703) from KSat/fsfw:mueller/time_reader_include into development ... Reviewed-on: #703	2022-11-09 16:59:25 +01:00
Steffen Gaisser	ef23665d9c	Merge branch 'development' into mueller/time_reader_include	2022-11-09 16:39:55 +01:00
Robin Müller	eefc122292	Merge pull request 'defaultconfig did not build anymore' (#702) from mohr/fix_defaultconfig into development ... Reviewed-on: #702	2022-11-09 14:12:41 +01:00
Robin Mueller	bee33526a1	missing include	2022-11-09 13:49:40 +01:00
Ulrich Mohr	11a22577be	defaultconfig did not build anymore	2022-10-25 11:28:13 +02:00
Steffen Gaisser	dc1583c932	Merge branch 'development' into windows-tweaks-upstream	2022-10-24 17:10:44 +02:00
Steffen Gaisser	94f1f1f908	Merge pull request 'Refactor TM and TC acceptor interfaces' (#684) from mueller/refactor-accepts-tc-tm-if into development ... Reviewed-on: #684	2022-10-24 17:10:03 +02:00
Steffen Gaisser	955579c856	Merge branch 'development' into mueller/refactor-accepts-tc-tm-if	2022-10-24 14:57:38 +02:00
Steffen Gaisser	c6585c8645	Merge pull request 'important bugfix for linux i2c device com IF' (#700) from eive/fsfw:mueller/i2c-com-if-bugfix into development ... Reviewed-on: #700	2022-10-24 14:35:01 +02:00
Robin Mueller	d8a4675842	bump changelog	2022-10-24 14:30:14 +02:00
Robin Mueller	1164c21ddd	iter not a member anymore, more bugfixes	2022-10-24 14:23:43 +02:00
Robin Mueller	77b1a85b47	important bugfix for i2c device com IF	2022-10-20 14:24:40 +02:00
Steffen Gaisser	3349fc36f8	Merge branch 'development' into windows-tweaks-upstream	2022-10-17 14:20:48 +02:00
Steffen Gaisser	f3e9277e59	Merge branch 'development' into mueller/refactor-accepts-tc-tm-if	2022-10-10 15:45:05 +02:00
Steffen Gaisser	d592f1ecbc	Merge pull request 'Minor API tweak' (#689) from eive/fsfw:mueller/smaller-tweaks into development ... Reviewed-on: #689	2022-10-10 15:10:57 +02:00
Ulrich Mohr	6ec18171a8	Merge pull request 'now that doc server is up, remove markdown files' (#688) from mueller/remove-markdown-docs into development ... Reviewed-on: #688	2022-10-10 15:04:11 +02:00
Steffen Gaisser	518dcdef4b	Merge branch 'development' into mueller/smaller-tweaks	2022-10-10 15:03:04 +02:00
Ulrich Mohr	d9730032fd	Merge pull request 'DHB Countdown Bug' (#693) from eive/fsfw:mueller/dhb-countdown-bug into development ... Reviewed-on: #693	2022-10-10 14:55:43 +02:00
Steffen Gaisser	b3ac72b7db	Merge pull request 'missing retval conv' (#697) from mueller/missing-retval-conversion into development ... Reviewed-on: #697	2022-10-10 14:54:26 +02:00
Steffen Gaisser	cd0cb43412	Merge branch 'development' into mueller/missing-retval-conversion	2022-10-10 14:46:10 +02:00
Steffen Gaisser	32c12b3dbf	Merge pull request 'small fix for helper' (#698) from mueller/small-helper-script-fix into development ... Reviewed-on: #698	2022-10-10 14:43:59 +02:00
Steffen Gaisser	3e9acf476e	Merge branch 'development' into mueller/small-helper-script-fix	2022-10-10 14:25:49 +02:00
Steffen Gaisser	99101ce2bf	Merge pull request 'hotfix' (#699) from eive/fsfw:mueller/dhb-some-more-fixes into development ... Reviewed-on: #699	2022-10-10 14:22:30 +02:00
Robin Müller	6b991045f7	Merge branch 'development' into mueller/smaller-tweaks	2022-10-10 13:41:47 +02:00
Robin Müller	df06064df0	Merge branch 'development' into windows-tweaks-upstream	2022-10-10 13:41:09 +02:00
Robin Mueller	337cb0d6c9	hotfix	2022-10-10 10:21:17 +02:00
Robin Mueller	c283e0c988	okay this is correct	2022-10-04 11:02:08 +02:00
Robin Mueller	448d20f3bd	small fix for helper	2022-10-04 10:55:46 +02:00
Robin Müller	2316728d74	Merge branch 'development' into mueller/dhb-countdown-bug	2022-10-04 10:53:26 +02:00
Robin Mueller	6f562e5f3e	missing retval conv	2022-10-04 10:25:58 +02:00
Ulrich Mohr	176f243194	Merge pull request 'Switch to new documentation server' (#694) from mohr/documentation_ci into development ... Reviewed-on: #694	2022-09-30 15:05:16 +02:00
Ulrich Mohr	d964fa2107	Merge branch 'development' into mohr/documentation_ci	2022-09-30 14:50:20 +02:00
Ulrich Mohr	7b5ae6a445	done?	2022-09-30 14:40:59 +02:00
Ulrich Mohr	8e362a000c	Revert "one last check" ... This reverts commit 7877776e24.	2022-09-30 14:36:25 +02:00
Ulrich Mohr	7877776e24	one last check	2022-09-30 14:34:25 +02:00
Robin Mueller	3de0ae5a48	DHB bug	2022-09-29 17:22:44 +02:00
Robin Mueller	e0c780f21c	better comment	2022-09-28 09:59:31 +02:00
Robin Mueller	876815b1c9	another small windows tweak	2022-09-28 09:59:22 +02:00
Robin Mueller	b0ecf87580	last windows tweak	2022-09-28 09:59:12 +02:00
Robin Mueller	68ce8b5b08	tweaks to make windows build again	2022-09-28 09:59:02 +02:00
Steffen Gaisser	95ac53c417	Merge branch 'development' into mueller/smaller-tweaks	2022-09-26 14:40:29 +02:00
Steffen Gaisser	62f638a3d2	Merge pull request 'doc corrections' (#687) from mueller/doc-corrections into development ... Reviewed-on: #687	2022-09-26 14:38:39 +02:00
Steffen Gaisser	bd64591f30	Merge branch 'development' into mueller/smaller-tweaks	2022-09-26 14:34:38 +02:00
Steffen Gaisser	e6a877f048	Merge branch 'development' into mueller/doc-corrections	2022-09-26 14:26:48 +02:00
Steffen Gaisser	ea8c557ee8	Merge pull request 'better error printout' (#686) from eive/fsfw:mueller/local-pool-obj-base-better-warning into development ... Reviewed-on: #686	2022-09-26 14:26:20 +02:00
Steffen Gaisser	0bdd780f82	Merge branch 'development' into mueller/doc-corrections	2022-09-26 14:17:24 +02:00