1138 Commits

Author	SHA1	Message	Date
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	17d17dce06	bugfix for some negative temperature conversions	2022-06-10 10:39:43 +02:00
Jakob Meier	1ebae7f938	fixes for te0720 build	2022-06-08 07:16:12 +02:00
Jakob Meier	8c850614e5	fixed merge conflicts	2022-06-05 10:54:46 +02:00
Jakob Meier	b8cf825307	rerun generators	2022-06-05 09:13:08 +02:00
Cleanroom Laptop L15	b3bb76c75f	bugfixes in hk handling	2022-06-03 18:03:25 +02:00
Cleanroom Laptop L15	04b7c82501	type fixes in device temperatures sets	2022-06-01 18:46:22 +02:00
Irini Kosmidou	521b17a8f8	initmission	2022-05-30 20:52:45 +02:00
Cleanroom Laptop L15	0e6d2354fc	thermal set fix	2022-05-30 14:32:50 +02:00
Irini Kosmidou	f5ee21334c	formatted	2022-05-29 17:54:17 +02:00
Irini Kosmidou	24cb555849	update	2022-05-29 17:52:13 +02:00
Robin Müller	4632a56346	Merge branch 'develop' into mueller/acs-ss-init	2022-05-27 15:28:41 +02:00
Robin Müller	10a82eca25	Merge branch 'develop' into mueller/pl-ss	2022-05-27 15:28:23 +02:00
Robin Mueller	b306116eac	remove duplicate declarations	2022-05-26 12:09:36 +02:00
Robin Mueller	5c91697cf1	removed accidental typed stuff	2022-05-26 12:09:01 +02:00
Robin Mueller	9f42ac9875	Merge branch 'mueller/scex-additions' into irini	2022-05-26 12:08:18 +02:00
Robin Mueller	a1faa3a73c	Merge remote-tracking branch 'origin/develop' into irini	2022-05-26 12:08:07 +02:00
Robin Mueller	1276cc2dc6	scex additions	2022-05-26 12:04:27 +02:00
Cleanroom Laptop L15	09a6707c6c	run generator scripts	2022-05-25 18:42:40 +02:00
Cleanroom Laptop L15	ee9a13f59b	Merge branch 'develop' into meier/ploc	2022-05-25 18:40:39 +02:00
Cleanroom Laptop L15	e9ccb2fd4f	status code parsing, fix in cam command	2022-05-25 18:38:54 +02:00
Robin Mueller	e5459bb1f7	re-run generators	2022-05-25 18:15:44 +02:00
Robin Mueller	5b0f1efefd	Merge remote-tracking branch 'origin/develop' into mueller/pl-ss	2022-05-25 15:48:00 +02:00
Robin Mueller	95121b5120	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-25 15:47:21 +02:00
Jakob.Meier	ad679a810e	Merge pull request 'add and schedule PUS11' (#259) from mueller/add-schedule-pus-11 into develop ... Reviewed-on: #259 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-05-25 15:21:25 +02:00
Robin Mueller	01bac87afb	update reset pin handling	2022-05-25 10:59:20 +02:00
Irini Kosmidou	44d36587aa	precised printouts	2022-05-25 10:51:22 +02:00
Robin Mueller	e1ed532f91	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-25 10:01:53 +02:00
Robin Mueller	43fc1ab780	Merge remote-tracking branch 'origin/develop' into mueller/add-schedule-pus-11	2022-05-25 09:57:34 +02:00
Robin Mueller	3fff3ba21e	add and schedule PUS11	2022-05-24 15:21:37 +02:00
Robin Mueller	633fe00cd6	run afmt, minor improvements	2022-05-24 01:14:04 +02:00
Robin Müller	43269d4add	Merge branch 'develop' into mueller/rtd-bugfixes	2022-05-23 18:37:40 +02:00
Robin Mueller	7d9ef6f887	run afmt	2022-05-23 18:37:04 +02:00
Robin Mueller	a4de3e9eb1	Merge remote-tracking branch 'origin/develop' into mueller/rtd-bugfixes	2022-05-23 18:00:45 +02:00
Robin Mueller	8aa664b49f	rtd bugfixes	2022-05-23 17:50:54 +02:00
Jakob Meier	f18507d278	boot image select memory default argument	2022-05-23 17:05:06 +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
Irini Kosmidou	e8882b11cf	ScexDeviceHandler	2022-05-19 11:56:59 +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	3713617ea5	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-16 15:18:13 +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	2fa1061c65	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-16 15:11:24 +02:00
Robin Mueller	a6abeb697f	comment	2022-05-16 15:09:02 +02:00
Robin Mueller	a92024a858	now supports auto mode as well	2022-05-14 17:32:33 +02:00
Robin Mueller	036024db7e	perm loop not necessary anymore	2022-05-14 17:22:57 +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	017cfb9d56	a lot of fixes, but some stuff doesnt work..	2022-05-14 17:04:51 +02:00
Robin Mueller	2cfd2cc1fc	switch to new dev handlers completely	2022-05-14 15:26:08 +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
Cleanroom Laptop L15	45f34df6b9	Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into develop	2022-05-13 18:38:26 +02:00
Cleanroom Laptop L15	54d7392467	improved mpsoc update handling	2022-05-13 18:37:16 +02:00
Robin Mueller	2c684643b3	some smaller fixed for new rtd handler	2022-05-13 16:29:57 +02:00
Jakob Meier	bb397a58de	event with packet number for which mpsoc update failed	2022-05-13 10:47:10 +02:00
Robin Mueller	44e7f06c2e	shorter debug string	2022-05-13 10:33:35 +02:00
Robin Mueller	706e3d458b	switch to direct handler again	2022-05-13 10:13:16 +02:00
Robin Mueller	6b54a4dea9	cleaning up, better fault status handling	2022-05-13 10:10:02 +02:00
Robin Mueller	be1c26ddf7	rtd testing	2022-05-13 01:17:23 +02:00
Robin Mueller	ac34bcbb3d	Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if	2022-05-12 20:46:00 +02:00
Jakob Meier	919141ae10	ccsds handler sending command to enable transmitter	2022-05-12 18:32:19 +02:00
Jakob Meier	3c3884476b	Merge branch 'develop' into meier/ccsds	2022-05-12 15:57:26 +02:00
Robin Müller	569754bdad	Merge branch 'develop' into meier/ploc	2022-05-12 15:48:56 +02:00
Robin Mueller	5fe814e972	Merge remote-tracking branch 'origin/develop' into mueller/rtds-update	2022-05-12 15:48:26 +02:00
Cleanroom Laptop L15	9db58210b8	Merge branch 'develop' into meier/ploc	2022-05-12 15:47:06 +02:00
Robin Mueller	51466e68d7	Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if	2022-05-12 14:11:46 +02:00
Cleanroom Laptop L15	e6f55ba2c1	increased execution timeout of prepare update command	2022-05-12 14:04:55 +02:00
Robin Mueller	dd67191044	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-12 14:02:15 +02:00
Robin Mueller	382d93863f	create and pass correct comIF	2022-05-12 12:21:47 +02:00
Robin Mueller	a173ef4308	create low level rtd handler in obj factory	2022-05-12 12:12:47 +02:00
Robin Mueller	6b9e49e632	continued low level MAX31865 handler	2022-05-12 11:27:30 +02:00
Cleanroom Laptop L15	0dd0af73a1	change in mpsoc status codes	2022-05-12 10:50:12 +02:00
Robin Mueller	23f209fb07	added eive specific max31865 handler	2022-05-12 09:48:41 +02:00
Jakob Meier	e5710784b9	Merge branch 'develop' into meier/ccsds	2022-05-12 07:47:28 +02:00
Robin Mueller	56f491befb	compile fix	2022-05-12 00:48:49 +02:00
Robin Mueller	93f605bc0a	Merge remote-tracking branch 'origin/develop' into mueller/rtds-update	2022-05-12 00:45:57 +02:00
Robin Mueller	38d03dbe57	bump deps, regenerate translation files	2022-05-11 17:59:08 +02:00
Jakob Meier	a315a8b529	fixed conflicts	2022-05-11 17:08:44 +02:00
Jakob Meier	c7e2cc22af	init sequence count	2022-05-11 16:49:07 +02:00
Cleanroom Laptop L15	835a10e538	sequence count init	2022-05-11 16:11:17 +02:00
Robin Mueller	625abcfd5b	important bugfixes	2022-05-11 15:45:38 +02:00
Jakob Meier	914acd9925	fixed conflicts	2022-05-11 14:37:36 +02:00
Jakob Meier	c7e4704234	fixed merge conflict	2022-05-11 14:36:23 +02:00
Robin Mueller	c5bccb661e	Merge remote-tracking branch 'origin/develop' into mueller/rw-ass	2022-05-11 13:54:04 +02:00
Jakob Meier	37002b47b3	sequence count init value	2022-05-11 12:46:04 +02:00
Robin Mueller	c043375ae3	RW Refactoring ... - FSFW update: SPI device is part of ComIF now - Only set RW mode (speed is set a side effect but not necessary) once - Release SPI bus in the 70 ms delay duration	2022-05-11 11:13:00 +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
Jakob Meier	907b8f4a5d	ccsds config for te0720-1cfa	2022-05-10 07:48:36 +02:00
Robin Mueller	50c363fb6f	new RTD reader module handling all RTD SPI Communication	2022-05-09 21:29:54 +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	631bc61d6c	changed set ids	2022-05-07 12:01:05 +02:00
Jakob Meier	43b0ed4b04	preprocessor define adjustments	2022-05-06 20:33:46 +02:00
Jakob Meier	d9c7cccf76	run clang format script	2022-05-06 19:53:33 +02:00
Jakob Meier	6dd57a3f5e	fixed merge conflicts	2022-05-06 19:44:18 +02:00
Jakob Meier	4ba26f057d	Merge branch 'meier/ploc' into meier/plocSupv	2022-05-06 19:36:03 +02:00
Jakob Meier	97222cafd9	increased mram dump execution timeout	2022-05-06 19:34:12 +02:00
Jakob Meier	132751893b	bugfix in missed reply hanling of supervsior MRAM dump	2022-05-06 19:30:20 +02:00
Robin Mueller	355ca27d31	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-06 08:58:31 +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
Cleanroom Laptop L15	fabd81365b	supervisor do startup set time	2022-05-05 19:20:14 +02:00
Cleanroom Laptop L15	5911ca79b5	nvm enable command	2022-05-05 19:18:39 +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
Cleanroom Laptop L15	9bd5595999	no time command sent during startup of supervisor	2022-05-05 10:50:23 +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
Jakob Meier	8aacbc2b40	cam cmd reply handling	2022-05-04 19:08:37 +02:00
Robin Mueller	3458c272ad	Merge remote-tracking branch 'origin/develop' into mueller/rw-ass	2022-05-04 16:47:49 +02:00
Robin Mueller	1508a1e147	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-04 16:43:31 +02:00
Robin Mueller	535da53093	Merge remote-tracking branch 'origin/develop' into mueller/refactoring-conf-handling	2022-05-04 14:34:07 +02:00
Robin Mueller	86752417f2	changed for updated FSFW GPIO API	2022-05-04 14:14:17 +02:00
Jakob Meier	475f6f1687	removed unused ploc commands, fix in logging report reply	2022-05-04 12:49:43 +02:00
Robin Mueller	d0e18f8b35	add mutex protections for switcher states	2022-05-04 11:11:29 +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	3b40e622fe	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-03 16:02:45 +02:00
Robin Mueller	06df558be0	Merge remote-tracking branch 'origin/develop' into mueller/rw-ass	2022-05-03 16:01:09 +02:00
Robin Mueller	88842d4f07	Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if	2022-05-03 15:59:28 +02:00
Robin Mueller	08046ef621	Merge remote-tracking branch 'origin/develop' into mueller/refactoring-conf-handling	2022-05-03 15:57:01 +02:00
Jakob Meier	5380ed216b	supervisor do startup fix	2022-05-03 15:36:38 +02:00
Jakob Meier	464821cc6f	supervisor set time during start up	2022-05-03 14:59:23 +02:00
Robin Mueller	456dac6afd	SHM and socket readout working now	2022-05-03 11:33:07 +02:00
Robin Mueller	cce0d5448d	support both SHM and socket read	2022-05-03 00:55:01 +02:00
Robin Mueller	0f4fe7694b	Merge remote-tracking branch 'origin/develop' into mueller/refactoring-conf-handling	2022-05-03 00:01:55 +02:00
Robin Mueller	c1d754d8ff	gps improvements	2022-05-02 23:52:53 +02:00
Robin Mueller	9449919b2b	Heaters are own objects with HealthIF now	2022-05-02 22:45:27 +02:00
Robin Mueller	7db0872ee3	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-02 12:49:53 +02:00
Robin Mueller	bab8412f10	Merge remote-tracking branch 'origin/develop' into mueller/rw-ass	2022-05-02 12:41:45 +02:00
Robin Mueller	9e2eca3e36	re-generate event list	2022-05-02 12:41:20 +02:00
Jakob Meier	49b0825f63	added doSendReadHook to prevent com if polling when com if is used by helper task	2022-05-02 09:56:15 +02:00
Jakob Meier	be752997eb	fixed merge conflicts	2022-04-30 19:12:21 +02:00
Jakob Meier	6d322c6e78	run clang format script	2022-04-30 16:21:59 +02:00
Jakob Meier	e1ffa97232	improved acknowledgment and execution handling in supervisor handler	2022-04-30 11:08:36 +02:00
Jakob Meier	6524f924c9	run generator scripts	2022-04-30 09:53:42 +02:00
Cleanroom Laptop L15	816dc43214	restructuring execution report handling	2022-04-29 23:34:28 +02:00
Cleanroom Laptop L15	7afb8e9070	execution status codes	2022-04-29 23:22:44 +02:00
Cleanroom Laptop L15	cedc6bec23	gpio state sent with execution report	2022-04-29 22:55:01 +02:00
Robin Mueller	c1248dd4e1	building new EM config	2022-04-29 15:47:54 +02:00
Irini Kosmidou	f2cb43a52f	scexDataHandler	2022-04-29 15:46:16 +02:00
Cleanroom Laptop L15	9d4cb2ea8d	xecution status code parsing	2022-04-29 13:31:58 +02:00
Irini Kosmidou	57f3103e52	update	2022-04-29 13:31:14 +02:00
Irini Kosmidou	7c15eb57bb	update	2022-04-29 12:48:13 +02:00
Irini Kosmidou	be7b141126	update	2022-04-29 12:30:52 +02:00
Irini Kosmidou	e16e6c2d17	fileId	2022-04-29 12:26:18 +02:00
Jakob Meier	bf281343c6	fixed conflicts	2022-04-29 09:04:49 +02:00
Jakob Meier	73c653d21d	execution status code wip	2022-04-29 09:03:13 +02:00
Jakob Meier	f0884c0096	read gpio tm handling	2022-04-29 08:34:23 +02:00
Robin Mueller	0b64999ce2	added generic GPIO checker	2022-04-28 18:38:38 +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
Robin Mueller	cb47667d01	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-04-28 17:56:33 +02:00
Robin Mueller	f01f63d8e8	Merge remote-tracking branch 'origin/develop' into mueller/gomspace-fdir	2022-04-28 17:55:40 +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
Robin Mueller	7e230b64ea	create and add syrlinks fdir	2022-04-28 15:29:57 +02:00
Jakob Meier	582d2db05f	fixed conflicts	2022-04-28 14:29:23 +02:00
Robin Mueller	ca1365df5b	Merge remote-tracking branch 'origin/develop' into mueller/rw-ass	2022-04-28 13:08:34 +02:00
Robin Mueller	636e2d62d8	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-04-28 13:06:48 +02:00
Robin Mueller	713bfbd7dc	Merge remote-tracking branch 'origin/develop' into mueller/minor-tweaks-pcdu-handler	2022-04-28 11:33:35 +02:00
Robin Mueller	9ce7a28cff	Merge remote-tracking branch 'origin/develop' into mueller/obsw-config-infile-update	2022-04-28 11:32:59 +02:00
Robin Mueller	e836ed8a2d	Merge remote-tracking branch 'origin/develop' into mueller/host-fixes-fsfw-update	2022-04-28 11:31:50 +02:00
Jakob Meier	898753f6e3	supervisor reset pl command	2022-04-28 11:27:28 +02:00
Robin Mueller	234a6b7ac3	switch gps ctrl to socket API	2022-04-28 10:50:39 +02:00
Robin Mueller	584700a2ba	do not add ETL lib	2022-04-28 10:21:04 +02:00
Irini Kosmidou	e11c84a5ed	update	2022-04-27 18:21:32 +02:00
Cleanroom Laptop L15	7682a1d214	fixed conflicts	2022-04-27 16:56:16 +02:00
Irini Kosmidou	c5683afe9f	fram	2022-04-27 16:46:11 +02:00
Cleanroom Laptop L15	7543a92dd9	added test code	2022-04-27 16:44:03 +02:00
Jakob Meier	8610e48b19	countdown based timeout	2022-04-27 16:08:17 +02:00
Irini Kosmidou	e2f0c0f1be	fram rec	2022-04-26 13:22:56 +02:00
Robin Mueller	2b33d8772c	fixes most warnings for host build	2022-04-26 10:37:25 +02:00
Jakob Meier	42194abb4a	commented in read function again	2022-04-25 13:36:30 +02:00
Jakob Meier	3e8429b34b	warning print when memory check command fails	2022-04-25 13:36:06 +02:00
Jakob Meier	311ec7b194	mpsoc shutdown after running update procedure	2022-04-25 11:03:02 +02:00
Robin Mueller	f014e2d5c7	system folder restructuring	2022-04-25 10:36:03 +02:00
Jakob Meier	6876952bbd	regenerated events	2022-04-24 12:34:08 +02:00
Robin Mueller	f421fd4dde	Merge remote-tracking branch 'origin/develop' into mueller/minor-tweaks-pcdu-handler	2022-04-23 12:30:45 +02:00
Robin Mueller	957b067eac	Merge remote-tracking branch 'origin/develop' into mueller/obsw-config-infile-update	2022-04-23 12:28:51 +02:00
Cleanroom Laptop L15	9301206485	fixes identified during tests	2022-04-22 18:05:03 +02:00
Cleanroom Laptop L15	4a2ba043cb	fixed conflicts	2022-04-22 14:20:17 +02:00
Cleanroom Laptop L15	b63c3bb9c3	increased delay cycles of execution report	2022-04-22 14:17:16 +02:00
Cleanroom Laptop L15	8b612d9116	include fix	2022-04-22 14:16:40 +02:00
Robin Mueller	a416ca406b	git describe support finished	2022-04-22 14:09:08 +02:00
Robin Mueller	d29dd48d1e	update project file: changed default unix sysroot	2022-04-22 11:18:10 +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	165a4ef814	continued RW Assembly	2022-04-22 10:28:29 +02:00
Jakob.Meier	d6532f8181	Merge pull request 'Update for new yocto rootfs' (#217) from mueller/yocto-rootfs into develop ... Reviewed-on: #217 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-04-22 10:21:52 +02:00
Jakob Meier	2ee9b09b27	logging command	2022-04-22 08:55:57 +02:00
Irini Kosmidou	578899b5a5	scexhelper	2022-04-21 19:47:09 +02:00
Jakob Meier	cf37d74728	adc report	2022-04-21 16:30:23 +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
Jakob Meier	73ba4a39b0	comments	2022-04-21 09:31:52 +02:00
Jakob Meier	38ecb9e055	cam commands	2022-04-20 21:33:39 +02:00
Robin Mueller	5d8e8a9841	delete commented code	2022-04-19 17:52:43 +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
Robin Mueller	a4c5d8de45	adaptions for gpsd 3.17	2022-04-18 00:25:33 +02:00
Jakob Meier	1ce45acba3	merged develop	2022-04-17 14:52:43 +02:00
Robin Mueller	be2834cb1a	linux ctrl only print warning once	2022-04-17 11:48:06 +02:00
Robin Mueller	d3403d341f	if gpssmm cant be opened, return prematurely	2022-04-17 01:06:37 +02:00
Jakob Meier	7b54855397	supervisor fixes detected during testing	2022-04-16 17:19:32 +02:00
Robin Mueller	57cc77e197	fixed some tiny bugs	2022-04-15 01:39:47 +02:00
Robin Mueller	25138d8931	update	2022-04-14 09:42:59 +02:00
Jakob Meier	10343a0dab	supervisor event buffer request	2022-04-14 07:52:21 +02:00
Irini Kosmidou	bbdd3c052e	mutex	2022-04-13 17:47:24 +02:00
Irini Kosmidou	9f3f264eac	continued scex uart reader, some bugs	2022-04-13 17:43:16 +02:00
Irini Kosmidou	5b2cfd2c84	Merge remote-tracking branch 'origin' into irini	2022-04-13 14:47:12 +02:00
Jakob Meier	42b7b4a7c4	Merge branch 'develop' into mueller/release-warning-fixes	2022-04-13 12:04:08 +02:00
Jakob Meier	bd8cd49117	event buffer request wip	2022-04-13 11:56:37 +02:00
Jakob Meier	7f51ffc8fb	use structs instead of classes	2022-04-12 17:42:41 +02:00
Robin Mueller	a14ca283cc	using vector for convert enables	2022-04-12 16:36:04 +02:00
Robin Mueller	604870d1fe	split up op divider, assing imtq power switcher	2022-04-12 15:27:48 +02:00
Robin Mueller	df38903fe9	some warning fixes for release build	2022-04-11 17:16:25 +02:00
Jakob Meier	05a85ab8a1	implemeted ICD changes	2022-04-11 16:52:50 +02:00
Robin Mueller	8a0999851f	update for new fsfw API ... - Apply auto-formatter	2022-04-11 14:56:20 +02:00
Robin Mueller	f05922e19e	Merge remote-tracking branch 'origin/develop' into mueller/split-pdu1-pdu2-sets	2022-04-11 08:55:25 +02:00
Jakob Meier	b440fc3df6	ploc update	2022-04-10 18:46:39 +02:00
Robin Mueller	d00cb6d4a5	updates for new dle parser API	2022-04-09 15:38:09 +02:00
Robin Mueller	808e01dfd3	DLE FRAM packets can be read now	2022-04-09 14:43:06 +02:00
Robin Mueller	44c8f5f730	bugfix for SCEX	2022-04-09 01:00:42 +02:00
Robin Mueller	6071e34771	some refactoring	2022-04-08 21:16:02 +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	35f2d2cb9c	solve merge comflioct	2022-04-08 15:25:07 +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	c83efd149e	small tweak	2022-04-08 11:41:17 +02:00
Robin Mueller	6ae9e539a6	more useful printout	2022-04-08 11:40:35 +02:00
Robin Mueller	351920aa7b	some tweaks	2022-04-08 11:31:29 +02:00
Robin Mueller	4a6840f098	bugfixes and improvements ... - Tests finished	2022-04-08 11:22:16 +02:00
Robin Mueller	8f0d0917ab	Merge remote-tracking branch 'origin/develop' into mueller/split-pdu1-pdu2-sets	2022-04-07 19:53:29 +02:00
Robin Mueller	59d58da4f2	splitting pdu1 and pdu2 sets done	2022-04-07 19:48:09 +02:00
Robin Müller	cb81798c0c	Merge branch 'develop' into mueller/pcdu-hk-core-sets	2022-04-07 17:34:08 +02:00
Robin Mueller	45007d726d	update translation files	2022-04-07 17:28:58 +02:00
Robin Mueller	5801c17509	Merge remote-tracking branch 'origin/develop' into mueller/gps-time-update	2022-04-07 17:24:05 +02:00
Robin Mueller	796b814b49	Add time file handling	2022-04-07 17:23:50 +02:00
Jakob Meier	dbe4f70d8e	Merge branch 'meier/plocSupv' into meier/plocSupvUpdate	2022-04-07 12:26:30 +02:00
Robin Mueller	4e3fa54ae2	split P60 dock HK into core and aux HK	2022-04-07 12:22:08 +02:00
Robin Mueller	bf849b24e6	Merge remote-tracking branch 'origin/develop' into mueller/hk-check	2022-04-07 11:59:02 +02:00
Robin Mueller	64dce75e09	hk update for gps	2022-04-07 11:56:01 +02:00
Robin Mueller	ca92b85864	enable periodic HK by default	2022-04-07 11:22:29 +02:00
Robin Mueller	8f4f271331	longer HK intervals	2022-04-07 11:15:28 +02:00
Robin Mueller	1876bbe449	Merge remote-tracking branch 'origin/develop' into mueller/gps-update	2022-04-07 11:12:52 +02:00
Robin Mueller	5c4ae861b1	exclude gps changes	2022-04-07 11:11:37 +02:00
Robin Mueller	1a5196f9d2	Merge remote-tracking branch 'origin/develop' into mueller/pl-pcdu-update-mode-handling	2022-04-07 11:03:24 +02:00
Robin Müller	8f391d3a68	Merge branch 'develop' into mueller/gps-update	2022-04-07 11:00:22 +02:00
Jakob Meier	c0fd9aee6f	update helper wip	2022-04-07 11:00:07 +02:00
Robin Mueller	c3aa9fb908	update for gps ... - GPSD/NTPD finally seem to work now. Still keep code to set it manually for now	2022-04-07 10:55:29 +02:00
Robin Mueller	a6d20de0a5	GPS linux controller update	2022-04-07 10:02:56 +02:00
Robin Mueller	042a6b2960	Merge remote-tracking branch 'origin/develop' into mueller/pl-pcdu-update-mode-handling	2022-04-07 09:50:21 +02:00
Cleanroom Laptop L15	3f6a534db5	fixes identified during tests	2022-04-06 17:27:44 +02:00
Robin Mueller	d7e899e113	Merge remote-tracking branch 'origin/develop' into mueller/improve-pcdu-hk-handling	2022-04-06 12:10:50 +02:00
Jakob Meier	f058cf5e31	supervisor udpate wip	2022-04-06 08:36:34 +02:00
Jakob Meier	9837a1b62c	changes in supervisor commands	2022-04-06 07:10:20 +02:00
Jakob Meier	d48ec92d09	fixed conflicts	2022-04-05 13:57:16 +02:00
Robin Mueller	6020b20fc9	hk handling	2022-04-04 18:47:09 +02:00
Robin Mueller	65ce25ec7a	improved P60 HK handling	2022-04-04 17:16:52 +02:00
Robin Mueller	ec880d4232	apply auto-formatter	2022-04-04 13:40:45 +02:00
Robin Mueller	b12ffb6f44	PL PCDU switch states like mode bitmask now	2022-04-04 13:39:35 +02:00
Robin Mueller	36666f214c	Merge remote-tracking branch 'origin/develop' into mueller/master	2022-04-03 20:15:41 +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
Jakob.Meier	afb1d22f76	Merge pull request 'activate all suses again' (#193) from mueller/rpi-sus-port into develop ... Reviewed-on: #193 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-04-01 14:52:10 +02:00
Jakob Meier	07c242282d	syrlinks test	2022-04-01 14:15:42 +02:00
Robin Mueller	c231a775b3	Merge remote-tracking branch 'origin/develop' into mueller/move-gnss-nreset-handling	2022-04-01 14:05:32 +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	d769d3ce22	Merge remote-tracking branch 'origin/develop' into meier/deviceHandlerUpdate	2022-04-01 13:41:04 +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
Jakob Meier	222f17edcc	Merge branch 'develop' into meier/deviceHandlerUpdate	2022-03-31 15:48:58 +02:00
Robin Mueller	637941e089	important bugfixes	2022-03-31 14:40:42 +02:00
Jakob Meier	e9b2def10e	mpsoc sending action command during startup to supervisor	2022-03-31 11:50:33 +02:00
Robin Mueller	2c8b691ca4	continued rpi sus port	2022-03-30 17:44:07 +02:00
Jakob Meier	53aca633b8	write lcl config register	2022-03-30 16:29:58 +02:00
Robin Mueller	f427d372a7	Merge remote-tracking branch 'origin/develop' into mueller/master	2022-03-30 13:11:11 +02:00
Jakob Meier	2dca9d598d	mpsoc startup command	2022-03-30 09:19:30 +02:00
Robin Mueller	9cfb2bad51	only set time every 60 seconds	2022-03-29 17:47:40 +02:00
Robin Mueller	a8457d7966	small safety mechanism for time	2022-03-29 16:59:48 +02:00
Robin Mueller	0ba2caaf61	set the time in the code directly now	2022-03-29 16:53:05 +02:00
Robin Mueller	9f937781b7	Merge remote-tracking branch 'origin/develop' into mueller/rpi-sus-port	2022-03-29 15:43:35 +02:00
Jakob Meier	25c3f39c82	star tracker switch	2022-03-29 07:58:22 +02:00
Cleanroom Laptop L15	618d7a3358	Merge branch 'meier/plocMPSoC' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into meier/plocMPSoC	2022-03-28 17:39:38 +02:00
Cleanroom Laptop L15	98ec92a880	rerun generators	2022-03-28 17:33:49 +02:00
Robin Mueller	e6ad0978de	run auto-formatter	2022-03-28 13:54:46 +02:00
Cleanroom Laptop L15	d6ed952fa9	use power switcher to turn on supervisor	2022-03-28 11:34:06 +02:00
Cleanroom Laptop L15	a9a6bbd948	fixed conflicts	2022-03-28 10:10:01 +02:00
Jakob Meier	758c4e6f4f	uart isolator switch handling	2022-03-28 09:08:11 +02:00
Jakob Meier	e2c9bece05	adding uart isolator switches wip	2022-03-27 14:42:20 +02:00
Jakob Meier	6d04c278c3	run clang formatting script	2022-03-27 13:07:18 +02:00
Jakob Meier	0d8ccd649a	return execution finished in executeAction	2022-03-27 12:56:39 +02:00
Jakob Meier	022ae4091d	preprocessor define correction	2022-03-27 12:20:25 +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
Cleanroom Laptop L15	4ccec03e47	changed some error messages to warnings	2022-03-25 09:40:43 +01:00
Jakob Meier	3df7a7f896	get status function	2022-03-25 09:08:01 +01:00
Cleanroom Laptop L15	1e2df7bf91	replay command	2022-03-24 17:39:50 +01:00
Cleanroom Laptop L15	368b01c081	include fixes	2022-03-23 11:13:59 +01:00
Jakob Meier	f99e96a20a	flash write tc, fix in pus data extraction	2022-03-23 05:28:24 +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
Jakob Meier	78b3f28188	restructured flash write command	2022-03-22 11:35:44 +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	bbed4a3b6e	e-band control commands	2022-03-21 16:21:51 +01:00
EIVE Cleanroom	664670573a	tc replay stop wip	2022-03-21 11:05:41 +01:00
Jakob Meier	be45d21486	mpsoc flash delete command	2022-03-21 08:53:55 +01:00
Jakob Meier	5875868f72	flash delete wip	2022-03-21 08:35:28 +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
Robin Mueller	acd0307591	continued ACS board + SUS board assemblies ... - Handling and Testing of basic FDIR	2022-03-17 19:23:39 +01:00
Jakob Meier	9dc124004d	build configuration for trenz te0720-1cfa	2022-03-17 14:28:32 +01:00
Robin Mueller	4fef5781a8	small fix in power state machine	2022-03-17 10:48:35 +01:00
Robin Mueller	3c1055f988	.h.in file fix	2022-03-17 10:22:53 +01:00
Robin Mueller	72acab599a	Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems	2022-03-17 10:17:04 +01:00
Robin Mueller	40d9829700	Major update for power handling ... and various smaller updates	2022-03-16 20:13:21 +01:00
Jakob Meier	f8f7848200	run generator scripts	2022-03-14 18:43:16 +01:00
Robin Mueller	8e3f40a780	Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems	2022-03-14 17:48:20 +01:00
Jakob Meier	9fc1e57943	fixed conflicts	2022-03-14 14:35:07 +01:00
Jakob Meier	d99825e20e	core housekeeping	2022-03-13 16:32:40 +01:00
Robin Mueller	dd37f90b47	update for gen scripts, small fixes	2022-03-11 14:33:09 +01:00
Robin Mueller	84dead546c	name fix	2022-03-08 09:54:02 +01:00
Robin Mueller	e2ad666d07	Merge branch 'mueller/additional-gcc-warnings' into mueller/system-subsystems	2022-03-08 09:49:16 +01:00
Robin Mueller	10a2973dc7	minor update in fsfw	2022-03-08 09:48:18 +01:00
Robin Mueller	39c47a1abf	Merge branch 'mueller/additional-gcc-warnings' into mueller/system-subsystems	2022-03-08 09:44:38 +01:00
Robin Mueller	6ccf16f56d	enabled more GCC warnings	2022-03-08 09:37:23 +01:00
Robin Müller	9ab8188034	Merge branch 'develop' into mueller/system-subsystems	2022-03-08 08:53:10 +01:00
Robin Mueller	62229cb999	bugfixes for NORMAL to OFF transition	2022-03-07 18:39:33 +01:00
Robin Mueller	597ab9c74c	update event list again	2022-03-07 17:10:30 +01:00
Robin Mueller	b9139d5c40	update event list	2022-03-07 17:03:08 +01:00
Robin Mueller	e678b53452	switch initialization is now optional (default on)	2022-03-07 15:55:26 +01:00
Robin Mueller	a2fee43c8c	Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems	2022-03-07 15:44:18 +01:00
Robin Müller	7134401570	Merge branch 'develop' into mueller/move-archive-folder	2022-03-07 15:39:12 +01:00
Robin Mueller	2ef1befb9c	common gpioIds.h file	2022-03-07 15:29:27 +01:00
Robin Mueller	b53900071c	subsystem ID bugfix	2022-03-07 13:20:17 +01:00
Robin Mueller	d5c755a331	update events and objects	2022-03-07 11:36:40 +01:00
Robin Mueller	970b8c33e5	Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems	2022-03-07 11:35:28 +01:00
Robin Mueller	59b89b730d	bump fsfwgen dependency	2022-03-07 11:34:32 +01:00
Robin Mueller	debc72014a	regenerate object and events	2022-03-07 11:08:50 +01:00
Robin Mueller	32def71502	first version of ACS board ASS working ... - Testes transition OFF to NORMAL for A side - Refactored power switching so it can be used by SUS ass as well - Generate events for sending switch command - Generate event if switch state changes - Deny Q7S switch commanding	2022-03-05 03:02:09 +01:00
Robin Mueller	cbb8103278	some more bugfixes	2022-03-04 18:33:23 +01:00
Robin Mueller	0904cadde5	continued ACS board assembly	2022-03-04 18:12:16 +01:00
Robin Mueller	4eb948c5ef	start acs task	2022-03-04 16:03:57 +01:00
Robin Mueller	8054694763	update for generator scripts ... - Generators will now copy csv files into tmtc folder - Bump fsfwgen dependency, some bugfixes - Rerun formatter - Rerun generator scripts	2022-03-04 15:14:02 +01:00
Robin Mueller	b71ea7c4c7	move archive folder	2022-03-04 15:00:14 +01:00
Robin Müller	c4ed263e6c	Merge branch 'develop' into mueller/system-subsystems	2022-03-04 14:52:12 +01:00
Jakob.Meier	7b9023cb6f	Merge pull request 'Update for generator scripts' (#163) from mueller/generators-update into develop ... Reviewed-on: #163 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-03-04 09:56:08 +01:00
Robin Mueller	63c4095d4d	Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems	2022-03-03 15:50:31 +01:00
Robin Mueller	ff0da65662	started SUS assembly ... fixes for PCDU code and switcher list handling	2022-03-03 15:37:36 +01:00
Robin Mueller	5ce46beebf	Merge remote-tracking branch 'origin/develop' into mueller/adis-optimization	2022-03-03 13:38:21 +01:00
Robin Mueller	0f60d82c06	Merge remote-tracking branch 'origin/develop' into mueller/generators-update	2022-03-03 13:37:51 +01:00
Robin Mueller	5255e7d2ed	finished ACS board ASS	2022-03-03 10:12:59 +01:00
Robin Mueller	5873371d36	continued acs board assembly	2022-03-02 17:56:54 +01:00
Ulrich Mohr	f413ed6f7d	Merge branch 'mohr/buildfix' into mohr/catch2	2022-03-02 17:52:41 +01:00
Ulrich Mohr	05bd1cc8c6	forgot one	2022-03-02 17:47:48 +01:00
Ulrich Mohr	2f51f58c7e	Merge branch 'develop' into mohr/catch2	2022-03-02 17:12:24 +01:00
Robin Mueller	33483b81a6	update generator scripts	2022-03-01 18:05:11 +01:00
Robin Müller	193e2bb0f9	Merge branch 'develop' into mueller/adis-optimization	2022-03-01 17:58:53 +01:00
Robin Mueller	3b1f088596	use OSAL define instead of dedicated define	2022-03-01 17:57:48 +01:00
Robin Mueller	54fb646ea1	Merge remote-tracking branch 'origin/develop' into mueller/small-rpi-fix	2022-03-01 17:50:33 +01:00
Robin Mueller	27f9c0223c	use new cmake option	2022-03-01 17:48:05 +01:00
Jakob Meier	033bdb93ad	fixed conflict	2022-03-01 17:22:55 +01:00
Jakob Meier	57b815c8ee	progress printer	2022-03-01 17:17:15 +01:00
Robin Mueller	54640147c1	GPIO hal update	2022-02-28 15:47:34 +01:00
Jakob Meier	f88674ed59	applied clang formatting	2022-02-27 15:48:42 +01:00
Jakob Meier	dfd817d27b	refactored star tracker handler	2022-02-27 15:46:06 +01:00
Jakob Meier	e61dfc0401	fixed conflicts	2022-02-25 14:39:18 +01:00
Jakob Meier	e082f3973a	star tracker flash read	2022-02-25 14:24:51 +01:00
Robin Mueller	cca0d5735e	Merge remote-tracking branch 'origin/develop' into mueller/move-deply-handler	2022-02-25 11:18:35 +01:00