7335 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	631a1aec42	Merge branch 'v2.1.0-dev' into gyr-confg-rework-2	2023-05-23 15:42:30 +02:00
meggert	7eeece6934	Merge branch 'v2.1.0-dev' into acs-ptg-ctrl-fixes-2	2023-05-23 15:37:16 +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
Robin Mueller	2543cdf5b7	changelog	2023-05-22 11:44:42 +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
Robin Mueller	ea9f72b9c4	Merge branch 'v2.2.0-dev' into update-ptme-code-2	2023-05-22 10:48:47 +02:00
Robin Mueller	148a876fc9	Merge branch 'v2.1.0-dev' into v2.2.0-dev	2023-05-22 10:48:30 +02:00
Robin Mueller	9804898d05	Merge remote-tracking branch 'origin/v2.2.0-dev' into update-ptme-code-2	2023-05-22 10:48:22 +02:00
Marius Eggert	e04f349e77	Merge pull request 'CFDP Bugfix' (#639) from cfdp-bugfix into v2.2.0-dev ... Reviewed-on: #639	2023-05-22 10:47:29 +02:00
Robin Mueller	8cc4431e22	Merge branch 'v2.2.0-dev' into update-ptme-code-2	2023-05-22 10:46:25 +02:00
Robin Mueller	22dcf10207	Merge branch 'v2.1.0-dev' into update-ptme-code-2	2023-05-22 10:46:14 +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