1562 Commits

Author	SHA1	Message	Date
Robin Mueller	3d07814efb	Merge remote-tracking branch 'origin/main' into internal-error-reporter-set	2023-06-22 18:39:34 +02:00
Robin Müller	4dad1df13b	Merge branch 'main' into v4.0.0-dev	2023-06-22 17:36:19 +02:00
Robin Mueller	b2b7900720	reduce GNSS pin reset assertion time	2023-06-22 16:54:49 +02:00
Robin Müller	4c66d8fb5f	Merge branch 'v4.0.0-dev' into extend-cp-helper	2023-06-22 16:44:39 +02:00
Robin Mueller	a0d559a5fd	Merge branch 'v4.0.0-dev' into extend-cp-helper	2023-06-22 16:24:24 +02:00
Robin Mueller	a3b140b680	internal error reporter extension	2023-06-22 16:09:24 +02:00
Robin Mueller	788fbb72f0	that should do the job	2023-06-22 14:25:11 +02:00
Robin Mueller	db3a4955c2	core ctrl provides more info on reboot	2023-06-22 14:06:34 +02:00
Robin Mueller	2d4a3c0ee2	new FW info event	2023-06-21 19:01:44 +02:00
Robin Mueller	af8b4d5bc8	remove commented code	2023-06-21 13:53:34 +02:00
Robin Mueller	49e15de08a	Merge branch 'v3.2.0-dev' into v3.3.0-dev	2023-06-20 20:56:37 +02:00
Robin Mueller	6ef8c62aca	BPX batt handler	2023-06-20 20:53:49 +02:00
Robin Mueller	695a663a15	and put everything back	2023-06-20 20:52:01 +02:00
Robin Mueller	5e4032032f	that should do the job	2023-06-20 19:39:22 +02:00
Robin Mueller	3ee9a914cc	Merge remote-tracking branch 'origin/main' into sus-vector-fix-new-v3.1.1	2023-06-20 18:21:12 +02:00
Robin Mueller	df4e657ec3	create TCS CTRL TMP1075 PLCDU 1 se tdynamically	2023-06-18 17:36:50 +02:00
Robin Mueller	ecb8de1550	need to verify some things here later..	2023-06-18 16:23:08 +02:00
Robin Mueller	a87a01d072	make it work for EM	2023-06-18 14:02:53 +02:00
Robin Mueller	07bb293816	tmp1075 workssssss	2023-06-18 13:38:00 +02:00
Robin Mueller	4155aa8776	v3.1.1 reduced to the bare minimum	2023-06-17 19:17:50 +02:00
Robin Mueller	269d5f6a0a	stupid tmps	2023-06-17 17:01:01 +02:00
Robin Mueller	d6dd943ebf	tmp is back in the house	2023-06-17 15:28:05 +02:00
Robin Mueller	1b919ceaec	swap i2cs	2023-06-16 13:54:50 +02:00
Robin Mueller	8da5f4dd44	add PS I2C resetn	2023-06-15 08:39:06 +02:00
Robin Mueller	55d6edcd66	Merge remote-tracking branch 'origin/main' into v4.0.0-dev	2023-06-11 18:54:04 +02:00
Robin Mueller	45b9e88915	route CFDP to live VC0	2023-06-09 18:25:59 +02:00
Robin Mueller	9e787a7e44	Merge branch 'v3.0.0-dev' into v4.0.0-dev	2023-06-09 18:10:38 +02:00
Robin Müller	b2535662e6	Merge branch 'v3.0.0-dev' into core-ctrl-dir-listing-fsm	2023-06-09 14:44:44 +02:00
Robin Mueller	171d4976c3	removing printout	2023-06-09 14:40:47 +02:00
Robin Mueller	019d1a7b0d	that should do the job	2023-06-09 13:51:10 +02:00
Robin Mueller	deb154770d	increased service 1 queue depth	2023-06-07 16:21:51 +02:00
Robin Mueller	dcf3b1b1fe	added debug statement for testing	2023-06-07 15:55:26 +02:00
Robin Mueller	06b381d965	dir listing dump state machine	2023-06-07 14:20:58 +02:00
Robin Mueller	aec383b974	add force flag for cp helper	2023-06-06 11:11:16 +02:00
Robin Mueller	9711bb6300	Merge branch 'v4.0.0-dev' into update-ptme-code-2	2023-05-31 11:50:59 +02:00
Robin Mueller	ada77ed53b	ACS board still required	2023-05-30 09:22:59 +02:00
Robin Mueller	f3cc406495	Merge branch 'v2.1.0-dev' into update-ptme-code-2	2023-05-27 17:03:58 +02:00
Robin Mueller	71eca867ea	i think the rad sesnor messing everything up	2023-05-27 17:03:33 +02:00
Robin Mueller	016e9dd2df	Merge branch 'v2.2.0-dev' into update-ptme-code-2	2023-05-25 10:34:04 +02:00
Robin Müller	832140935f	Merge branch 'v2.1.0-dev' into imtq-enable-hk-sets	2023-05-24 14:13:29 +02:00
Robin Mueller	ee0646caf1	enable IMTQ HK sets	2023-05-24 11:04:07 +02:00
Robin Mueller	f5a7fd2ffe	Merge branch 'oh-no-no-no-bug' into update-ptme-code-2	2023-05-23 19:16:36 +02:00
Robin Mueller	7ac2271eab	buuuug	2023-05-23 19:12:35 +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	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	9fde16c912	disable missed deadline printing by default	2023-05-15 10:29:15 +02:00
Robin Mueller	9391949369	speed up payload components a bit	2023-05-12 12:39:54 +02:00
Robin Mueller	29eb0e736f	never add CAM switcher dummy	2023-05-12 09:40:31 +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
Robin Mueller	2e6a93c479	ACS board and init payload	2023-05-11 19:33:06 +02:00
meggert	1602d5d318	stuff	2023-05-11 19:33:06 +02:00
Robin Mueller	51b0d897a1	adapt EM SW: GS PCDU added, but use dummy for ACU	2023-05-11 19:32:37 +02:00
Robin Mueller	7dfc7dc8c1	configurable event manager queue depth	2023-05-11 19:31:23 +02:00
Robin Mueller	aa63bd1fa5	EM adaptions	2023-05-11 19:31:23 +02:00
Robin Mueller	f4fedd20c9	added more bugfixes for list dir dump	2023-04-16 02:56:46 +02:00
Robin Mueller	767a0eda30	hopefully last bugfix	2023-04-15 23:11:00 +02:00
Robin Mueller	f2c71d962a	done soon	2023-04-15 23:00:34 +02:00
Robin Mueller	7bf880a29f	use gzip directly	2023-04-15 22:17:50 +02:00
Robin Mueller	0185691dba	add more context info for dumped dir listing	2023-04-15 20:51:46 +02:00
Robin Mueller	143002de48	some improvements	2023-04-15 13:06:16 +02:00
Robin Mueller	d439aedee7	bugfix	2023-04-15 13:03:44 +02:00
Robin Mueller	b8d010cd39	CHANGELOG + FS helpers	2023-04-15 13:01:41 +02:00
Robin Mueller	b98f91f6c1	hopefully last EM fix for v2.0	2023-04-14 21:44:23 +02:00
Robin Müller	5e53795cbe	Merge branch 'develop' into tmp_dev_custom_fdir	2023-04-14 18:55:36 +02:00
Robin Mueller	33d60ccf7f	v10.7	2023-04-14 18:31:56 +02:00
Robin Mueller	9b1d4de9c5	Merge remote-tracking branch 'origin/develop' into tmp_dev_custom_fdir	2023-04-14 14:44:40 +02:00
Robin Mueller	bc6531f7a5	bugfix for shell cmd executors	2023-04-14 00:29:21 +02:00
Robin Mueller	e17b8d2ec4	add non-blocking shell cmd executor	2023-04-14 00:21:28 +02:00
Robin Mueller	33773179a7	custom FDIR for tmp devices	2023-04-13 23:54:23 +02:00
Robin Mueller	c5b26eade4	now it compiles	2023-04-13 23:34:11 +02:00
Robin Mueller	af354bd9fb	systemctl helper	2023-04-13 23:24:32 +02:00
Robin Müller	f14677ec4e	Merge branch 'develop' into continue_tcs_tests	2023-04-13 18:10:24 +02:00
Robin Mueller	dd211cdf54	afmt	2023-04-12 18:11:41 +02:00
Robin Mueller	2262a15e35	compile fix	2023-04-12 18:11:20 +02:00
Robin Mueller	41ec6dc0f2	set pref sd as param	2023-04-12 18:06:04 +02:00
Robin Mueller	8d9755c17f	Merge remote-tracking branch 'origin/develop' into continue_tcs_tests	2023-04-11 16:14:53 +02:00
Robin Müller	52620f3dda	Merge branch 'develop' into feature_custom_obsw_update_path	2023-04-11 16:12:28 +02:00
Robin Mueller	e01fe19d53	EM bugfix	2023-04-11 15:34:46 +02:00
Robin Mueller	af1d0759e1	remove re-declaration	2023-04-11 15:26:33 +02:00
Robin Mueller	af9f346698	use exceptionless API	2023-04-11 15:23:44 +02:00
Robin Mueller	2df556c5be	some bugfixes, seems to work now	2023-04-08 17:46:54 +02:00
Robin Mueller	aa43912279	everything except SDC switch looking good..	2023-04-08 17:13:42 +02:00
Robin Mueller	ece053e5c3	Merge remote-tracking branch 'origin/develop' into continue_tcs_tests	2023-04-08 15:57:06 +02:00
Robin Mueller	1c0fbace4d	Merge remote-tracking branch 'origin/develop' into feature_custom_obsw_update_path	2023-04-08 15:56:08 +02:00
Robin Mueller	10f552f56a	bugfix and simplifications for SDC state machine	2023-04-08 13:24:21 +02:00
Robin Mueller	310f8f5f3c	SDC state machine printouts	2023-04-08 11:53:44 +02:00
Robin Mueller	584b6e3038	changelog and tmtc bump	2023-04-08 11:40:23 +02:00
Robin Mueller	a81b24b67f	allow custom filename	2023-04-08 11:31:31 +02:00
Robin Mueller	6b671cfa65	bump eive-tmtc, compile fix	2023-04-07 18:19:33 +02:00
Robin Mueller	cd8bbaf1f9	RW fixes and test	2023-04-07 17:02:37 +02:00
Robin Müller	aacd4dc088	Merge branch 'develop' into continue_tcs_tests	2023-04-07 11:07:15 +02:00
Robin Mueller	aa78d744b4	compile fix	2023-04-06 19:23:45 +02:00
Robin Mueller	bfb91f1baa	fix for FM build	2023-04-06 18:06:56 +02:00
Robin Mueller	58aef99bbc	theoretically done	2023-04-06 17:49:34 +02:00
Robin Mueller	9020014245	added some more safety features	2023-04-06 17:01:28 +02:00
Robin Mueller	3bd434bbc3	I2C reboot procedure for EIVE system	2023-04-06 16:50:33 +02:00
Robin Mueller	d7dc3f34c7	consecutive cold test	2023-04-06 13:24:16 +02:00
Robin Mueller	397e23f1da	more TCS tests	2023-04-06 12:13:24 +02:00
meggert	9825a8583f	whoops	2023-04-05 09:45:42 +02:00
Robin Mueller	3299260653	fix GPS HK enabling	2023-04-04 20:59:25 +02:00
Robin Mueller	a0e531445a	Merge remote-tracking branch 'origin/develop' into update_hk_frequencies	2023-04-04 20:55:50 +02:00
Robin Mueller	57b41701ce	hopefully those were the last fixes	2023-04-04 20:34:28 +02:00
Robin Mueller	69bbe4ea39	update HK frequencies	2023-04-04 19:18:53 +02:00
Robin Mueller	f2a2c73984	Merge remote-tracking branch 'origin/develop' into tweak_syrlinks_hk	2023-04-04 18:53:14 +02:00
Robin Mueller	c4516f53b8	another include fix	2023-04-04 17:57:07 +02:00
Robin Mueller	f39981deca	include fix	2023-04-04 17:55:57 +02:00
Robin Mueller	8d4b980c32	this should fix some bugs	2023-04-04 16:46:07 +02:00
Robin Mueller	8404ce237b	something is wrong now	2023-04-03 18:54:47 +02:00
Robin Mueller	1610bdecf9	connect parent	2023-04-03 18:02:45 +02:00
Robin Mueller	f4b47a24c0	adaptions for EM build	2023-04-03 14:22:58 +02:00
Robin Mueller	d1775a52aa	Merge remote-tracking branch 'origin/develop' into thermal_controller	2023-03-31 19:18:05 +02:00
Robin Mueller	55a22c840c	PTME_LOCK atomic boolean and related handling	2023-03-31 16:51:30 +02:00
Robin Mueller	795486ae6c	trying to find out whats wrong	2023-03-31 12:11:31 +02:00
Robin Mueller	4b1221ab99	modes for VC/stores	2023-03-31 01:14:59 +02:00
Robin Mueller	f6f4db525c	read reg instead of polling GPIO	2023-03-30 23:52:37 +02:00
Robin Mueller	5f6f85a778	done	2023-03-30 17:16:59 +02:00
Robin Mueller	a72805d137	move STR assy	2023-03-29 11:44:13 +02:00
Robin Mueller	def7eca2f2	cleaning up a bit	2023-03-28 19:38:02 +02:00
Robin Mueller	28d7dcf177	Merge remote-tracking branch 'origin/develop' into thermal_controller	2023-03-28 16:37:09 +02:00
Robin Mueller	33babebb6f	cancel events	2023-03-28 15:15:38 +02:00
Robin Müller	861bee8083	Merge branch 'develop' into thermal_controller	2023-03-26 16:58:30 +02:00
Robin Müller	bb8d4fbc57	Merge branch 'develop' into feature_set_up_periodic_hk	2023-03-26 16:58:18 +02:00
Robin Mueller	11acfbbc91	bugfix EM build	2023-03-26 16:54:40 +02:00
Robin Mueller	3e7901f060	Merge remote-tracking branch 'origin/develop' into thermal_controller	2023-03-26 16:52:39 +02:00
Robin Mueller	58c343b8de	Merge remote-tracking branch 'origin/develop' into feature_set_up_periodic_hk	2023-03-26 16:45:28 +02:00
Robin Mueller	63b50e6101	clean up op done	2023-03-26 16:42:00 +02:00
Robin Mueller	e7eaaa9295	finished power clean up	2023-03-26 16:16:54 +02:00
Robin Mueller	7c700a9e19	clean up power code	2023-03-26 16:13:54 +02:00
Robin Mueller	079da3b0e4	more ACS cleaning ... - STR code is now in mission folder, but still only conpiled for Q7S code because wire library is proprietary	2023-03-26 16:05:01 +02:00
Robin Mueller	cb2fe300b2	enable periodic HK	2023-03-26 15:28:00 +02:00
Robin Mueller	3d93431278	prep v1.40.0	2023-03-24 21:34:03 +01:00
Robin Mueller	e69812b48b	improve sd lock handling again	2023-03-24 21:29:13 +01:00
Robin Mueller	0301c18af2	resolve some merge conflicts	2023-03-24 21:20:27 +01:00
Robin Mueller	f71972609c	Merge remote-tracking branch 'origin/develop' into thermal_controller	2023-03-24 21:15:29 +01:00
Robin Mueller	6331aef987	EM bugfix	2023-03-24 21:05:11 +01:00
Robin Mueller	59d40a6794	finish acs and com	2023-03-24 21:01:00 +01:00
Robin Mueller	87e1746d71	done	2023-03-24 20:50:33 +01:00
Robin Mueller	2fa5024236	more cleaning	2023-03-24 19:53:09 +01:00
Robin Mueller	3135bb923e	afmt	2023-03-24 19:49:08 +01:00
Robin Mueller	d6409b6112	em adaption	2023-03-24 19:47:48 +01:00
Robin Mueller	9dc0c5bde0	cleaning up com	2023-03-24 19:37:03 +01:00
Robin Müller	15b3144760	Merge branch 'develop' into refactoring_syrlinks_com_if	2023-03-24 14:48:08 +01:00
Robin Mueller	74603f9969	Merge remote-tracking branch 'origin/develop' into refactoring_syrlinks_com_if	2023-03-24 14:22:12 +01:00
Robin Mueller	52c439c501	Merge remote-tracking branch 'origin/develop' into custom_csp_router_task	2023-03-24 14:17:51 +01:00
Robin Mueller	012e173487	okay this should work	2023-03-24 14:11:08 +01:00
Robin Mueller	349332c1e1	adapt all priorities	2023-03-24 13:26:27 +01:00
Robin Mueller	d226726a27	this is going to be annyoing	2023-03-24 11:58:45 +01:00