7427 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Robin Mueller	e19ddcfbd8	EM ACS board	2023-07-02 14:02:37 +02:00
Robin Müller	add079a7c6	Merge pull request 'Updates for new firmware' (#721) from complete-fw-tests into main-v6 ... Reviewed-on: #721	2023-07-01 13:30:26 +02:00
Robin Mueller	9cdcd47b1a	Merge remote-tracking branch 'origin/main-v6' into complete-fw-tests	2023-06-30 10:45:16 +02:00
Robin Mueller	d14e256901	STR tests	2023-06-29 16:40:21 +02:00
Robin Müller	dd5270e974	Merge pull request 'Important bugfix for live channel' (#720) from live-channel-bugfix into main-v6 ... Reviewed-on: #720	2023-06-29 16:39:09 +02:00
Robin Mueller	56ea9af615	add documentation of initial delay	2023-06-29 15:06:25 +02:00
Robin Mueller	4fc999e102	changelog	2023-06-29 15:03:45 +02:00
Robin Mueller	04d24e74b1	q7s-package version specification	2023-06-29 15:01:54 +02:00
Robin Mueller	8137c9ea25	Merge remote-tracking branch 'origin/main-v6' into complete-fw-tests	2023-06-29 15:00:49 +02:00
Robin Mueller	723b4bba3f	Merge remote-tracking branch 'origin/main-v6' into live-channel-bugfix	2023-06-29 15:00:20 +02:00
Robin Mueller	8cff2fd6f7	Merge remote-tracking branch 'origin/main' into live-channel-bugfix	2023-06-29 15:00:11 +02:00
Robin Mueller	a1f7f77e01	Merge remote-tracking branch 'origin/main' into main-v6	2023-06-29 14:59:18 +02:00
Robin Müller	f3aab775f3	Merge pull request 'Core controller bugfix' (#719) from core-ctrl-init-bugfix into main ... Reviewed-on: #719 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-06-29 14:58:28 +02:00
Robin Mueller	59d542ab39	Merge remote-tracking branch 'origin/main' into core-ctrl-init-bugfix	2023-06-29 14:58:13 +02:00
Robin Müller	7b0285c4ce	Merge pull request 'Only reset PTME on rate change' (#716) from only-reset-ptme-on-rate-change into main ... Reviewed-on: #716 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-06-29 14:56:35 +02:00
Robin Mueller	0a77ee0508	Merge remote-tracking branch 'origin/main' into only-reset-ptme-on-rate-change	2023-06-29 14:51:15 +02:00
Robin Mueller	51cbe46cf5	why indeed	2023-06-29 14:49:57 +02:00
Robin Müller	26fc4b8add	Merge pull request 'small fix for persistent TM store' (#722) from persistent-tm-stores-fixes into main ... Reviewed-on: #722 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-06-29 14:46:50 +02:00
Robin Mueller	825de04f3b	changelog	2023-06-29 10:15:36 +02:00
Robin Mueller	33985937b7	typo	2023-06-29 09:44:09 +02:00
Robin Müller	ba36b5f091	Merge branch 'main-v6' into live-channel-bugfix	2023-06-29 08:55:09 +02:00
Robin Mueller	4f5903227e	changelog	2023-06-29 08:54:58 +02:00
Robin Mueller	2173d89047	changelog	2023-06-29 08:54:34 +02:00
Robin Mueller	0a12dbf2be	changelog	2023-06-29 08:53:08 +02:00
Robin Mueller	ad3c0e2a0e	small fix for persistent TM store	2023-06-29 01:28:40 +02:00