7370 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Robin Mueller	ff7d0b3989	compile fixes	2023-07-07 11:57:00 +02:00
Robin Mueller	6bf9fd5969	changelog	2023-07-07 11:51:11 +02:00
Robin Mueller	a7ab26d804	Merge branch 'tcs-heater-upper-limit' into tcs-observability	2023-07-07 11:50:32 +02:00
Robin Mueller	977e9f366f	Merge remote-tracking branch 'origin/main' into tcs-heater-upper-limit	2023-07-07 11:47:58 +02:00
Robin Müller	b3d2fdc277	Merge pull request 'Another TCS fix' (#731) from another-tcs-fix into main ... Reviewed-on: #731 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-07-07 11:47:27 +02:00
Robin Mueller	7388c4f661	Merge remote-tracking branch 'origin/main' into tcs-heater-upper-limit	2023-07-07 11:47:05 +02:00
Robin Mueller	a6461fcaf8	Merge remote-tracking branch 'origin/main' into another-tcs-fix	2023-07-07 11:45:22 +02:00
Robin Müller	6ae0fdf191	Merge pull request 'TCS CTRL bugfix' (#730) from tcs-ctrl-bugfix into main ... Reviewed-on: #730 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-07-07 11:44:38 +02:00
Robin Müller	3087049726	Merge branch 'main' into tcs-ctrl-bugfix	2023-07-07 11:44:27 +02:00
Robin Müller	8255869f2d	Merge pull request 'Some TCS tweaks' (#729) from some-more-tcs-tweaks into main ... Reviewed-on: #729 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-07-07 11:44:08 +02:00
Robin Mueller	603ddcef9c	Merge branch 'tcs-heater-upper-limit' into tcs-observability	2023-07-07 11:14:42 +02:00
Robin Mueller	0b673fcdec	Merge remote-tracking branch 'origin/main' into tcs-heater-upper-limit	2023-07-07 11:07:35 +02:00
Robin Mueller	908cf8dcc3	Merge remote-tracking branch 'origin/main' into another-tcs-fix	2023-07-07 11:03:20 +02:00
Robin Mueller	ec39dc05ae	Merge remote-tracking branch 'origin/main' into tcs-ctrl-bugfix	2023-07-07 11:02:43 +02:00
Robin Mueller	bd33a51bf1	Merge remote-tracking branch 'origin/main' into some-more-tcs-tweaks	2023-07-07 11:00:45 +02:00
Robin Müller	06a24da2b9	Merge pull request 'Add TCS CTRL heater events' (#728) from add-tcs-ctrl-heater-events into main ... Reviewed-on: #728 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-07-07 10:59:36 +02:00
Robin Mueller	2bad2a142b	changelog	2023-07-07 10:58:42 +02:00
Robin Müller	b0b43b3ecc	Merge branch 'main' into some-more-tcs-tweaks	2023-07-07 10:56:50 +02:00
Robin Mueller	c1a23e0d73	Merge remote-tracking branch 'origin/main' into add-tcs-ctrl-heater-events	2023-07-07 10:56:38 +02:00
Robin Mueller	377cc64d0f	bump tmtc	2023-07-07 10:55:39 +02:00
Robin Mueller	351c33e504	changelog	2023-07-07 10:55:13 +02:00
Robin Müller	a7a530cb59	Merge pull request 'More TMP1075 bugfixes' (#727) from more-tmp-bugfixes into main ... Reviewed-on: #727 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-07-07 10:53:07 +02:00
Robin Mueller	f1ca4b174f	comment	2023-07-06 23:07:54 +02:00
Robin Mueller	027955597f	done	2023-07-06 23:06:50 +02:00
Robin Mueller	c558a117b0	some docs	2023-07-06 22:21:00 +02:00
Robin Mueller	fc697732b4	Merge branch 'another-tcs-fix' into tcs-heater-upper-limit	2023-07-06 22:07:06 +02:00
Robin Mueller	ce19f30325	continue max heater duration	2023-07-06 22:06:54 +02:00
Robin Mueller	faffca0c2c	compile fix	2023-07-06 20:19:05 +02:00
Robin Mueller	7b611810df	there are actually 8 heaters	2023-07-06 20:13:33 +02:00
Robin Mueller	3e92d175d5	form fix	2023-07-06 20:01:57 +02:00
Robin Mueller	64ca329d5a	update changelog	2023-07-06 19:58:24 +02:00
Robin Mueller	12ff365433	TCS ctrl bugfix	2023-07-06 19:57:23 +02:00
Robin Müller	5ea3bfeb7b	Merge branch 'main' into some-more-tcs-tweaks	2023-07-06 19:12:01 +02:00
Robin Mueller	785c1c65a0	add new events	2023-07-06 19:01:49 +02:00
Robin Mueller	3c9eec7b3f	heater events for TCS ctrl	2023-07-06 18:58:57 +02:00
Robin Mueller	5630ae4962	changelog	2023-07-06 17:28:12 +02:00
Robin Mueller	61ea80f92c	remove some cruft	2023-07-06 17:26:09 +02:00
Robin Mueller	6182218813	this works but is kind of ugly	2023-07-06 17:23:55 +02:00
Robin Mueller	b7e4953126	the TCS subsystem does not work on the EM..	2023-07-06 16:00:39 +02:00
Robin Müller	ee4285075a	Merge pull request 'Swap PL and PS I2C' (#725) from swap-pl-ps-i2c into main ... Reviewed-on: #725 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-07-06 15:05:53 +02:00
Robin Mueller	bda2ba79bf	Merge remote-tracking branch 'origin/main' into swap-pl-ps-i2c ... make marius extremely happy	2023-07-06 14:34:12 +02:00