5238 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Mueller	9bcc424d86	prepare for v1.24.0	2023-02-03 16:43:53 +01:00
Robin Mueller	05d168d6ee	bump tmtc to v2.10.0	2023-02-03 16:42:35 +01:00
Robin Mueller	32042afccd	bump minor version	2023-02-03 16:30:38 +01:00
Robin Mueller	3b8903b2e2	Merge remote-tracking branch 'origin/develop' into acs_update_scheduling	2023-02-03 16:13:40 +01:00
Robin Müller	47f998b493	Merge pull request 'MTQ Commanding from ACS Ctrl fixes' (#363) from eggert/mtq-cmd-fixes into develop ... Reviewed-on: #363 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2023-02-03 16:12:31 +01:00
Robin Mueller	02b52d2b55	Merge remote-tracking branch 'origin/develop' into eggert/mtq-cmd-fixes	2023-02-03 16:12:32 +01:00
Robin Mueller	9f28f32af9	bump tmtc	2023-02-03 16:12:11 +01:00
Robin Mueller	a9bd792194	changelog correction	2023-02-03 16:11:28 +01:00
Robin Mueller	6b36ba8323	Merge remote-tracking branch 'origin/develop' into eggert/mtq-cmd-fixes	2023-02-03 16:10:47 +01:00
Robin Mueller	d9514e4184	a lot of bugfixes	2023-02-03 16:08:34 +01:00
meggert	b9ed485d60	changed calibration matrices for SUS0 and SUS6 due to them being exchanged	2023-02-03 15:44:50 +01:00
Robin Mueller	b8130265cd	afmt	2023-02-03 15:02:30 +01:00
Robin Mueller	e4a227359b	some bugfixes, syrlinks needs to remain in PST cause of some bug	2023-02-03 15:02:08 +01:00
Robin Mueller	f9ae4860d9	typo	2023-02-03 14:31:22 +01:00
Robin Mueller	3a092fd920	Merge remote-tracking branch 'origin/develop' into acs_update_scheduling	2023-02-03 14:31:09 +01:00
Robin Müller	129399c40e	Merge pull request 'ACS updates' (#365) from acs_updates into develop ... Reviewed-on: #365 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-02-03 14:28:05 +01:00
Robin Mueller	777d673465	small fix	2023-02-03 14:24:27 +01:00
Robin Mueller	825365263f	update changelog	2023-02-03 14:23:39 +01:00
Robin Mueller	4ed1e2411a	works	2023-02-03 14:21:36 +01:00
Irini Kosmidou	519d55af4b	ThermalController: events for overheating	2023-02-03 13:19:39 +01:00
Robin Mueller	e46b4c51d5	Merge remote-tracking branch 'origin/develop' into heater_handling	2023-02-03 11:47:16 +01:00
Robin Mueller	76d18a67bc	almost done	2023-02-03 11:33:18 +01:00
Robin Mueller	2c2c73b23f	fixes and updates for ACS mode tree	2023-02-03 11:25:03 +01:00
Robin Mueller	b3a5c94f02	update events	2023-02-03 10:53:16 +01:00
Robin Mueller	ef0a78dedb	afmt	2023-02-03 10:52:39 +01:00
Robin Mueller	c2100cc782	overhead comment	2023-02-03 10:51:56 +01:00
Robin Mueller	4615b2fe16	bumpchangelog	2023-02-03 10:51:08 +01:00
Robin Mueller	daa7c6652d	update changelog	2023-02-03 10:21:17 +01:00
Robin Mueller	9f829f1c50	Merge remote-tracking branch 'origin/develop' into eggert/mtq-cmd-fixes	2023-02-03 10:16:17 +01:00
Robin Mueller	02f7b1ae4a	Merge branch 'acs_updates' into acs_update_scheduling	2023-02-03 10:15:12 +01:00
Robin Mueller	d9e142e1a8	Merge remote-tracking branch 'origin/develop' into acs_updates	2023-02-03 10:12:00 +01:00
Jakob Meier	305f8aa561	update transmitter countdown when parameter command is received	2023-02-03 10:07:53 +01:00
Robin Mueller	e6bafd51dc	prepare v1.23.1	2023-02-02 18:37:56 +01:00
Robin Mueller	5a54d4e1ed	afmt	2023-02-02 18:22:28 +01:00
Robin Mueller	7226f02d4b	bump tmtc and fsfw	2023-02-02 18:22:07 +01:00
Robin Mueller	1e0d9561a2	changelog update	2023-02-02 17:16:15 +01:00
Robin Mueller	12d5422e7f	Merge branch 'acs_updates' into acs_update_scheduling	2023-02-02 17:15:04 +01:00
Robin Mueller	aaac3b24b2	update changelog	2023-02-02 17:14:48 +01:00
Robin Mueller	a5997c773f	host compiles	2023-02-02 17:13:19 +01:00
Robin Mueller	4590e1d9c9	host compiles	2023-02-02 17:12:22 +01:00
Robin Mueller	f6abe2b466	remove code	2023-02-02 17:09:59 +01:00
Robin Mueller	c2fb224fea	ACS Update scheduling	2023-02-02 17:06:26 +01:00
Robin Mueller	2b00d3a565	ACS updates ... - Adapt ACS subsystem to handle events from ACS CTRL - Some fixes and updates for ACS subsystem	2023-02-02 16:27:50 +01:00
Jakob Meier	3a69bc705a	tmtc update	2023-02-02 16:02:09 +01:00
Jakob Meier	c0f936b757	add parameter command to change the transmitter timeout	2023-02-02 16:00:53 +01:00
Jakob Meier	1ad30f33a5	Merge branch 'develop' into meier/com-ss	2023-02-02 15:33:51 +01:00
Jakob Meier	fc1dedeb7a	moved transmitter timer and event handling of carrier and bitlock to ComSubsystem	2023-02-02 15:33:04 +01:00
meggert	b8baca92e2	Merge branch 'develop' into eggert/mgm-calibration-fix	2023-02-02 11:18:55 +01:00
meggert	43deed9dc0	Merge branch 'develop' into eggert/acs	2023-02-02 10:59:12 +01:00
meggert	8c03b2ec95	bump changelog	2023-02-02 10:56:14 +01:00