1853 Commits

Author	SHA1	Message	Date
Robin Mueller	4431883b4d	okay, PAPB IF caches packet now	2023-10-13 15:10:52 +02:00
Robin Mueller	5bc468f13f	Merge branch 'refactor-fix-ptme' into cfdp-source-handler	2023-10-13 09:45:21 +02:00
Robin Mueller	8dbc5cad48	more bugfixes	2023-10-13 09:39:50 +02:00
Robin Mueller	99192606a2	bugfixes for PAPB IF	2023-10-13 09:27:24 +02:00
Robin Mueller	ffe1281eb9	fix PTME	2023-10-13 09:20:51 +02:00
Robin Mueller	7b6d1c99ff	Merge remote-tracking branch 'origin/main' into cfdp-source-handler	2023-10-11 12:59:27 +02:00
Robin Mueller	c3cdcaf9f4	bump tmtc and gens	2023-10-11 10:58:25 +02:00
Robin Mueller	9a80af9b95	update tmtc	2023-10-10 13:51:41 +02:00
meggert	2c30efa821	aaand we revert	2023-10-10 11:54:32 +02:00
meggert	b635e02f2d	gens	2023-10-10 10:07:01 +02:00
meggert	000077f327	corrected logic	2023-10-10 10:06:32 +02:00
meggert	e9ad8d956a	i need a vacation ...	2023-10-09 09:33:37 +02:00
Robin Mueller	5e7f0e729b	merge main	2023-10-04 09:53:04 +02:00
meggert	59bc783045	ploc supervisor mode change soc check	2023-09-29 15:37:47 +02:00
meggert	cbfcee0b1c	ploc mpsoc mode change soc check	2023-09-29 15:33:09 +02:00
meggert	49102463f5	ran generators	2023-09-29 09:49:52 +02:00
meggert	173ee62d39	connect pwr ctrl to eps	2023-09-28 12:00:04 +02:00
meggert	8275c10b69	Merge branch 'main' into soc-calculator	2023-09-27 11:35:13 +02:00
Robin Mueller	4ba3e394f9	increase boot time slightly	2023-09-25 18:07:54 +02:00
Robin Mueller	50809e35a9	some nullptr checks	2023-09-25 18:07:28 +02:00
Robin Mueller	b3233abde9	update tmtc and gen files	2023-09-25 17:50:13 +02:00
Robin Mueller	08dbab9daa	another missing small tweak	2023-09-25 17:48:30 +02:00
Robin Mueller	624d454464	delete wait cycles member	2023-09-25 17:43:54 +02:00
Robin Mueller	ff7e475391	this appears to be the boot time	2023-09-25 17:21:28 +02:00
Robin Mueller	75f08175f6	more debugging necessary here	2023-09-25 17:10:13 +02:00
Robin Mueller	a2246f9d3d	this is odd	2023-09-25 16:44:10 +02:00
Robin Mueller	0d0a98220a	improve MPSoC boot and shutdown process	2023-09-25 16:36:35 +02:00
Robin Mueller	35fd2c72d8	slightly better printout	2023-09-25 15:17:09 +02:00
meggert	654d9b1536	Merge branch 'main' into soc-calculator	2023-09-20 09:19:53 +02:00
Robin Mueller	ca4e90ad97	important fix	2023-09-13 18:13:16 +02:00
meggert	2195beb045	Merge branch 'main' into soc-calculator	2023-09-13 13:07:43 +02:00
Robin Mueller	a697368297	remove diagnostic printouts	2023-09-12 13:18:49 +02:00
Robin Mueller	cdf63f0d42	PDEC DTB update	2023-09-12 12:54:24 +02:00
Robin Mueller	ba158e3826	Merge remote-tracking branch 'origin/main' into cfdp-source-handler	2023-09-12 10:52:25 +02:00
Robin Mueller	fc23438e5d	update gen files	2023-09-12 10:07:00 +02:00
Robin Müller	aa4bf5f293	Merge branch 'main' into relax-sus-fdir	2023-09-11 16:11:01 +02:00
Robin Mueller	55dcb3595b	this might fix the device	2023-09-07 16:28:55 +02:00
Robin Mueller	35f287ff23	Merge remote-tracking branch 'origin/main' into cfdp-source-handler	2023-09-07 16:13:46 +02:00
Robin Mueller	58961efb3f	that should get the job done	2023-09-07 16:03:36 +02:00
Robin Mueller	f9f6ac27e8	Merge remote-tracking branch 'origin/main' into relax-sus-fdir	2023-09-07 15:41:59 +02:00
Robin Mueller	b7558e9542	update retvals	2023-09-04 11:20:21 +02:00
Robin Mueller	6f2eaee50a	trigger a useful event	2023-08-31 15:10:43 +02:00
meggert	6048ffe656	prep	2023-08-21 16:01:56 +02:00
Jakob Meier	ddbf4a5ff0	run auto formatter	2023-08-19 06:37:39 +02:00
Jakob Meier	6febf6242a	pdec config corrupted event, readback config used as parameters	2023-08-19 06:33:31 +02:00
Robin Mueller	d1a446d445	hopefully dont need this const	2023-08-15 14:43:23 +02:00
Robin Mueller	963ca0c939	PLOC SUPV	2023-08-15 14:34:10 +02:00
Robin Mueller	af5f51928b	PLOC SUPV periodic HK	2023-08-15 13:49:06 +02:00
Robin Mueller	e4545d0515	new event, bump tmtc	2023-08-15 13:29:46 +02:00
Robin Mueller	424f3c5247	changelog and re-run generators	2023-08-14 15:09:45 +02:00
Robin Mueller	e2b54ddb8e	Merge remote-tracking branch 'origin/main' into meier/pdec-config-readback	2023-08-14 15:06:58 +02:00
Robin Mueller	567d68107d	auto-formatting	2023-08-14 15:06:22 +02:00
Robin Müller	2af1b6b698	Merge branch 'main' into more-gps-tm	2023-08-14 10:40:07 +02:00
Jakob Meier	d28ec2c31a	config word functions pass value now by reference and return returnvalue	2023-08-11 16:15:56 +02:00
meggert	185d86245b	HOW CAN ANYONE WORK WITH THIS SHITTY SPAM	2023-08-09 11:29:52 +02:00
meggert	04dde604db	Merge branch 'main' into more-gps-tm	2023-08-08 09:32:55 +02:00
Jakob Meier	c3bca9bb54	added event which is triggered when config of pdec is corrupted	2023-08-07 17:08:33 +02:00
meggert	27cf93e6ab	lets actually downlink both datasets	2023-08-04 15:54:03 +02:00
meggert	d91a71fb51	remove debug output	2023-08-04 12:22:47 +02:00
meggert	0c25b37c7b	gps satellites signals to dataset	2023-08-04 10:50:19 +02:00
meggert	348b720885	well this was easy	2023-08-03 20:56:46 +02:00
Robin Mueller	05fbff2e6d	Merge remote-tracking branch 'origin/main' into relax-sus-fdir	2023-08-03 13:37:36 +02:00
Robin Mueller	8441c49fe6	big gps victory	2023-08-02 16:00:27 +02:00
Robin Mueller	ff6cb2a2e3	Merge remote-tracking branch 'origin/main' into gps-changes	2023-08-02 15:32:01 +02:00
meggert	388dc0a813	gps event spam fix?	2023-08-02 13:40:51 +02:00
Robin Mueller	beb79d2fb4	that should do the job	2023-08-02 09:41:54 +02:00
meggert	2caf81640c	Merge branch 'main' into soc-calculator	2023-07-28 11:37:14 +02:00
Robin Mueller	6ef05767c5	events and tmtc	2023-07-26 12:57:39 +02:00
meggert	56fb2c0e1e	Merge branch 'main' into soc-calculator	2023-07-26 09:57:13 +02:00
Robin Mueller	7bedb1d307	even more useful events	2023-07-21 11:15:35 +02:00
Robin Mueller	8251f28cda	re-run generators	2023-07-21 10:26:57 +02:00
Robin Mueller	93ea8519b0	works	2023-07-13 21:19:30 +02:00
Robin Mueller	9a451e3d5f	COM error event	2023-07-13 21:09:27 +02:00
Robin Mueller	0cefef8a35	rough but possible fix..	2023-07-13 16:38:20 +02:00
Robin Mueller	16f26d7758	afmt	2023-07-13 14:52:32 +02:00
Robin Mueller	863c0af2a1	what the hell is wrong with the thing?	2023-07-13 10:53:58 +02:00
Robin Mueller	b662e220e1	bump tmtc	2023-07-07 12:06:39 +02:00
Robin Mueller	785c1c65a0	add new events	2023-07-06 19:01:49 +02:00
Robin Mueller	8137c9ea25	Merge remote-tracking branch 'origin/main-v6' into complete-fw-tests	2023-06-29 15:00:49 +02:00
Robin Mueller	a1f7f77e01	Merge remote-tracking branch 'origin/main' into main-v6	2023-06-29 14:59:18 +02:00
Robin Mueller	51cbe46cf5	why indeed	2023-06-29 14:49:57 +02:00
Robin Mueller	03e772246f	less cycles..	2023-06-29 00:35:06 +02:00
Robin Mueller	25da131653	seems to work well	2023-06-29 00:33:58 +02:00
Robin Mueller	9dfdf38822	important bugfix for live channel	2023-06-28 17:20:10 +02:00
Robin Mueller	c881b36630	prevent warning	2023-06-28 15:28:27 +02:00
Robin Mueller	a380ff5ac9	Merge branch 'main-v6' into only-reset-ptme-on-rate-change-v6	2023-06-28 15:24:20 +02:00
Robin Mueller	b5cc430b5b	Merge remote-tracking branch 'origin/main' into only-reset-ptme-on-rate-change	2023-06-28 13:21:33 +02:00
Robin Mueller	6c39e7dd0c	and go back to newest version here	2023-06-26 17:08:39 +02:00
Robin Mueller	73498ac9af	prepare v5.0.0, revert firmware interfacing changes	2023-06-26 16:53:54 +02:00
Robin Mueller	1cc62238c2	only reset PTME on rate change init	2023-06-26 14:39:03 +02:00
Robin Mueller	2d4a3c0ee2	new FW info event	2023-06-21 19:01:44 +02:00
Robin Mueller	8062c5edad	removed old comment	2023-06-13 07:58:40 +02:00
Robin Mueller	b2b6e2e797	comment	2023-06-13 07:55:00 +02:00
Robin Mueller	5e79293d38	Merge remote-tracking branch 'origin/main' into relax-sus-fdir	2023-06-13 07:49:28 +02:00
Robin Mueller	196823b2e0	relax sus fdir	2023-06-13 07:48:32 +02:00
Robin Mueller	55d6edcd66	Merge remote-tracking branch 'origin/main' into v4.0.0-dev	2023-06-11 18:54:04 +02:00
meggert	ef40391c09	removed debug output	2023-06-10 15:34:45 +02:00
Robin Mueller	9e787a7e44	Merge branch 'v3.0.0-dev' into v4.0.0-dev	2023-06-09 18:10:38 +02:00
meggert	06c5344d8a	this might actually work	2023-06-07 15:14:03 +02:00
meggert	1dd38acee4	object factory stuff	2023-06-07 14:30:58 +02:00
meggert	4bcfb8f5a2	still doesnt work	2023-06-07 14:13:32 +02:00
Robin Mueller	a110bf32aa	another small fix	2023-06-07 11:46:23 +02:00
Robin Mueller	f4c9a4bda2	fix for indexing	2023-06-07 11:38:02 +02:00
meggert	809d25890e	init	2023-06-07 11:33:09 +02:00
meggert	6a2d5b8161	well this doesnt work	2023-06-06 16:02:11 +02:00
Robin Mueller	998110dea4	back to somethng simple	2023-05-31 16:10:52 +02:00
Robin Mueller	442b1c94a6	small fix	2023-05-31 15:02:11 +02:00
Robin Mueller	8113a71c79	PAPB VC simplification	2023-05-31 14:15:54 +02:00
Robin Mueller	ddcdc38310	try to get rid of the nanosleep	2023-05-30 19:22:23 +02:00
Robin Mueller	9c78362ac5	use read write permissions for uio	2023-05-27 17:00:41 +02:00
Robin Mueller	8efbdf8279	Merge branch 'v2.2.0-dev' into update-ptme-code-2	2023-05-23 18:30:00 +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	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
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	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	770697d5d0	forgot some git merge conflicts	2023-05-15 10:16:34 +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	edf792c4fe	8 wait cycles are also okay	2023-05-12 17:44:41 +02:00
Robin Mueller	a718d182fc	done	2023-05-12 17:39:15 +02:00
Robin Mueller	714e2d07e5	and were at DHB debugging again	2023-05-12 17:13:51 +02:00
Robin Mueller	4887dc9e6b	somethings still wrong	2023-05-12 16:58:56 +02:00
Robin Mueller	3dc096c42b	add back normal command	2023-05-12 16:29:15 +02:00
Robin Mueller	9887359e31	finally receiving the content report	2023-05-12 16:09:08 +02:00
Robin Mueller	1f9c9e2407	horrible	2023-05-12 15:52:47 +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	90d289f56e	works now	2023-05-12 13:23:17 +02:00
Robin Mueller	2b999e7fa7	requires some wait cycles	2023-05-12 12:37:25 +02:00
Robin Mueller	699fc9a861	some HK corrections	2023-05-12 12:14:37 +02:00
Robin Mueller	66c9a5eea3	some more fixes	2023-05-12 11:55:33 +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
Robin Mueller	ba060be0d6	some more minor improvements	2023-05-12 11:44:39 +02:00
Robin Mueller	1820dae3d4	horrible	2023-05-12 11:06:26 +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	cbf3315e16	Various fixes and improvements	2023-05-12 09:32:24 +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