5075 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Irini Kosmidou	5f3bd5c754	Merge branch 'thermal_controller' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into thermal_controller	2023-02-24 13:46:14 +01:00
Irini Kosmidou	63275df3f0	formal changes	2023-02-24 13:39:23 +01:00
Robin Mueller	d6f537da5f	Merge remote-tracking branch 'origin/develop' into thermal_controller	2023-02-23 15:58:10 +01:00
Robin Müller	e19c03f0d7	Merge pull request 'remove shadowed member variables' (#396) from bugfix_shadowed_variables_dual_assys into develop ... Reviewed-on: #396 v1.31.0	2023-02-23 15:53:28 +01:00
Robin Müller	33d552693f	Merge branch 'develop' into bugfix_shadowed_variables_dual_assys	2023-02-23 15:53:09 +01:00
Robin Mueller	152a9b2dce	bump eive-tmtc again	2023-02-23 15:46:53 +01:00
Robin Mueller	91af3ac497	skip private retval	2023-02-23 15:40:06 +01:00
Robin Mueller	89f6314a18	prep v1.31.0	2023-02-23 15:32:40 +01:00
Robin Mueller	0ee7bdad0a	Merge remote-tracking branch 'origin/develop' into bugfix_shadowed_variables_dual_assys	2023-02-23 15:27:15 +01:00
Robin Müller	419864e5da	Merge pull request 'tweaks for ACS scheduling' (#395) from tweaks_acs_scheduling into develop ... Reviewed-on: #395 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-02-23 15:23:34 +01:00
Robin Müller	cd88e8948d	Merge pull request 'Com Subsystem' (#364) from meier/com-ss into develop ... Reviewed-on: #364 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2023-02-23 15:22:46 +01:00
Robin Mueller	ca743ccd6c	re-run generators	2023-02-23 15:22:11 +01:00
Robin Mueller	9fc6386ac5	bump tmtc again	2023-02-23 15:19:56 +01:00
Robin Mueller	b60891ddd1	tmtc bump	2023-02-23 15:14:56 +01:00
Robin Mueller	cd988753ae	bump tmtc	2023-02-23 15:14:40 +01:00
Robin Mueller	66d3b06f9e	Merge remote-tracking branch 'origin/develop' into meier/com-ss	2023-02-23 13:06:22 +01:00
Robin Mueller	bd60255220	interior structure changes, use new sched block	2023-02-23 11:57:12 +01:00
Robin Mueller	ba9268aae6	changelog	2023-02-23 11:49:13 +01:00
Robin Mueller	9f83a49690	remove shadowed member variables	2023-02-23 11:46:30 +01:00
Irini Kosmidou	9a7779cffb	struct heaterStates and more	2023-02-22 21:46:56 +01:00
Robin Müller	0254fb9fd2	Merge branch 'develop' into tweaks_acs_scheduling	2023-02-22 19:56:34 +01:00
Robin Müller	eee3da50f2	Merge pull request 'Telemetry related Changes' (#394) from eggert/acs-dataset-stuff into develop ... Reviewed-on: #394 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2023-02-22 19:56:23 +01:00
Robin Mueller	d32ce3c563	changelog	2023-02-22 19:48:44 +01:00
Robin Mueller	a190d99f6d	auto-formatter	2023-02-22 19:45:41 +01:00
Irini Kosmidou	0fa1bab94d	comments	2023-02-22 19:14:35 +01:00
Robin Mueller	5357de8da8	bump fsfe	2023-02-22 18:13:52 +01:00
Robin Mueller	9614a76acf	Merge remote-tracking branch 'origin/develop' into meier/com-ss	2023-02-22 18:13:29 +01:00
Robin Mueller	0466622a16	tweaks for ACS scheduling	2023-02-22 18:07:15 +01:00
Irini Kosmidou	29179bde0c	merge conflicts	2023-02-22 18:01:54 +01:00
Irini Kosmidou	b9a6425078	dummy change	2023-02-22 17:50:03 +01:00
Irini Kosmidou	e13636167f	limit for error events thermalcontroller + dummy beta	2023-02-22 17:30:30 +01:00
Jakob Meier	0d8cb295d9	removed duplicate code	2023-02-22 16:55:12 +01:00
meggert	eaceb32359	Merge branch 'develop' into eggert/acs-dataset-stuff	2023-02-22 16:03:36 +01:00
meggert	01d8eccdd2	changelog	2023-02-22 16:00:28 +01:00
Robin Mueller	19d04c0023	v1.30.0 v1.30.0	2023-02-22 15:03:07 +01:00
meggert	67a14ca6f6	handle ACS event in AcsSubsystem	2023-02-22 15:02:15 +01:00
meggert	83b81e1ba8	changed mekf events again	2023-02-22 14:57:44 +01:00
Jakob Meier	e915f6cc90	Merge pull request 'PDEC possible fixes' (#393) from pdec_possible_fixes_and_fdir into develop ... Reviewed-on: #393 Reviewed-by: Jakob Meier <meierj@irs.uni-stuttgart.de>	2023-02-22 14:45:48 +01:00
Robin Mueller	c9f16b223a	Merge remote-tracking branch 'origin/develop' into pdec_possible_fixes_and_fdir	2023-02-22 14:30:31 +01:00
Jakob Meier	3137ebb86e	com subsystem complete	2023-02-22 13:02:40 +01:00
Jakob Meier	fd1c090141	tmtc update	2023-02-22 13:02:04 +01:00
Jakob Meier	82d428440b	tmtc update	2023-02-22 09:53:39 +01:00
Jakob Meier	018f93cfbe	fixed bugs in com subsystem	2023-02-22 09:53:09 +01:00
Jakob Meier	c64a490324	Merge branch 'develop' into meier/com-ss	2023-02-22 07:17:02 +01:00
Irini Kosmidou	9b849d10e9	small changes	2023-02-21 17:49:55 +01:00
meggert	2c3a7791e1	Merge branch 'develop' into eggert/acs-dataset-stuff	2023-02-21 17:16:15 +01:00
meggert	f19729e11d	throw a single event every time the mekf stops working	2023-02-21 17:10:59 +01:00
meggert	019cc29c24	useMekf actually now uses returnvalues as inteded	2023-02-21 17:09:49 +01:00
meggert	d1402587dc	differentiate between mekf not working during safe/detumble or any higer mode	2023-02-21 17:06:24 +01:00
meggert	793e6f4119	returnvalues for all mekf termination cases now	2023-02-21 16:56:13 +01:00