4217 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Mueller	19f75b598a	Merge remote-tracking branch 'origin/develop' into irini	2022-08-12 13:06:35 +02:00
Robin Müller	12f38aa58c	Merge pull request 'Bump dependencies' (#274) from mueller/bump-deps into develop ... Reviewed-on: #274	2022-08-12 12:59:14 +02:00
Robin Mueller	eb623e7d7c	this should fix the CI/CD error	2022-08-12 12:55:43 +02:00
Robin Mueller	f8f51c8fd6	include fix	2022-08-12 12:35:56 +02:00
Robin Müller	44c12a141c	Merge branch 'develop' into petri_dev	2022-08-12 12:34:33 +02:00
Robin Mueller	05a10485d9	Merge remote-tracking branch 'origin/develop' into irini	2022-08-12 12:34:10 +02:00
Robin Mueller	a8b1fe2e8d	re-run generator scripts	2022-08-12 12:31:13 +02:00
Robin Mueller	961e012972	bump fsfw and tmtc dependency	2022-08-12 12:30:08 +02:00
Robin Mueller	77cfc6e714	ACS controller init	2022-08-12 12:29:28 +02:00
Robin Mueller	6551cbe1b4	using correct retval translation files now	2022-08-09 10:38:47 +02:00
Robin Mueller	80b1c69244	re-point tmtc	2022-08-08 17:12:22 +02:00
Robin Mueller	4649c97205	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-08-08 17:12:12 +02:00
Robin Mueller	22181ec76d	Merge remote-tracking branch 'origin/develop' into petri_dev	2022-08-08 17:11:36 +02:00
Robin Mueller	bd40af34c8	Merge branch 'develop' into irini	2022-08-08 17:10:57 +02:00
Robin Mueller	89b3b2ff42	Merge remote-tracking branch 'origin/develop' into mueller/pl-ss	2022-08-08 17:08:56 +02:00
Robin Mueller	1280b77e95	re-run generators	2022-08-08 17:07:55 +02:00
Robin Mueller	b12cac1e80	install obsw into variant specfiic folders now	2022-08-04 12:08:55 +02:00
Robin Mueller	722d7a67f5	important bugfix for FM SW	2022-08-04 01:45:49 +02:00
Robin Mueller	89c9911be6	fix install script	2022-08-02 20:12:25 +02:00
Jakob Meier	9911f58424	Merge pull request 'update-develop' (#273) from update-develop into develop ... Reviewed-on: #273 Reviewed-by: Jakob Meier <meierj@irs.uni-stuttgart.de>	2022-07-15 08:55:46 +02:00
Robin Mueller	3ca11b5894	run auto-formatter	2022-07-14 17:35:49 +02:00
Robin Mueller	2c3c05e2d4	Merge remote-tracking branch 'origin/develop' into petri_dev	2022-07-14 17:31:08 +02:00
Robin Mueller	5b3927d988	bump tmtc	2022-07-14 17:27:41 +02:00
Robin Mueller	035eda9cfd	update develop	2022-07-14 15:46:22 +02:00
Robin Mueller	201ef9cb0c	smaller bugfixes	2022-07-13 15:51:21 +02:00
Robin Mueller	8a23615462	added printout in scex uart reader	2022-07-13 12:02:32 +02:00
Robin Mueller	8b39f65472	modify oss to append at end	2022-07-13 11:25:53 +02:00
Robin Mueller	d1bfc512ec	update .cproject file	2022-07-13 10:32:41 +02:00
petriVM18	b4bb46726c	Changed filesystem include to new version	2022-07-13 09:38:42 +02:00
petriVM18	3bad503694	Fixed submodules file	2022-07-13 09:34:27 +02:00
petriVM18	84c4f47ed1	Removed obsolete stuff	2022-07-13 09:26:22 +02:00
Robin Mueller	303f538076	countdown based reply handling	2022-07-08 17:11:21 +02:00
Robin Mueller	fc639a3e3f	move countdown reset	2022-07-08 16:57:40 +02:00
Robin Mueller	57f97de58e	rerun generator scripts	2022-07-08 16:46:27 +02:00
Robin Mueller	a462677ed2	smaller fixes, always download ETL	2022-07-08 16:39:07 +02:00
Robin Mueller	563e13765d	Merge remote-tracking branch 'origin/develop' into irini	2022-07-08 16:27:50 +02:00
petriVM18	5e4d07bd25	Code refactoring and bug fixes for config file handler. Added new test cases for config file handler	2022-07-05 14:56:31 +02:00
petriVM18	d9060734b0	Removed insert function in config handler, not needed. Added more tests for config handler	2022-07-05 12:57:50 +02:00
Jakob Meier	c6f60fbe82	Merge pull request 'v1.12.1' (#270) from develop into main ... Reviewed-on: #270 Reviewed-by: Jakob Meier <meierj@irs.uni-stuttgart.de>	2022-07-05 11:39:58 +02:00
Robin Müller	269c93a9f3	Merge branch 'main' into develop	2022-07-05 11:24:52 +02:00
Robin Mueller	2e966aba77	repoint tmtc	2022-07-05 11:19:42 +02:00
petriVM18	c4b8fa5444	Merged from development, added unit test for config file handler, removed obsolete stuff from handler	2022-07-05 10:02:43 +02:00
Robin Mueller	76a217ffc2	bump changelog and version	2022-07-05 02:14:32 +02:00
Robin Mueller	be7a9af8cd	disable TCS ctrl spam	2022-07-05 02:13:07 +02:00
Robin Müller	75e71f7dca	Merge pull request 'v1.12.0' (#269) from develop into main ... Reviewed-on: #269	2022-07-04 11:19:04 +02:00
Robin Mueller	62f725beea	bump changelog and version	2022-07-04 11:13:26 +02:00
Robin Mueller	812c814a30	bump tmtc	2022-07-04 11:08:05 +02:00
Robin Mueller	b133a0538c	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-07-04 10:47:23 +02:00
Robin Mueller	9e89a0689f	Merge remote-tracking branch 'origin/develop' into mueller/pl-ss	2022-07-04 10:46:47 +02:00
Irini Kosmidou	5a92b9e616	tmtc	2022-06-30 21:53:02 +02:00