7688 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Mueller	68e4d9be07	Merge branch 'v3.0.0-dev' into v4.0.0-dev	2023-05-31 11:50:11 +02:00
Robin Mueller	ec8e8533d6	bump version	2023-05-31 11:49:18 +02:00
Robin Mueller	170cb4d99c	changelog	2023-05-31 10:45:40 +02:00
Robin Mueller	f4523c8396	that should fix some issues	2023-05-31 10:39:56 +02:00
Robin Mueller	23625b2496	move 2 pool variables	2023-05-31 09:53:13 +02:00
Marius Eggert	df69515bd4	Merge pull request 'switch info fix' (#657) from tcs-switch-info-fix into v2.1.0-dev ... Reviewed-on: #657	2023-05-31 09:03:29 +02:00
Robin Mueller	ddcdc38310	try to get rid of the nanosleep	2023-05-30 19:22:23 +02:00
Robin Mueller	9921522ce0	working, remove some old unrequired code	2023-05-30 19:06:59 +02:00
Robin Mueller	0aa617d440	switch info fix	2023-05-30 16:54:56 +02:00
Robin Müller	1f4880ddec	Merge pull request 'small fix for mode event heater' (#656) from tcs-heater-event-fix into v2.1.0-dev ... Reviewed-on: #656	2023-05-30 16:47:20 +02:00
Robin Mueller	6aa856563e	Merge branch 'tcs-heater-event-fix' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into tcs-heater-event-fix	2023-05-30 16:45:36 +02:00
Robin Mueller	ebf5609680	changelog	2023-05-30 16:45:09 +02:00
Robin Müller	5abcb31e22	Merge branch 'v2.1.0-dev' into tcs-heater-event-fix	2023-05-30 16:39:39 +02:00
Marius Eggert	d400a71626	Merge pull request 'TCS: Prevent spam' (#655) from tcs-prevent-spam into v2.1.0-dev ... Reviewed-on: #655	2023-05-30 15:47:29 +02:00
Robin Mueller	7811a4cc6b	small fix for mode event heater	2023-05-30 15:17:11 +02:00
Robin Mueller	b135e2f6a1	changelog	2023-05-30 15:14:47 +02:00
Robin Mueller	c5640c9fca	prevent SPAM	2023-05-30 15:14:07 +02:00
Robin Müller	fe34f69abe	Merge pull request 'MTQ Scaling Bugfix' (#653) from mtq-cmd-bugfix into v2.1.0-dev ... Reviewed-on: #653	2023-05-30 09:25:24 +02:00
Robin Müller	899b19f34f	Merge branch 'v2.1.0-dev' into mtq-cmd-bugfix	2023-05-30 09:25:06 +02:00
Robin Müller	faeece7210	Merge pull request 'Remove Rad Sensor, fix image swichting' (#654) from remove-rad-sensor-again into v2.1.0-dev ... Reviewed-on: #654	2023-05-30 09:24:17 +02:00
Robin Mueller	ada77ed53b	ACS board still required	2023-05-30 09:22:59 +02:00
Robin Mueller	f3cc406495	Merge branch 'v2.1.0-dev' into update-ptme-code-2	2023-05-27 17:03:58 +02:00
Robin Mueller	71eca867ea	i think the rad sesnor messing everything up	2023-05-27 17:03:33 +02:00
Robin Mueller	9c78362ac5	use read write permissions for uio	2023-05-27 17:00:41 +02:00
meggert	a7c6cd017d	changelog	2023-05-26 13:53:46 +02:00
meggert	335394b863	fixed use of c abs which will truncate the value	2023-05-26 13:51:24 +02:00
meggert	de18ebfbe0	fixed error angle being calculated but not returned	2023-05-26 09:57:03 +02:00
Robin Müller	93cf6bab01	Merge pull request 'Heater Mode Fix' (#652) from heater-mode-fix into v2.1.0-dev ... Reviewed-on: #652	2023-05-26 09:47:35 +02:00
meggert	5afe22bc92	heater mode fix	2023-05-25 15:48:28 +02:00
Robin Müller	2ff1c0d9d5	Merge pull request 'Added switcher for MGT dummy' (#651) from mgt-dummy-switcher-fix into v2.1.0-dev ... Reviewed-on: #651	2023-05-25 11:23:56 +02:00
meggert	a6787538f2	changelog	2023-05-25 11:21:28 +02:00
meggert	db79e34d3b	added switcher for IMTQ dummy	2023-05-25 11:20:28 +02:00
Robin Mueller	016e9dd2df	Merge branch 'v2.2.0-dev' into update-ptme-code-2	2023-05-25 10:34:04 +02:00
Marius Eggert	d22f948af4	Merge pull request 'Tweak for TM stores' (#650) from another-tweak-for-tm-stores into v2.1.0-dev ... Reviewed-on: #650	2023-05-25 10:21:19 +02:00
Robin Mueller	351ca1154b	Merge branch 'v2.1.0-dev' into v2.2.0-dev	2023-05-25 09:10:34 +02:00
Robin Mueller	e1aff4c641	another small logic fix	2023-05-25 08:48:03 +02:00
Robin Mueller	8d041c6753	changelog	2023-05-25 08:45:20 +02:00
Robin Mueller	276501c504	another tweak for TM stores	2023-05-25 08:43:52 +02:00
Robin Müller	65223ad3c7	Merge pull request 'ACU dummy enable HK sets' (#649) from acu-enable-hk-sets into v2.1.0-dev ... Reviewed-on: #649	2023-05-24 14:15:38 +02:00
Robin Müller	075c750e4a	Merge branch 'v2.1.0-dev' into acu-enable-hk-sets	2023-05-24 14:14:07 +02:00
Robin Müller	04f5011e0f	Merge pull request 'IMTQ Dummy HK sets' (#648) from imtq-enable-hk-sets into v2.1.0-dev ... Reviewed-on: #648	2023-05-24 14:13:46 +02:00
Robin Müller	832140935f	Merge branch 'v2.1.0-dev' into imtq-enable-hk-sets	2023-05-24 14:13:29 +02:00
Robin Mueller	86bc6c4e0e	Merge branch 'imtq-enable-hk-sets' into acu-enable-hk-sets	2023-05-24 11:53:34 +02:00
Robin Mueller	31e24e297f	fix host SW	2023-05-24 11:53:07 +02:00
Robin Müller	4dacca6df1	Merge pull request 'Another annoying TM store bug' (#645) from tm-store-task-base-bugfix into v2.1.0-dev ... Reviewed-on: #645	2023-05-24 11:34:29 +02:00
Robin Mueller	ce9d00a42a	Merge remote-tracking branch 'origin/v2.1.0-dev' into tm-store-task-base-bugfix	2023-05-24 11:34:39 +02:00
Robin Müller	6e4d4cea95	Merge pull request 'HK TM store bug' (#644) from oh-no-no-no-bug into v2.1.0-dev ... Reviewed-on: #644	2023-05-24 11:33:13 +02:00
Robin Mueller	3641dc3bfa	Merge branch 'imtq-enable-hk-sets' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into imtq-enable-hk-sets	2023-05-24 11:17:08 +02:00
Robin Mueller	b899bad0a8	IMTQ HK sets	2023-05-24 11:17:00 +02:00
Robin Mueller	9e0989915c	changelog	2023-05-24 11:16:35 +02:00