856 Commits

Author	SHA1	Message	Date
Robin Mueller	8c110460a6	added test to retrieve pdu config	2022-08-26 14:28:06 +02:00
Robin Mueller	e804d433aa	merge conflict	2022-08-26 13:46:18 +02:00
Robin Mueller	0f553e3431	Merge remote-tracking branch 'origin/develop' into mueller/update-p60-module-code	2022-08-26 13:45:53 +02:00
Robin Mueller	a7482b657a	changed all table parsing to use gom space API	2022-08-26 13:42:58 +02:00
Robin Mueller	efb0bce718	finally it works	2022-08-26 03:20:44 +02:00
Robin Mueller	d098ed6403	gomspace lib working	2022-08-26 00:39:06 +02:00
Robin Mueller	7841a5c8c0	more complicated than expected	2022-08-25 18:48:07 +02:00
Robin Mueller	c0a78e6fef	start extending p60 module code	2022-08-25 18:19:33 +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	790a71974e	Merge branch 'mueller/tmtc-stack-refactoring' into mueller/acs-imtq-update	2022-08-24 16:51:42 +02:00
Robin Mueller	b503836a3d	hopefully last bugfix	2022-08-21 01:38:45 +02:00
Robin Mueller	c8d38cf852	bugfixes	2022-08-20 12:11:08 +02:00
Robin Mueller	726e448af9	fixes for IMTQ mgm reading	2022-08-18 18:18:44 +02:00
Robin Mueller	3d0d10dc32	try IMTQ change	2022-08-18 17:27:39 +02:00
Robin Mueller	ec47d7eeef	important bugfix for CRC calculation	2022-08-18 15:32:24 +02:00
Robin Mueller	a134f3f100	Merge remote-tracking branch 'origin/develop' into irini	2022-08-16 18:52:16 +02:00
Robin Mueller	e1c06ce1f5	possible bugfix	2022-08-15 18:58:56 +02:00
Robin Mueller	7e3517d309	it compiles again	2022-08-15 18:34:26 +02:00
Robin Mueller	0c371623c6	change PLOC/MPSOC code to using new SP code	2022-08-15 17:25:16 +02:00
Robin Mueller	4a28f79e3a	updates for new API	2022-08-15 11:57:57 +02:00
Robin Mueller	6821a95095	continued ACS controller impl	2022-08-15 10:50:19 +02:00
Robin Mueller	201ef9cb0c	smaller bugfixes	2022-07-13 15:51:21 +02:00
Robin Mueller	8b39f65472	modify oss to append at end	2022-07-13 11:25:53 +02:00
Robin Mueller	303f538076	countdown based reply handling	2022-07-08 17:11:21 +02:00
Robin Mueller	fc639a3e3f	move countdown reset	2022-07-08 16:57:40 +02:00
Robin Mueller	563e13765d	Merge remote-tracking branch 'origin/develop' into irini	2022-07-08 16:27:50 +02:00
Robin Mueller	b133a0538c	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-07-04 10:47:23 +02:00
Robin Mueller	9e89a0689f	Merge remote-tracking branch 'origin/develop' into mueller/pl-ss	2022-07-04 10:46:47 +02:00
Irini Kosmidou	5a92b9e616	tmtc	2022-06-30 21:53:02 +02:00
meierj	a2e7c6cca6	moved ccsds object creation back to core object factory and run auto formatter	2022-06-27 10:58:46 +02:00
meierj	95da2372c9	run generators	2022-06-27 09:15:29 +02:00
Irini Kosmidou	20328f89ae	ping cmd working	2022-06-21 17:46:59 +02:00
Irini Kosmidou	005e548059	comntinued scex handler	2022-06-21 16:44:14 +02:00
Jakob Meier	89757c447c	run auto-formatter	2022-06-17 08:31:36 +02:00
Jakob Meier	61aa57f021	Merge branch 'develop' into meier/thermal-bugfixes	2022-06-16 09:00:56 +02:00
Jakob Meier	0ee912665e	removed mock files from mission directory	2022-06-16 08:47:56 +02:00
Jakob Meier	b53bfb9a6f	dummy devices	2022-06-16 08:26:40 +02:00
Jakob Meier	d96d3b155b	syrlinks carrier wave command	2022-06-15 10:37:00 +02:00
Jakob Meier	63c669bc27	fixed type of imtq self test temperatures	2022-06-10 11:06:05 +02:00
Jakob Meier	17d17dce06	bugfix for some negative temperature conversions	2022-06-10 10:39:43 +02:00
Jakob Meier	8c850614e5	fixed merge conflicts	2022-06-05 10:54:46 +02:00
Cleanroom Laptop L15	b3bb76c75f	bugfixes in hk handling	2022-06-03 18:03:25 +02:00
Jakob Meier	6c32ddf864	changed gomspace temperatures to float	2022-06-03 09:33:08 +02:00
Cleanroom Laptop L15	f47712552e	hk set fixes	2022-06-02 18:46:08 +02:00
Cleanroom Laptop L15	593cc68b84	rtd dataset	2022-05-31 16:44:57 +02:00
Cleanroom Laptop L15	0e6d2354fc	thermal set fix	2022-05-30 14:32:50 +02:00
Cleanroom Laptop L15	23cabe4ca6	Merge branch 'develop' into mohr/thermal_controller	2022-05-30 12:10:19 +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 Mueller	a1faa3a73c	Merge remote-tracking branch 'origin/develop' into irini	2022-05-26 12:08:07 +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	f50682b56a	Merge pull request 'Split ACU HK' (#256) from mueller/split-acu-hk into develop ... Reviewed-on: #256 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-05-25 15:23:19 +02:00
Robin Mueller	01bac87afb	update reset pin handling	2022-05-25 10:59:20 +02:00
Robin Mueller	5d2a70b6c6	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-25 10:28:06 +02:00
Robin Mueller	96564f890e	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-25 10:28:00 +02:00
Robin Mueller	f7d436dc6b	Merge remote-tracking branch 'origin/develop' into mueller/pl-ss	2022-05-25 10:23:22 +02:00
Robin Mueller	0ac38e8490	Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk	2022-05-25 10:16:14 +02:00
Robin Mueller	d79177e544	Merge remote-tracking branch 'origin/develop' into mueller/core-controller-remount-sd-handling	2022-05-25 10:15:48 +02:00
Robin Mueller	581423a40e	Merge branch 'mueller/acs-ss-init' into mueller/pl-ss	2022-05-25 10:09:24 +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	7646b683b2	Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk	2022-05-25 09:59:14 +02:00
Robin Mueller	2bf044422f	Merge remote-tracking branch 'origin/develop' into meier/imtq	2022-05-25 09:56:41 +02:00
Jakob Meier	1ccd12e2e1	enable hk in imtq	2022-05-24 19:08:00 +02:00
Irini Kosmidou	2f4d44433d	scexDeviceHandler::interpretDeviceReply	2022-05-24 18:38:34 +02:00
Ulrich Mohr	b878508fec	Thermal COntroller collecting Sus Temperatures	2022-05-24 16:52:21 +02:00
Robin Mueller	633fe00cd6	run afmt, minor improvements	2022-05-24 01:14:04 +02:00
Robin Mueller	b2c286cd7e	improve and optimize SD card handling	2022-05-24 00:20:23 +02:00
Robin Mueller	a1d2ec3db4	Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk	2022-05-23 22:24:28 +02:00
Robin Mueller	5df905182c	these brackets are less confusing	2022-05-23 18:40:17 +02:00
Robin Mueller	62ef9c7e70	set datapool entries of rad sensor valid	2022-05-23 18:25:39 +02:00
Robin Mueller	1f62d8284c	Merge remote-tracking branch 'origin/develop' into mueller/split-acu-hk	2022-05-23 18:01:37 +02:00
Robin Mueller	8aa664b49f	rtd bugfixes	2022-05-23 17:50:54 +02:00
Robin Mueller	660f0d2dcd	some minor fixes	2022-05-23 14:19:57 +02:00
Robin Mueller	e522aadd44	set HKs valid	2022-05-23 14:04:46 +02:00
Robin Mueller	8ae6fe0be5	moved HK defs	2022-05-23 12:39:10 +02:00
Robin Mueller	99e27a5a63	run afmt	2022-05-23 11:25:58 +02:00
Robin Mueller	3bdad61ac0	split ACU HK set	2022-05-23 10:42:57 +02:00
Ulrich Mohr	e9725e3093	gcc 12 complained...	2022-05-19 23:06:18 +02:00
Robin Mueller	377f762ca5	fixed for new SPI HAL API	2022-05-19 14:54:44 +02:00
Irini Kosmidou	e8882b11cf	ScexDeviceHandler	2022-05-19 11:56:59 +02:00
Irini Kosmidou	b4e1451501	ScexDeviceHandler DeviceReply	2022-05-19 10:16:46 +02:00
Irini Kosmidou	7179d9dec3	deSerialize	2022-05-19 09:59:33 +02:00
Robin Mueller	e49a1af9b7	bump fsfw	2022-05-18 14:51:33 +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	2fa1061c65	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-16 15:11:24 +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	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
Robin Mueller	8715683d6b	enable periodic reply for eie RTD	2022-05-13 17:25:06 +02:00
Robin Mueller	2c684643b3	some smaller fixed for new rtd handler	2022-05-13 16:29:57 +02:00
Robin Mueller	b12a634b81	typo	2022-05-13 15:16:48 +02:00
Robin Mueller	3ae1812c32	some renaming	2022-05-13 15:16:10 +02:00
Robin Mueller	44e7f06c2e	shorter debug string	2022-05-13 10:33:35 +02:00
Robin Mueller	f3b473ea99	some more rtd tweaks	2022-05-13 10:27:26 +02:00
Robin Mueller	d999f57fef	apply afmt	2022-05-13 10:10:56 +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	e81ddaa1a5	added auto-shutdown for faulty heaters	2022-05-12 20:44:36 +02:00
Robin Mueller	21ba8c95ff	additional parameter to identify cmd source	2022-05-12 20:12:01 +02:00
Jakob Meier	919141ae10	ccsds handler sending command to enable transmitter	2022-05-12 18:32:19 +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	dd67191044	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-12 14:02:15 +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
Robin Mueller	23f209fb07	added eive specific max31865 handler	2022-05-12 09:48:41 +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	625abcfd5b	important bugfixes	2022-05-11 15:45:38 +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	45c1ac0f61	update	2022-05-10 18:34:39 +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	2ff8923c81	fixed reorder warning in imtq handler	2022-05-07 13:19:59 +02:00
Robin Mueller	1f6aab8124	apply afmt, some more renaming	2022-05-05 13:40:43 +02:00
Robin Mueller	590fe6ca39	Some RW improvements ... - Moved Events to definitions file - Added new event if reset occurs - Deliver state if there is an error (going to be 0, still deliver it)	2022-05-05 12:48:56 +02:00
Robin Mueller	92f95b2b97	comment out debug printout	2022-05-04 13:25:42 +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	e8e3138fba	Merge remote-tracking branch 'origin/develop' into mueller/pl-ss	2022-05-03 16:05:01 +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	0172351e89	additional try catch block	2022-05-02 22:58:06 +02:00
Robin Mueller	1f8a68dabe	re-use existing enum	2022-05-02 22:55:39 +02:00
Robin Mueller	9449919b2b	Heaters are own objects with HealthIF now	2022-05-02 22:45:27 +02:00
Robin Mueller	b98c691c2b	added health helper to heater handler	2022-05-02 17:51:00 +02:00
Robin Mueller	238afbaa8b	add health IF to heater handler	2022-05-02 17:37:00 +02:00
Robin Müller	a54d89c90f	Merge branch 'develop' into mueller/rw-ass	2022-05-02 15:55:41 +02:00
Jakob Meier	7a6b45b102	removed debug print	2022-05-02 14:43:53 +02:00
Jakob Meier	2f90c3e937	removed debug print	2022-05-02 13:51:56 +02:00
Jakob Meier	5f6a8fa37d	bugfix pcdu handler command queue reading	2022-05-02 13:50:44 +02:00
Jakob Meier	690b41777b	bugfix pcdu handler command queue reading	2022-05-02 13:48:34 +02:00
Robin Mueller	0e97c4ad9a	Merge branch 'mueller/acs-ss-init' into mueller/pl-ss	2022-05-02 12:55:15 +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
Jakob Meier	be752997eb	fixed merge conflicts	2022-04-30 19:12:21 +02:00
Irini Kosmidou	f2cb43a52f	scexDataHandler	2022-04-29 15:46:16 +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
Robin Mueller	d0b7531e48	create and assign gomspace power fdir	2022-04-28 15:58:31 +02:00
Robin Mueller	7e230b64ea	create and add syrlinks fdir	2022-04-28 15:29:57 +02:00
Robin Mueller	7e2a993211	create rudimentary syrlinks fdir	2022-04-28 15:25:03 +02:00
Robin Mueller	2b33d8772c	fixes most warnings for host build	2022-04-26 10:37:25 +02:00
Robin Mueller	f5723dc181	continued pl ss	2022-04-25 18:44:38 +02:00
Robin Mueller	f014e2d5c7	system folder restructuring	2022-04-25 10:36:03 +02:00
Robin Mueller	974ff0a13e	make RW handler more generic	2022-04-22 11:29:51 +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
Irini Kosmidou	578899b5a5	scexhelper	2022-04-21 19:47:09 +02:00
Jakob Meier	a8f5a4054f	Merge branch 'develop' into meier/plocSupvUpdate	2022-04-21 17:34:26 +02:00
Jakob.Meier	daf50a83fd	Merge pull request 'fix initializer list order' (#215) from mueller/imtq-order-fix into develop ... Reviewed-on: #215 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-04-21 11:23:09 +02:00
Robin Mueller	9c54696d91	fix out-of-bounds read	2022-04-21 10:25:51 +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	1fb5b48455	fix initializer list order	2022-04-19 17:18:31 +02:00
Jakob Meier	1ce45acba3	merged develop	2022-04-17 14:52:43 +02:00
Robin Mueller	01f812b932	reorder fix	2022-04-15 01:42:00 +02:00
Robin Mueller	5c3e91b5aa	Merge remote-tracking branch 'origin/develop' into irini	2022-04-15 01:40:00 +02:00
Robin Mueller	57cc77e197	fixed some tiny bugs	2022-04-15 01:39:47 +02:00
Robin Mueller	1db5d278f6	switcher handling extension	2022-04-14 11:17:07 +02:00
Robin Mueller	655497934b	apply afmt	2022-04-13 18:55:49 +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
Robin Mueller	a14ca283cc	using vector for convert enables	2022-04-12 16:36:04 +02:00
Robin Mueller	2529ed905c	some important bugfixes	2022-04-12 16:11:04 +02:00
Robin Mueller	2cd5450333	bugfix for pool ID	2022-04-12 16:00:54 +02:00
Robin Mueller	df38903fe9	some warning fixes for release build	2022-04-11 17:16:25 +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
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	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	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	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
Robin Mueller	0e7cd7de6f	add p60 boot count broadcast	2022-04-07 13:11:20 +02:00
Robin Mueller	d570b5c460	use different severities	2022-04-07 13:08:20 +02:00
Robin Mueller	64b3afae22	new event for battery mode: broadcast and changed	2022-04-07 13:07:28 +02:00
Robin Mueller	5e4c3728ed	split up p60 hk packets	2022-04-07 12:53:51 +02:00
Robin Mueller	4e3fa54ae2	split P60 dock HK into core and aux HK	2022-04-07 12:22:08 +02:00
Robin Mueller	66627741f9	periodic HK definitions for all device handlers	2022-04-07 11:53:21 +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
Jakob.Meier	569735474a	Merge pull request 'HK handling improvements' (#198) from mueller/improve-pcdu-hk-handling into develop ... Reviewed-on: #198 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-04-07 10:57:51 +02:00
Robin Mueller	bc47402a6d	run auto-formatter	2022-04-07 09:57:52 +02:00
Robin Mueller	c6e16e0866	resolve merge conflict, ran afmt	2022-04-07 09:57:19 +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
Robin Mueller	834e935c64	switch handling working now	2022-04-07 00:14:18 +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
Robin Mueller	f325d139da	p60 dock HK does not need to be diagnostic	2022-04-06 12:10:22 +02:00
Robin Mueller	65d504bed1	p60 dock HK is diagnostic again	2022-04-05 19:49:57 +02:00
Robin Mueller	3cfd0deb22	set p60 dock HK vars to valid	2022-04-05 19:29:09 +02:00
Jakob Meier	d48ec92d09	fixed conflicts	2022-04-05 13:57:16 +02:00
Jakob Meier	1f4328d9a0	prepared pr	2022-04-05 11:52:01 +02:00
Jakob Meier	40403b81c3	debug flag	2022-04-05 08:38:36 +02:00