6738 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	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 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 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	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	6bfb0d4fb0	changelog	2023-05-23 19:14:03 +02:00
Robin Mueller	7ac2271eab	buuuug	2023-05-23 19:12:35 +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
Marius Eggert	72b5c7d053	Merge pull request 'ze batteri wos add' (#641) from add_ze_betteri into v2.1.0-dev ... Reviewed-on: #641	2023-05-22 11:42:34 +02:00
Robin Mueller	d23082283d	changelog	2023-05-22 11:42:08 +02:00
Robin Mueller	cd514e8125	ze batteri wos add	2023-05-22 11:40:33 +02:00
Marius Eggert	fa4a40da6e	Merge pull request 'PLOC MPSoC read file, fix write file' (#633) from ploc_mpsoc_read_file_2 into v2.1.0-dev ... Reviewed-on: #633	2023-05-19 10:05:40 +02:00
Robin Mueller	a814746c53	Merge branch 'ploc_mpsoc_read_file_2' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into ploc_mpsoc_read_file_2	2023-05-19 09:41:51 +02:00
Robin Mueller	ed74367f01	changelog	2023-05-19 09:41:44 +02:00
Robin Müller	3f37c52f67	Merge branch 'v2.1.0-dev' into ploc_mpsoc_read_file_2	2023-05-17 19:01:05 +02:00
Robin Mueller	a0e305fe1f	changelog	2023-05-17 18:55:53 +02:00
Robin Mueller	d28bc3f74d	bugfix	2023-05-17 18:51:53 +02:00
Robin Mueller	b9afeb9c19	fix some regressions	2023-05-17 18:44:12 +02:00
Robin Mueller	7f115303ae	everything is working now	2023-05-17 18:33:48 +02:00
Robin Mueller	e03df2ebca	almost done	2023-05-17 17:33:14 +02:00
Robin Mueller	f9e8dc6e60	D'OH	2023-05-17 16:33:52 +02:00
Robin Mueller	0179c04472	that did not help	2023-05-17 12:59:29 +02:00
Robin Mueller	c3b6b0a7ee	pure chaos	2023-05-16 18:46:13 +02:00
Robin Mueller	90b7f069dc	it is getting annoying again	2023-05-16 18:41:04 +02:00
Robin Mueller	4ba9ebf58f	kenning west alder	2023-05-16 13:34:06 +02:00
Robin Mueller	468fa01650	bugfix	2023-05-16 11:08:33 +02:00
Robin Mueller	b39e448ab5	correction for flashfclose cmd	2023-05-16 08:19:30 +02:00
Marius Eggert	8ed3bdc95c	Merge pull request 'add ACU dummy when adding all dummies' (#640) from dummy-bugfix-host-build into v2.1.0-dev ... Reviewed-on: #640	2023-05-15 17:34:21 +02:00
Robin Mueller	04b9ed4504	add ACU dummy as well	2023-05-15 16:53:18 +02:00
Robin Mueller	ab6a0c3e4d	fix host build	2023-05-15 16:49:16 +02:00
Robin Mueller	78972cd173	remove some more printouts	2023-05-15 16:16:17 +02:00
Robin Mueller	c8ed7fe20e	new events and retvals	2023-05-15 15:21:22 +02:00
Robin Mueller	5ce0a60184	some more cleaning and refacoring	2023-05-15 15:19:12 +02:00
Robin Mueller	fabc6da562	changelog	2023-05-15 15:16:44 +02:00
Robin Mueller	17df79b0d6	this does not make sense	2023-05-15 15:15:58 +02:00
Robin Mueller	178a2183a2	clean up error handlng code	2023-05-15 14:40:14 +02:00
Robin Mueller	ae6b5b491b	that should get the job done	2023-05-15 13:27:24 +02:00
Robin Mueller	f099cd7688	seems to work fine	2023-05-15 13:25:53 +02:00
Robin Mueller	9fde16c912	disable missed deadline printing by default	2023-05-15 10:29:15 +02:00
Robin Mueller	770697d5d0	forgot some git merge conflicts	2023-05-15 10:16:34 +02:00