6831 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Robin Mueller	758f2b9d7a	add ACU HK sets	2023-05-24 11:15:58 +02:00
Robin Müller	46dd662145	Merge branch 'v2.1.0-dev' into imtq-enable-hk-sets	2023-05-24 11:05:40 +02:00
Robin Müller	8f4bba6fd1	Merge branch 'v2.1.0-dev' into oh-no-no-no-bug	2023-05-24 11:04:48 +02:00
Robin Müller	a38f5c78ae	Merge branch 'v2.1.0-dev' into tm-store-task-base-bugfix	2023-05-24 11:04:35 +02:00
Robin Müller	dc36513efa	Merge pull request 'always dump data into the VC' (#646) from always-dump-into-vc into v2.1.0-dev ... Reviewed-on: #646	2023-05-24 11:04:24 +02:00
Robin Mueller	ee0646caf1	enable IMTQ HK sets	2023-05-24 11:04:07 +02:00
Robin Müller	a831ec7bda	Merge branch 'v2.1.0-dev' into oh-no-no-no-bug	2023-05-24 09:30:10 +02:00
Robin Mueller	efa9c42345	Merge remote-tracking branch 'origin/v2.1.0-dev' into always-dump-into-vc	2023-05-24 09:27:26 +02:00
Marius Eggert	a0b1ac3d06	Merge pull request 'no dump cancel on TX OFF' (#647) from no-dump-cancel-on-tx-off into v2.1.0-dev ... Reviewed-on: #647	2023-05-24 09:10:01 +02:00
Marius Eggert	30bb2da570	Merge branch 'v2.1.0-dev' into no-dump-cancel-on-tx-off	2023-05-24 09:09:33 +02:00
Robin Mueller	c45f267e94	Merge remote-tracking branch 'origin/v2.1.0-dev' into oh-no-no-no-bug	2023-05-23 20:32:43 +02:00
Robin Mueller	13fdaf731c	Merge remote-tracking branch 'origin/v2.1.0-dev' into tm-store-task-base-bugfix	2023-05-23 20:31:45 +02:00
Robin Müller	d7a35d9818	Merge pull request 'ACS Parameter Fix' (#642) from acs-params-fix into v2.1.0-dev ... Reviewed-on: #642	2023-05-23 20:20:02 +02:00
Robin Mueller	6cf488d0a6	Merge branch 'always-dump-into-vc' into update-ptme-code-2	2023-05-23 20:19:06 +02:00
Robin Mueller	15139d6944	Merge branch 'no-dump-cancel-on-tx-off' into update-ptme-code-2	2023-05-23 20:18:37 +02:00
Robin Mueller	266abad3b3	no dump cancel on TX OFF	2023-05-23 20:15:36 +02:00
Robin Mueller	042b8fb3c3	changelog	2023-05-23 20:13:02 +02:00
Robin Mueller	303df55a12	always dump data into the VC	2023-05-23 20:10:52 +02:00
Robin Mueller	50327fb614	get rid of the printouts and of the delay	2023-05-23 19:44:06 +02:00
Robin Mueller	7bd2fce86f	Merge branch 'tm-store-task-base-bugfix' into update-ptme-code-2	2023-05-23 19:40:17 +02:00
Robin Mueller	28beb006b2	thats an annoying bug	2023-05-23 19:37:01 +02:00
Robin Mueller	7222475985	changelog, remove unnecessary logic	2023-05-23 19:18:42 +02:00
Robin Mueller	f5a7fd2ffe	Merge branch 'oh-no-no-no-bug' into update-ptme-code-2	2023-05-23 19:16:36 +02:00
Robin Mueller	6bfb0d4fb0	changelog	2023-05-23 19:14:03 +02:00
Robin Mueller	7ac2271eab	buuuug	2023-05-23 19:12:35 +02:00
Robin Mueller	8efbdf8279	Merge branch 'v2.2.0-dev' into update-ptme-code-2	2023-05-23 18:30:00 +02:00
meggert	04571bbd7a	Merge branch 'v2.1.0-dev' into acs-params-fix	2023-05-23 15:08:56 +02:00
meggert	32a4aa48d9	frmt	2023-05-23 15:07:23 +02:00
meggert	62ae7ff482	frmt	2023-05-23 15:04:43 +02:00
meggert	5390e947ca	changelog	2023-05-23 15:02:35 +02:00
meggert	9ff154cedc	added missing parameter	2023-05-23 14:56:04 +02:00
Robin Mueller	4763ec84fa	Merge remote-tracking branch 'origin/v2.1.0-dev' into v2.2.0-dev	2023-05-23 14:46:44 +02:00
Robin Mueller	e4fc6e3d2a	Merge branch 'v2.2.0-dev' into update-ptme-code-2	2023-05-22 11:46:48 +02:00