7249 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Mueller	647f3d00bb	this should do the job	2023-07-10 11:03:17 +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 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	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	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	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
Robin Müller	0c47513e98	Merge pull request 'set dataset invalid on OFF mode' (#726) from tmp-1075-set-sets-invalid into main ... Reviewed-on: #726 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-07-06 14:27:04 +02:00
Robin Mueller	f4f365b110	pool read guard	2023-07-06 13:56:43 +02:00
Robin Mueller	1d4b815452	this is better to read..	2023-07-06 12:04:36 +02:00
Robin Mueller	1e98fcbbd5	that really should not cause issues though..	2023-07-06 12:01:48 +02:00
Robin Mueller	52eba5cae6	small fix/tweaks	2023-07-05 17:20:42 +02:00
Robin Mueller	cd9cb48b04	set dataset invalid on OFF mode	2023-07-05 16:31:41 +02:00
Robin Mueller	5c430212e7	that should fix the host build	2023-07-03 17:32:35 +02:00
Robin Mueller	d8ab6abc49	FM should build again	2023-07-03 17:16:51 +02:00
Robin Mueller	d1b9608a14	that should do the job	2023-07-03 17:13:11 +02:00
Robin Mueller	25c7058da5	changelog	2023-07-03 16:56:36 +02:00
Robin Mueller	9ece676313	lets see if this works	2023-07-03 16:55:45 +02:00
Robin Mueller	697a3e8577	Merge remote-tracking branch 'origin/main' into swap-pl-ps-i2c	2023-07-03 16:34:04 +02:00
Robin Mueller	dea3077f29	changelog, prep v6.0.0	2023-07-02 14:44:15 +02:00
Robin Müller	d687715bcb	Merge pull request 'v6.0.0' (#724) from main-v6 into main ... Reviewed-on: #724	2023-07-02 14:43:24 +02:00
Robin Mueller	e2cd822e9c	Merge branch 'main' into main-v6	2023-07-02 14:30:50 +02:00
Robin Mueller	0e9035d6c1	changelog, prep v5.2.0	2023-07-02 14:21:35 +02:00
Robin Müller	c80eff4922	Merge pull request 'EM ACS board' (#723) from add-back-em-acs-brd into main ... Reviewed-on: #723	2023-07-02 14:19:54 +02:00
Robin Mueller	a5c9e1481b	changelog	2023-07-02 14:04:29 +02:00