637 Commits

Author	SHA1	Message	Date
Robin Mueller	8d4ee96c52	re-run generators	2023-01-18 14:34:35 +01:00
Robin Mueller	980009b1cb	re-run generators	2023-01-18 14:03:20 +01:00
Robin Mueller	25c59aa187	Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage	2023-01-11 09:18:15 +01:00
Jakob Meier	d51904de2d	disabled damaged PL PCDU1 TMP1075	2023-01-09 11:57:48 +01:00
Robin Mueller	578b4a4408	Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage	2022-12-12 09:02:11 +01:00
Robin Mueller	1d0a13a79d	update generated files	2022-12-01 17:08:03 +01:00
Robin Mueller	93b7bbc43e	Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage	2022-11-28 18:32:29 +01:00
Robin Mueller	5ba5e69273	re-run generators	2022-11-28 18:25:08 +01:00
Robin Mueller	666c7bc77f	Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage	2022-11-18 14:30:10 +01:00
Robin Mueller	4e3abb92f2	update events	2022-11-16 15:25:29 +01:00
Robin Mueller	42c52295f7	re-run generators	2022-11-15 17:44:47 +01:00
Robin Mueller	2f0f837534	Merge remote-tracking branch 'origin/develop' into mueller/tas_ploc_supv_update	2022-11-15 13:42:22 +01:00
Robin Mueller	89af06a310	update object list	2022-11-14 17:10:41 +01:00
Robin Mueller	31f6a865d3	remove unused code	2022-11-14 09:19:34 +01:00
Robin Mueller	d51c088afd	there is only one tmp1075 left	2022-11-14 09:16:17 +01:00
Robin Mueller	a39ff34a0a	re-name enum	2022-11-14 09:13:20 +01:00
Robin Mueller	a855920fb2	README update, I2C addr update	2022-11-14 09:12:15 +01:00
Robin Mueller	ee6bb4df3b	add some informative comments	2022-11-11 18:56:34 +01:00
Robin Mueller	1a17770bbc	all TMP1075 dev except the OBC IF board one working	2022-11-11 18:52:12 +01:00
Robin Mueller	6261296a0a	there is an issue..	2022-11-11 17:01:19 +01:00
Robin Mueller	0815380044	create all available TMP devices	2022-11-11 16:24:44 +01:00
Robin Mueller	08c225a633	Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage	2022-11-11 11:26:57 +01:00
Robin Mueller	a07a55eac1	Merge remote-tracking branch 'origin/develop' into mueller/tas_ploc_supv_update	2022-11-10 18:14:53 +01:00
Robin Mueller	ceba3b9dca	renaming of fsfw_hal components	2022-11-10 18:07:59 +01:00
Robin Mueller	02df949a48	this seems to work	2022-11-10 17:42:19 +01:00
Robin Mueller	ec7ce5ddb6	ploc components now compile for hosted (linux)	2022-11-10 17:32:11 +01:00
Robin Mueller	07d93b6b67	schedule PL components differently	2022-11-10 14:08:44 +01:00
Robin Mueller	42f5f6e943	re-run generators, TCS ctrl adaption ... - Scoped TCS controller device temperature copy handling	2022-11-03 16:13:53 +01:00
Robin Mueller	890fba18e1	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-10-27 09:18:12 +02:00
Robin Mueller	cd1eb02f02	re-run generators	2022-10-27 09:03:39 +02:00
Robin Mueller	592cbf6fad	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-10-27 08:31:21 +02:00
Robin Mueller	e200e2d0df	remove boolean which does not exist anymore	2022-10-27 08:28:43 +02:00
Robin Mueller	00059251f0	further clean up em and general code	2022-10-26 15:47:23 +02:00
Robin Mueller	d5867f104f	continue tm store	2022-10-25 18:20:21 +02:00
Robin Mueller	9b8d2f3097	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-10-25 13:13:41 +02:00
Robin Müller	5204afb9bd	Merge pull request 'IMTQ Updates' (#306) from mueller/imtq-updates into develop ... Reviewed-on: #306 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2022-10-25 13:12:14 +02:00
Robin Mueller	c54f52eff6	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-10-21 15:45:46 +02:00
Robin Mueller	72d9775de0	re-run generators	2022-10-21 15:42:08 +02:00
Robin Mueller	dd7521cc4b	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-10-21 15:37:25 +02:00
Robin Mueller	83b8cf3198	Merge remote-tracking branch 'origin/develop' into mueller/imtq-updates	2022-10-21 15:33:47 +02:00
Robin Mueller	c0c83faf64	hosted compiles again	2022-10-21 12:01:07 +02:00
Robin Mueller	dc45c53e38	add new CFDP and PUS TM funnel	2022-10-21 11:51:44 +02:00
Robin Mueller	75a4cd1b69	awful solution but works	2022-10-20 16:09:18 +02:00
Robin Mueller	a8e03ab8fe	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-10-17 10:28:53 +02:00
Robin Mueller	3cff1c48e9	some more testing and bugfixes	2022-10-14 14:55:37 +02:00
Robin Mueller	69f34acbd2	rerun generator script	2022-10-14 11:55:21 +02:00
Robin Mueller	b6b258d82c	remove gpio pst	2022-10-12 13:21:58 +02:00
Robin Mueller	63d660119e	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-10-10 17:39:47 +02:00
Robin Mueller	c82c4cf9d1	Merge remote-tracking branch 'origin/develop' into scex-additions	2022-10-10 11:16:19 +02:00
Robin Mueller	20b7f8b46b	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-10-10 11:10:07 +02:00
Robin Mueller	454c2f0ad1	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-10-10 10:30:45 +02:00
Robin Mueller	fd1d53aa23	Merge remote-tracking branch 'origin/develop' into scex-additions	2022-10-10 10:18:29 +02:00
Robin Mueller	50d41215fa	Merge remote-tracking branch 'origin/develop' into mueller/em-sw-updates	2022-10-10 10:15:55 +02:00
Robin Mueller	3f12d3500e	re-generate csvs	2022-10-04 14:51:15 +02:00
Robin Mueller	b3f4eaa0f2	Merge remote-tracking branch 'origin/develop' into petri_dev	2022-09-29 14:09:33 +02:00
Robin Mueller	2ad93f7735	Merge remote-tracking branch 'origin/develop' into mueller/em-sw-updates	2022-09-29 14:09:02 +02:00
Robin Mueller	865ca46974	Merge remote-tracking branch 'origin/develop' into scex-additions	2022-09-29 14:08:22 +02:00
Robin Mueller	e161eeb537	re-run generators and bump dependencies	2022-09-29 14:06:46 +02:00
Robin Mueller	aa56c26e25	Merge remote-tracking branch 'origin/develop' into petri_dev	2022-09-29 13:45:42 +02:00
Robin Mueller	151d27985f	Merge remote-tracking branch 'origin/develop' into scex-additions	2022-09-29 13:43:58 +02:00
Robin Mueller	a152553d00	Merge remote-tracking branch 'origin/develop' into mueller/em-sw-updates	2022-09-29 13:32:10 +02:00
ikosmidou	aab2dc6367	Merge branch 'develop' into scex-additions	2022-09-27 19:14:40 +02:00
Robin Mueller	9b6636fe31	rerun generators	2022-09-27 09:33:34 +02:00
Robin Mueller	2f18347430	move object ID definition	2022-09-16 15:12:32 +02:00
Robin Mueller	68039d5d4a	clean up config code	2022-09-16 12:28:39 +02:00
Ulrich Mohr	f7196a4791	updated to new fsfw	2022-09-14 12:55:53 +02:00
Robin Mueller	839851914a	update SCEX code	2022-08-31 16:07:38 +02:00
Robin Mueller	aa0da618ca	Merge remote-tracking branch 'origin/develop' into irini	2022-08-29 15:49:23 +02:00
Robin Mueller	447c4d5c88	all retval replacements	2022-08-24 17:27:47 +02:00
Robin Mueller	bddaf120f4	Merge remote-tracking branch 'origin/develop' into irini	2022-08-24 16:54:39 +02:00
Robin Mueller	0d0f32b751	re-run generators	2022-08-24 16:46:13 +02:00
Robin Mueller	e09eaae42f	update events	2022-08-22 22:18:14 +02:00
Robin Mueller	b3bb029c47	something wrong with mem check	2022-08-22 12:41:08 +02:00
Robin Mueller	1f3365960d	re-run generators	2022-08-21 08:38:21 +02:00
Robin Mueller	d9321a83cf	retval translation still fails	2022-08-18 11:25:39 +02:00
Robin Mueller	19f75b598a	Merge remote-tracking branch 'origin/develop' into irini	2022-08-12 13:06:35 +02:00
Robin Mueller	05a10485d9	Merge remote-tracking branch 'origin/develop' into irini	2022-08-12 12:34:10 +02:00
Robin Mueller	a8b1fe2e8d	re-run generator scripts	2022-08-12 12:31:13 +02:00
Robin Mueller	6551cbe1b4	using correct retval translation files now	2022-08-09 10:38:47 +02:00
Robin Mueller	bd40af34c8	Merge branch 'develop' into irini	2022-08-08 17:10:57 +02:00
Robin Mueller	1280b77e95	re-run generators	2022-08-08 17:07:55 +02:00
Robin Mueller	035eda9cfd	update develop	2022-07-14 15:46:22 +02:00
Robin Mueller	57f97de58e	rerun generator scripts	2022-07-08 16:46:27 +02:00
Robin Mueller	563e13765d	Merge remote-tracking branch 'origin/develop' into irini	2022-07-08 16:27:50 +02:00
meierj	95da2372c9	run generators	2022-06-27 09:15:29 +02:00
Robin Mueller	53e556d0b3	improve csv format	2022-06-21 01:21:23 +02:00
Robin Mueller	c6b00e2448	update deps and gen files	2022-06-21 00:58:59 +02:00
Robin Mueller	d4a1cb9f62	fsfwgen update	2022-06-20 18:05:05 +02:00
Jakob Meier	89757c447c	run auto-formatter	2022-06-17 08:31:36 +02:00
Jakob Meier	bd11d13b99	dummy devices for hosted build, adaptions to run thermal controller unit test	2022-06-16 07:00:09 +02:00
Jakob Meier	eff80a58ee	improvements for hosted build	2022-06-13 08:58:06 +02:00
Jakob Meier	b8cf825307	rerun generators	2022-06-05 09:13:08 +02:00
Cleanroom Laptop L15	04b7c82501	type fixes in device temperatures sets	2022-06-01 18:46:22 +02:00
Robin Mueller	b306116eac	remove duplicate declarations	2022-05-26 12:09:36 +02:00
Robin Mueller	a1faa3a73c	Merge remote-tracking branch 'origin/develop' into irini	2022-05-26 12:08:07 +02:00
Cleanroom Laptop L15	09a6707c6c	run generator scripts	2022-05-25 18:42:40 +02:00
Robin Mueller	e5459bb1f7	re-run generators	2022-05-25 18:15:44 +02:00
Robin Mueller	3fff3ba21e	add and schedule PUS11	2022-05-24 15:21:37 +02:00
Jakob Meier	d808a12c31	fixed conflicts	2022-05-23 16:53:20 +02:00
Jakob Meier	fb5c6c4c17	continuation of failed mpsoc update	2022-05-23 12:05:42 +02:00
Robin Mueller	28a4f782f9	Merge remote-tracking branch 'origin/develop' into mueller/rtds-update	2022-05-17 17:55:25 +02:00
Robin Mueller	8a5090b8ee	apply new auto-formatter on all files	2022-05-17 13:40:19 +02:00
Robin Mueller	a26b1bb311	Merge remote-tracking branch 'origin/develop' into mueller/rtds-update	2022-05-16 15:17:29 +02:00
Robin Mueller	f20fcd9a72	Merge remote-tracking branch 'origin/develop' into mueller/rtds-update	2022-05-14 17:07:27 +02:00
Robin Mueller	478975db26	spi setup more stable now	2022-05-14 11:34:25 +02:00
Robin Mueller	1c9f411e75	new RTD handler working	2022-05-14 09:41:28 +02:00
Cleanroom Laptop L15	d60e7a706a	fixed conflicts	2022-05-13 18:44:52 +02:00
Robin Mueller	ac34bcbb3d	Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if	2022-05-12 20:46:00 +02:00
Robin Mueller	5fe814e972	Merge remote-tracking branch 'origin/develop' into mueller/rtds-update	2022-05-12 15:48:26 +02:00
Robin Mueller	51466e68d7	Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if	2022-05-12 14:11:46 +02:00
Robin Mueller	382d93863f	create and pass correct comIF	2022-05-12 12:21:47 +02:00
Robin Mueller	38d03dbe57	bump deps, regenerate translation files	2022-05-11 17:59:08 +02:00
Robin Mueller	91b69eacf6	A lot of stuff ... - refactored and simplified RW assemblies - create separate SPI Com IF for RWs - Update .cproject file: Fixed to decrease indexer parsing times	2022-05-11 01:48:26 +02:00
Robin Mueller	71d9553f90	Merge remote-tracking branch 'origin/develop' into mueller/rw-ass	2022-05-08 13:11:56 +02:00
Robin Mueller	d9085e81a1	Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if	2022-05-08 13:06:47 +02:00
Jakob Meier	6dd57a3f5e	fixed merge conflicts	2022-05-06 19:44:18 +02:00
Robin Mueller	22060b9b16	Merge remote-tracking branch 'origin/develop' into mueller/rw-ass	2022-05-06 01:12:07 +02:00
Robin Mueller	a11a8c493d	Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if	2022-05-05 19:53:18 +02:00
Robin Mueller	0c82d06ec4	Merge remote-tracking branch 'origin/develop' into mueller/rename-sus	2022-05-05 19:41:36 +02:00
Robin Mueller	b426475ca4	better RTD names	2022-05-05 16:55:08 +02:00
Robin Mueller	a232b9bf98	assign better sus names	2022-05-05 16:46:04 +02:00
Robin Mueller	cf4edac604	maybe this fixes the timing issue?	2022-05-05 16:32:09 +02:00
Robin Mueller	1f6aab8124	apply afmt, some more renaming	2022-05-05 13:40:43 +02:00
Jakob Meier	8832d06d03	improvements for mram dump	2022-05-05 08:55:45 +02:00
Robin Mueller	28c9e33d1c	separate PST for RWs	2022-05-05 02:00:56 +02:00
Robin Mueller	bcb6df87b0	update tmtc, gen files and formatting in config file	2022-05-05 00:47:50 +02:00
Robin Mueller	3458c272ad	Merge remote-tracking branch 'origin/develop' into mueller/rw-ass	2022-05-04 16:47:49 +02:00
Jakob Meier	475f6f1687	removed unused ploc commands, fix in logging report reply	2022-05-04 12:49:43 +02:00
Robin Mueller	50ca378318	update for updated gpio API	2022-05-04 10:34:11 +02:00
Robin Mueller	ae0120f3ef	Merge branch 'mueller/refactoring-conf-handling' into mueller/heater-health-if	2022-05-03 17:44:02 +02:00
Robin Mueller	47f4aebd15	update auto-generated file	2022-05-03 16:32:57 +02:00
Robin Mueller	9449919b2b	Heaters are own objects with HealthIF now	2022-05-02 22:45:27 +02:00
Robin Mueller	9e2eca3e36	re-generate event list	2022-05-02 12:41:20 +02:00
Jakob Meier	be752997eb	fixed merge conflicts	2022-04-30 19:12:21 +02:00
Jakob Meier	6524f924c9	run generator scripts	2022-04-30 09:53:42 +02:00
Robin Mueller	c1248dd4e1	building new EM config	2022-04-29 15:47:54 +02:00
Cleanroom Laptop L15	7c770b5aec	fixed conflicts	2022-04-28 18:33:27 +02:00
Cleanroom Laptop L15	794ed04761	prevent sending boot command when mpsoc booted via jtag	2022-04-28 18:30:40 +02:00
Robin Mueller	1527b60fd6	Merge remote-tracking branch 'origin/develop' into mueller/rw-ass	2022-04-28 18:26:34 +02:00
Jakob.Meier	bbe1e996e6	Merge pull request 'Host Fixes and CMakeLists.txt update' (#229) from mueller/host-fixes-fsfw-update into develop ... Reviewed-on: #229 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-04-28 17:16:03 +02:00
Jakob.Meier	6d326137fb	Merge pull request 'OBSW Config in file update' (#225) from mueller/obsw-config-infile-update into develop ... Reviewed-on: #225 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-04-28 17:15:37 +02:00
Cleanroom Laptop L15	7682a1d214	fixed conflicts	2022-04-27 16:56:16 +02:00
Cleanroom Laptop L15	7543a92dd9	added test code	2022-04-27 16:44:03 +02:00
Robin Mueller	2b33d8772c	fixes most warnings for host build	2022-04-26 10:37:25 +02:00
Jakob Meier	311ec7b194	mpsoc shutdown after running update procedure	2022-04-25 11:03:02 +02:00
Jakob Meier	6876952bbd	regenerated events	2022-04-24 12:34:08 +02:00
Cleanroom Laptop L15	4a2ba043cb	fixed conflicts	2022-04-22 14:20:17 +02:00
Robin Mueller	1069762903	update config.h.in file	2022-04-22 11:11:04 +02:00
Robin Mueller	737d18135f	test flag for RW	2022-04-22 11:09:06 +02:00
Robin Mueller	0da74f1bf9	bump submodules, add some more devices by default	2022-04-22 11:08:27 +02:00
Robin Mueller	604d7ab228	Merge remote-tracking branch 'origin/develop' into mueller/minor-tweaks-pcdu-handler	2022-04-22 10:51:06 +02:00
Robin Mueller	e5d5af68c1	Important bugfix and improvement for PCDU Handler ... - Fixed out of bounds error - Handle multiple messages in queue handler - PCDU Handler now only called once in PST	2022-04-21 09:35:02 +02:00
Robin Mueller	4956161701	support both gps versions	2022-04-19 17:47:05 +02:00
Jakob Meier	ffd64d0463	improvements in supervisor helper	2022-04-19 13:33:37 +02:00
Jakob Meier	1ce45acba3	merged develop	2022-04-17 14:52:43 +02:00
Jakob Meier	7b54855397	supervisor fixes detected during testing	2022-04-16 17:19:32 +02:00
Jakob Meier	10343a0dab	supervisor event buffer request	2022-04-14 07:52:21 +02:00
Robin Mueller	604870d1fe	split up op divider, assing imtq power switcher	2022-04-12 15:27:48 +02:00
Jakob Meier	b440fc3df6	ploc update	2022-04-10 18:46:39 +02:00
Robin Mueller	808e01dfd3	DLE FRAM packets can be read now	2022-04-09 14:43:06 +02:00
Robin Mueller	f6bc884edd	Merge remote-tracking branch 'origin/develop' into irini	2022-04-08 20:50:13 +02:00
Irini Kosmidou	01d86a0c7b	huge progress	2022-04-08 19:12:21 +02:00
Irini Kosmidou	188f8863d0	Merge remote-tracking branch 'origin/develop' into irini	2022-04-08 15:21:31 +02:00
Robin Mueller	90e8d7ecaf	Merge remote-tracking branch 'origin/develop' into mueller/pcdu-hk-core-sets	2022-04-08 14:15:58 +02:00
Robin Mueller	4a6840f098	bugfixes and improvements ... - Tests finished	2022-04-08 11:22:16 +02:00
Robin Mueller	45007d726d	update translation files	2022-04-07 17:28:58 +02:00
Robin Mueller	189674a9bb	re-enable all suses	2022-04-03 20:12:14 +02:00
Jakob.Meier	04de6c7136	Merge pull request 'move GNSS NReset handling to assembly' (#194) from mueller/move-gnss-nreset-handling into develop ... Reviewed-on: #194 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-04-01 14:55:49 +02:00
Robin Mueller	1eb5a428cb	move GNSS NReset handling to assembly ... - Also update fsfwgen dependency	2022-04-01 14:01:12 +02:00
Robin Mueller	0fba9cbf7e	Merge remote-tracking branch 'origin/develop' into mueller/master	2022-04-01 13:44:47 +02:00
Robin Mueller	61769de4bf	activate all suses again	2022-03-31 19:12:40 +02:00
Robin Mueller	33ec092998	ported RTD code as well	2022-03-31 17:58:16 +02:00
Robin Mueller	053c65b6cd	Merge remote-tracking branch 'origin/develop' into mueller/rpi-sus-port	2022-03-31 16:42:52 +02:00
Robin Mueller	413f552639	improvements from sus test	2022-03-31 16:16:01 +02:00
Robin Mueller	637941e089	important bugfixes	2022-03-31 14:40:42 +02:00
Robin Mueller	9f937781b7	Merge remote-tracking branch 'origin/develop' into mueller/rpi-sus-port	2022-03-29 15:43:35 +02:00
Cleanroom Laptop L15	98ec92a880	rerun generators	2022-03-28 17:33:49 +02:00
Cleanroom Laptop L15	a9a6bbd948	fixed conflicts	2022-03-28 10:10:01 +02:00
Jakob Meier	44a0d4af61	removed te0720 code form q7s files	2022-03-27 10:56:40 +02:00
Jakob Meier	ceb7f40d35	fixed merge conflicts	2022-03-27 10:44:32 +02:00
Jakob Meier	471a981ccf	mpsoc flash write command	2022-03-26 20:47:25 +01:00
Robin Mueller	2410c6ccc6	added SUS component creation to RPi	2022-03-26 16:38:42 +01:00
Robin Mueller	243af65ca6	fix compile warnings for RPI build	2022-03-26 14:08:34 +01:00
Robin Mueller	ac0326a944	various improvements	2022-03-26 13:54:05 +01:00
Jakob Meier	47a3804145	fixed conflicts	2022-03-26 10:41:30 +01:00
Cleanroom Laptop L15	9351c8285b	rerun generators	2022-03-25 18:53:48 +01:00
Cleanroom Laptop L15	2f6d9ab7f1	fixed merge conflicts	2022-03-25 18:49:34 +01:00
Irini Kosmidou	df712c7100	scex reader task started	2022-03-25 17:48:38 +01:00
Cleanroom Laptop L15	931c53f1a6	corrections during e-band test	2022-03-25 12:57:42 +01:00
Robin Mueller	017eaf07f5	added new event	2022-03-22 20:43:34 +01:00
Robin Mueller	5fb4e468ba	update object list, bugfix	2022-03-22 19:33:49 +01:00
Robin Mueller	c21dae1afc	Merge remote-tracking branch 'origin/develop' into mueller/tcs-subsystem	2022-03-22 17:59:55 +01:00
Robin Mueller	1c7601aa1c	set test flag for rad sensor to 0	2022-03-22 14:31:24 +01:00
Robin Mueller	bcd97076e1	started TCS subsystem	2022-03-22 11:57:48 +01:00
Robin Mueller	e4d1cdafcc	various smaller bugfixes	2022-03-22 11:07:31 +01:00
Robin Mueller	c95374bfbd	refresh events, objects, retvals	2022-03-22 10:15:04 +01:00
Jakob Meier	a18a752b8e	rerun generators	2022-03-18 11:37:44 +01:00
Robin Mueller	e5a4065055	add and instantiate SUS ASS + SUS FDIR	2022-03-17 19:59:47 +01:00
Jakob Meier	8d70560968	fixed conflicts	2022-03-17 19:52:37 +01:00
Jakob Meier	b8fb5c289c	fix in mem write command	2022-03-17 19:51:00 +01:00