3393 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Mueller	6003c6afb5	Merge remote-tracking branch 'origin/develop' into mueller/acs-ctrl	2022-08-12 13:13:57 +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 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	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	5b3927d988	bump tmtc	2022-07-14 17:27:41 +02:00
Robin Mueller	035eda9cfd	update develop	2022-07-14 15:46:22 +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
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 Müller	e092d9bf3d	Merge pull request 'CCSDS Handler Improvements' (#268) from meier/ccsds into develop ... Reviewed-on: #268 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2022-06-29 13:53:29 +02:00
meierj	bf8ffac624	removed unused event	2022-06-27 15:03:37 +02:00
meierj	d78155fd79	remove ccsds components from em object factory	2022-06-27 14:56:46 +02:00
Jakob Meier	3a93cdc105	add thermal controller for hosted build	2022-06-27 13:53:38 +02:00
meierj	a2e7c6cca6	moved ccsds object creation back to core object factory and run auto formatter	2022-06-27 10:58:46 +02:00
meierj	b5ff0edbc9	fixed merge conflict	2022-06-27 09:31:39 +02:00
meierj	95da2372c9	run generators	2022-06-27 09:15:29 +02:00
meierj	70450041e6	removed command action helper form ccsds handler	2022-06-27 08:53:14 +02:00
Jakob Meier	ed0eb4fe9c	adaptions for setup with ccsds testbed	2022-06-23 20:12:56 +02:00
Jakob Meier	af039c540a	moved TmFunnel	2022-06-23 12:05:56 +02:00
Robin Müller	d2a12ea71e	Merge pull request 'fsfwgen update' (#267) from mueller/gen-update into develop ... Reviewed-on: #267	2022-06-21 10:40:15 +02:00
Robin Mueller	53e556d0b3	improve csv format	2022-06-21 01:21:23 +02:00
Robin Mueller	72ab141b41	use lib logger	2022-06-21 01:02:00 +02:00
Robin Mueller	c6b00e2448	update deps and gen files	2022-06-21 00:58:59 +02:00
Robin Mueller	d4a1cb9f62	fsfwgen update	2022-06-20 18:05:05 +02:00
Robin Müller	83c93a9637	Merge pull request 'Thermal controller and temperature bugfixes' (#266) from meier/thermal-bugfixes into develop ... Reviewed-on: #266 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2022-06-20 09:43:03 +02:00
Jakob Meier	89757c447c	run auto-formatter	2022-06-17 08:31:36 +02:00
Jakob Meier	61aa57f021	Merge branch 'develop' into meier/thermal-bugfixes	2022-06-16 09:00:56 +02:00
Jakob Meier	0ee912665e	removed mock files from mission directory	2022-06-16 08:47:56 +02:00
Jakob Meier	b53bfb9a6f	dummy devices	2022-06-16 08:26:40 +02:00
Jakob Meier	bd11d13b99	dummy devices for hosted build, adaptions to run thermal controller unit test	2022-06-16 07:00:09 +02:00
Robin Müller	1133736d48	Merge pull request 'Fixed tmtc and fsfw submodule' (#265) from meier/submodules into develop ... Reviewed-on: #265 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2022-06-15 11:02:48 +02:00
Jakob Meier	9918c7c255	tmtc update	2022-06-15 10:49:46 +02:00
Jakob Meier	b0a175610a	fsfw update	2022-06-15 10:49:22 +02:00
Jakob Meier	d96d3b155b	syrlinks carrier wave command	2022-06-15 10:37:00 +02:00
Jakob Meier	eff80a58ee	improvements for hosted build	2022-06-13 08:58:06 +02:00
Jakob Meier	5f796ec1e3	init poll variable	2022-06-10 14:22:35 +02:00