7309 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Müller	70c4f8f3fd	Merge pull request 'v6.1.0' (#740) from prep_v6.1.0 into main ... Reviewed-on: #740	2023-07-13 13:07:07 +02:00
Robin Mueller	1f44533b3e	bump minor version	2023-07-13 12:00:57 +02:00
Marius Eggert	546053f95a	Merge pull request 'STR tests' (#739) from startracker-tests into main ... Reviewed-on: #739 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-07-13 09:33:03 +02:00
Robin Mueller	86f7d05526	changelog	2023-07-12 17:03:17 +02:00
Robin Mueller	8cc5220dd0	remove printout	2023-07-12 17:02:52 +02:00
Robin Mueller	a800ad6c9a	Merge remote-tracking branch 'origin/main' into startracker-tests	2023-07-12 16:58:49 +02:00
Robin Müller	887bfc87c3	Merge pull request 'use correct clock API in TCS CTRL' (#738) from small-tcs-fix into main ... Reviewed-on: #738 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-07-12 10:29:47 +02:00
Robin Mueller	54309b512f	use correct clock API	2023-07-11 17:29:27 +02:00
Robin Müller	74859dd5c6	Merge pull request 'TCS Observability' (#733) from tcs-observability into main ... Reviewed-on: #733 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-07-11 16:47:58 +02:00
Robin Mueller	13e965948c	TCS observability	2023-07-11 13:52:41 +02:00
Robin Mueller	46bb602c96	bump tmtc	2023-07-11 11:01:32 +02:00
Robin Mueller	72dbc34936	Merge remote-tracking branch 'origin/main' into tcs-observability	2023-07-11 11:00:03 +02:00
Robin Müller	55affe5a42	Merge pull request 'TCS heater upper burn limit' (#732) from tcs-heater-upper-limit into main ... Reviewed-on: #732 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-07-11 10:56:42 +02:00
Robin Müller	914a22f642	Merge branch 'main' into tcs-heater-upper-limit	2023-07-11 10:46:02 +02:00
Robin Mueller	ed7d75a777	thermal controller	2023-07-11 10:44:46 +02:00
Robin Müller	9443d3844a	Merge pull request 'fsfw bump and changelog' (#737) from bump-fsfw into main ... Reviewed-on: #737 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-07-11 10:38:59 +02:00
Robin Mueller	8800b20409	Merge remote-tracking branch 'origin/main' into tcs-heater-upper-limit	2023-07-11 09:45:01 +02:00
Robin Mueller	690f8cb49a	Merge remote-tracking branch 'origin/main' into bump-fsfw	2023-07-11 09:41:44 +02:00
Robin Müller	dbc3868f47	Merge pull request 'minor tweaks for XADC code' (#736) from minor-xadc-tweak into main ... Reviewed-on: #736 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-07-11 09:40:05 +02:00
Robin Mueller	852f1203c6	changelog	2023-07-11 09:39:21 +02:00
Robin Müller	643f8c5b54	Merge branch 'main' into minor-xadc-tweak	2023-07-11 09:38:14 +02:00
Robin Müller	3fb083fd87	Merge pull request 'TCS improvements' (#735) from tcs-tweaks into main ... Reviewed-on: #735 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-07-11 09:37:57 +02:00
Robin Mueller	fdf1c7a611	seems to work now	2023-07-10 18:29:55 +02:00
Robin Mueller	cf582dd6a4	Merge branch 'bump-fsfw' into tcs-observability	2023-07-10 17:52:56 +02:00
Robin Mueller	c7f716c433	fsfw bump and changelog	2023-07-10 17:51:37 +02:00
Robin Mueller	d2dfc22373	Merge branch 'tcs-heater-upper-limit' into tcs-observability	2023-07-10 16:33:42 +02:00
Robin Mueller	53d53e8771	disable test case	2023-07-10 16:33:29 +02:00
Robin Mueller	84e37d8b7b	bump tmtc	2023-07-10 16:30:18 +02:00
Robin Mueller	7c4f98ec22	add back with other name and comment	2023-07-10 15:23:04 +02:00
Robin Mueller	a61d7901bf	Merge branch 'tcs-heater-upper-limit' into tcs-observability	2023-07-10 14:58:16 +02:00
Robin Mueller	7e01a9602e	TCS improvements	2023-07-10 14:46:35 +02:00
Robin Mueller	be1d1cf5bf	minor tweaks for XADC code	2023-07-10 14:15:56 +02:00
Robin Mueller	ce2755e161	that should be it	2023-07-10 13:56:30 +02:00
Robin Mueller	33de08eafc	this should be better	2023-07-10 13:28:36 +02:00
Robin Mueller	106d73238b	Merge remote-tracking branch 'origin/main' into tcs-heater-upper-limit	2023-07-10 13:07:26 +02:00
Robin Müller	3f4a34d616	Merge pull request 'Make OBSW compatible to prospective FW v5.0.0' (#734) from tmp-devs-to-q7-i2c into main ... Reviewed-on: #734	2023-07-10 11:19:35 +02:00
Robin Mueller	268f10ced5	COMPILE	2023-07-10 11:14:19 +02:00
Robin Mueller	647f3d00bb	this should do the job	2023-07-10 11:03:17 +02:00
Robin Mueller	2210ec3737	Merge branch 'tcs-heater-upper-limit' into tcs-observability	2023-07-07 16:21:42 +02:00
Robin Mueller	df3755d6cc	done	2023-07-07 16:18:16 +02:00
Robin Mueller	a351dcf99e	changelog	2023-07-07 15:59:15 +02:00
Robin Mueller	06fe113d7f	that should be sufficient	2023-07-07 15:33:48 +02:00
Robin Mueller	43d86c9aad	resolve merge conflicts properly	2023-07-07 12:24:48 +02:00
Robin Mueller	c0ae25a973	Merge branch 'tcs-heater-upper-limit' into tcs-observability	2023-07-07 12:23:00 +02:00
Robin Mueller	fa85cc4d78	pls compile	2023-07-07 12:22:37 +02:00
Robin Mueller	f7c49adea5	Merge branch 'tcs-heater-upper-limit' into tcs-observability	2023-07-07 12:06:51 +02:00
Robin Mueller	b662e220e1	bump tmtc	2023-07-07 12:06:39 +02:00
Robin Mueller	7337595d47	add event	2023-07-07 12:05:29 +02:00
Robin Mueller	f2f73b088d	add event	2023-07-07 12:03:34 +02:00
Robin Mueller	fce16cc695	Merge branch 'tcs-heater-upper-limit' into tcs-observability	2023-07-07 11:58:24 +02:00