813 Commits

Author	SHA1	Message	Date
Robin Mueller	caa2800a7a	Merge branch 'v3.0.0-dev' into v4.0.0-dev	2023-06-06 11:10:03 +02:00
meggert	58dee642a6	changelog	2023-06-05 16:06:36 +02:00
meggert	3be495fc30	Merge branch 'v3.0.0-dev' into gyr-confg-rework-2	2023-06-05 09:54:23 +02:00
meggert	73981006a2	changelog	2023-06-05 09:25:31 +02:00
meggert	6915f0e003	changelog	2023-06-02 17:45:08 +02:00
Robin Mueller	a85b0a4a76	changelog	2023-05-31 16:31:50 +02:00
Robin Mueller	9711bb6300	Merge branch 'v4.0.0-dev' into update-ptme-code-2	2023-05-31 11:50:59 +02:00
Robin Mueller	68e4d9be07	Merge branch 'v3.0.0-dev' into v4.0.0-dev	2023-05-31 11:50:11 +02:00
Robin Mueller	170cb4d99c	changelog	2023-05-31 10:45:40 +02:00
Robin Mueller	0aa617d440	switch info fix	2023-05-30 16:54:56 +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 Mueller	b135e2f6a1	changelog	2023-05-30 15:14:47 +02:00
Robin Mueller	f3cc406495	Merge branch 'v2.1.0-dev' into update-ptme-code-2	2023-05-27 17:03:58 +02:00
meggert	a7c6cd017d	changelog	2023-05-26 13:53:46 +02:00
meggert	a6787538f2	changelog	2023-05-25 11:21: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
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 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	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	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 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 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	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	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 Mueller	6cf488d0a6	Merge branch 'always-dump-into-vc' into update-ptme-code-2	2023-05-23 20:19:06 +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	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	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	04571bbd7a	Merge branch 'v2.1.0-dev' into acs-params-fix	2023-05-23 15:08:56 +02:00
meggert	5390e947ca	changelog	2023-05-23 15:02:35 +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
Robin Mueller	d23082283d	changelog	2023-05-22 11:42:08 +02:00
Robin Mueller	22dcf10207	Merge branch 'v2.1.0-dev' into update-ptme-code-2	2023-05-22 10:46:14 +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 Mueller	a0e305fe1f	changelog	2023-05-17 18:55:53 +02:00
Robin Mueller	fabc6da562	changelog	2023-05-15 15:16:44 +02:00
Robin Mueller	af77d083fa	Merge remote-tracking branch 'origin/v2.1.0-dev' into ploc_mpsoc_read_file_2	2023-05-15 10:15:16 +02:00
Robin Mueller	07d9ab0dd9	Merge branch 'ploc_mpsoc_update_2' into ploc_mpsoc_dir_content_report_2	2023-05-12 13:31:13 +02:00
Robin Mueller	a3b119fda6	update changelog	2023-05-12 13:26:15 +02:00
Robin Mueller	86241a0052	Merge remote-tracking branch 'origin/v2.1.0-dev' into ploc_mpsoc_update_2	2023-05-12 13:24:49 +02:00
Robin Mueller	9715612e46	changelog	2023-05-12 13:24:14 +02:00
Robin Mueller	af20a36634	Merge branch 'ploc_mpsoc_update_2' into ploc_mpsoc_dir_content_report_2	2023-05-12 11:48:43 +02:00
meggert	f71a363385	changelog	2023-05-12 11:08:41 +02:00
Robin Mueller	412aaf93bd	Merge branch 'ploc-code-improvenemts-2' into ploc_mpsoc_update_2	2023-05-12 09:37:13 +02:00
Robin Mueller	0156533385	changelog	2023-05-12 09:35:58 +02:00
Robin Mueller	7e6c25901b	Squashed commit of the following: ... commit c137df64ab Merge: a919b3d1 4179e8e1 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:38:52 2023 +0200 Merge remote-tracking branch 'origin/main' into update_ptme_code commit 4179e8e124 Merge: 26f5eff6 51f9d5e1 Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:35:54 2023 +0200 Merge pull request 'This bugfix might be super important' (#621) from possible_bugfix_dual_lane_assy into main Reviewed-on: #621 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de> Reviewed-by: Steffen Gaisser <gaisser@irs.uni-stuttgart.de> commit 51f9d5e1fe Merge: a17f57cb 26f5eff6 Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:35:10 2023 +0200 Merge branch 'main' into possible_bugfix_dual_lane_assy commit a17f57cbb5 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:34:45 2023 +0200 changelog commit 26f5eff6d5 Merge: 4074e084 8a0f13ba Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:32:03 2023 +0200 Merge pull request 'More System Modes' (#612) from more-system-modes into main Reviewed-on: #612 commit 8a0f13bafb Merge: 14baa356 4074e084 Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:31:51 2023 +0200 Merge branch 'main' into more-system-modes commit 14baa3563c Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:30:09 2023 +0200 hello commit 7045b6034a Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:18:47 2023 +0200 changelog commit 37b9615525 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:18:16 2023 +0200 changelog commit 4074e08480 Merge: 862a4f26 38686ac3 Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:12:46 2023 +0200 Merge pull request 'Adaption for EM: Add P60 dock without ACU' (#620) from adaption_em_p60_dock_without_acu into main Reviewed-on: #620 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de> commit 23796345d9 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:04:30 2023 +0200 changelog and stop payload tracking commit b10275ca43 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 14:28:05 2023 +0200 changelog commit 383849c5cb Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 14:25:14 2023 +0200 that is more robust commit c66cef9129 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 14:23:21 2023 +0200 changelog commit 02ea8a7298 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 14:22:21 2023 +0200 changelog commit 38686ac3f6 Merge: 189a3126 74d5d709 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 14:04:03 2023 +0200 Merge branch 'possible_bugfix_dual_lane_assy' into adaption_em_p60_dock_without_acu commit 74d5d70973 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 13:58:08 2023 +0200 this bugfix might be super important commit 48355e8263 Merge: 5691fe8e 862a4f26 Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 10:25:50 2023 +0200 Merge branch 'main' into more-system-modes commit 189a312628 Merge: a1279428 862a4f26 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 10:23:46 2023 +0200 Merge remote-tracking branch 'origin/main' into adaption_em_p60_dock_without_acu commit a12794281b Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 10:20:31 2023 +0200 changelog commit fcaabb4e42 Merge: 6c326489 4aafca64 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 10:20:02 2023 +0200 Merge remote-tracking branch 'origin/main' into adaption_em_p60_dock_without_acu commit 6c326489cb Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 10:18:46 2023 +0200 adapt EM SW: GS PCDU added, but use dummy for ACU commit 862a4f2685 Merge: 4aafca64 2daca272 Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 09:37:55 2023 +0200 Merge pull request 'Host SW bugfixes' (#618) from try_fix_host_obsw into main Reviewed-on: #618 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de> commit 5691fe8e72 Merge: 097be17a 4aafca64 Author: meggert <eggertm@irs.uni-stuttgart.de> Date: Thu Apr 27 15:40:31 2023 +0200 Merge branch 'main' into more-system-modes commit 2daca272f8 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Thu Apr 27 11:29:18 2023 +0200 changelog commit 03762f9620 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 17:38:06 2023 +0200 lower live TM handler frequency commit a296f16e5c Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 17:36:38 2023 +0200 host SW works properly again commit 83f07a6e16 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 17:26:32 2023 +0200 configurable event manager queue depth commit 00dab64628 Merge: 641b8e84 4aafca64 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 17:03:35 2023 +0200 Merge remote-tracking branch 'origin/main' into try_fix_host_obsw commit 4aafca64a6 Merge: f271242d 6901eae8 Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 17:03:01 2023 +0200 Merge pull request 'EM adaptions' (#619) from em_adaptions into main Reviewed-on: #619 commit 6901eae816 Merge: 7d630ebc f271242d Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 17:02:24 2023 +0200 Merge remote-tracking branch 'origin/main' into em_adaptions commit 7d630ebcf3 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 17:00:04 2023 +0200 EM adaptions commit 641b8e847d Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 16:41:40 2023 +0200 add back tm funnel handler for hosted build commit 1314268682 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 16:23:50 2023 +0200 host build requires dedicated live TM task.. commit 4040304ef0 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 13:15:42 2023 +0200 this is annoying commit a919b3d164 Merge: e22f2a53 9672d6d6 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 11:11:30 2023 +0200 Merge remote-tracking branch 'origin/develop' into update_ptme_code commit 9672d6d6cc Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 11:11:09 2023 +0200 changelog commit e22f2a53ea Merge: b076e80b 0eb6b7cc Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 11:05:58 2023 +0200 Merge remote-tracking branch 'origin/develop' into update_ptme_code commit b076e80b44 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 11:04:10 2023 +0200 changelog commit 269aa6f7b0 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 11:03:42 2023 +0200 changelog commit caae2b4ba9 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 11:02:24 2023 +0200 update PTME code commit 097be17a29 Author: meggert <eggertm@irs.uni-stuttgart.de> Date: Wed Apr 19 15:07:21 2023 +0200 added remaining acs modes as system modes	2023-05-12 09:13:02 +02:00
Robin Mueller	50d5180076	changelog	2023-05-11 21:29:15 +02:00
Robin Mueller	dbdcf0b0d6	changelog	2023-05-11 21:28:50 +02:00
Robin Mueller	4a3af32a65	MPSoC HK packet	2023-05-11 21:28:46 +02:00
Robin Mueller	9b5fac828b	changelog	2023-05-11 21:17:06 +02:00
Robin Mueller	07dd84ff1e	changelog	2023-05-11 20:25:26 +02:00
Robin Mueller	d5a6feb347	changelog	2023-05-11 20:25:26 +02:00
Robin Mueller	5728d916ef	changelog	2023-05-11 20:25:26 +02:00
Robin Mueller	e762cc5fb3	changelog	2023-05-11 20:25:26 +02:00
Robin Mueller	f72c797f53	this should do the job	2023-05-11 20:21:44 +02:00
Robin Mueller	71ef1edb68	changelog	2023-05-11 20:21:07 +02:00
Robin Mueller	fa13703394	changelog	2023-05-11 20:18:39 +02:00
Robin Mueller	09ece30304	changelog	2023-05-11 20:17:50 +02:00
Robin Mueller	c3604085c2	changelog	2023-05-11 20:17:50 +02:00
Robin Mueller	1274993428	changelog	2023-05-11 20:17:41 +02:00
Robin Mueller	a7ccfae04e	changelog	2023-05-11 20:17:41 +02:00
Robin Mueller	2c9da6a1e4	changelog	2023-05-11 20:14:17 +02:00
Robin Mueller	30fba0456b	MPSoC HK packet	2023-05-11 20:14:12 +02:00
Robin Mueller	32d2ad8f1d	changelog	2023-05-11 20:13:26 +02:00
Robin Mueller	b34767c870	changelog	2023-05-11 20:12:15 +02:00
Robin Mueller	97567736fb	changelog	2023-05-11 20:12:15 +02:00
Robin Mueller	621a6fd401	changelog	2023-05-11 20:12:13 +02:00
Robin Mueller	04b6c7006e	changelog	2023-05-11 20:12:13 +02:00
meggert	e78d458f06	changelog	2023-05-11 19:54:44 +02:00
Robin Mueller	ef039c47b8	update changelog again	2023-05-11 19:35:57 +02:00
Robin Mueller	d4b7411de1	I guess no patch version	2023-05-11 19:34:37 +02:00
Robin Mueller	2e6a93c479	ACS board and init payload	2023-05-11 19:33:06 +02:00
Robin Mueller	f3a651602b	this should be robust	2023-05-11 19:33:06 +02:00
Robin Mueller	6c00404ca7	changelog	2023-05-11 19:33:06 +02:00
Robin Mueller	1412dd4fb6	changelog readme etc.	2023-05-11 19:33:06 +02:00
Robin Mueller	1870bf6405	changelog	2023-05-11 19:33:02 +02:00
Robin Mueller	670c753a75	hello	2023-05-11 19:32:37 +02:00
Robin Mueller	26e48f2f46	changelog	2023-05-11 19:32:37 +02:00
Robin Mueller	a352f25029	changelog	2023-05-11 19:32:37 +02:00
Robin Mueller	141438bd24	changelog and stop payload tracking	2023-05-11 19:32:37 +02:00
Robin Mueller	1cbb7d0af8	changelog	2023-05-11 19:32:33 +02:00