1711 Commits

Author	SHA1	Message	Date
Robin Mueller	699fc9a861	some HK corrections	2023-05-12 12:14:37 +02:00
Robin Mueller	66c9a5eea3	some more fixes	2023-05-12 11:55:33 +02:00
Robin Mueller	af20a36634	Merge branch 'ploc_mpsoc_update_2' into ploc_mpsoc_dir_content_report_2	2023-05-12 11:48:43 +02:00
Robin Mueller	ba060be0d6	some more minor improvements	2023-05-12 11:44:39 +02:00
Robin Mueller	1820dae3d4	horrible	2023-05-12 11:06:26 +02:00
Robin Mueller	412aaf93bd	Merge branch 'ploc-code-improvenemts-2' into ploc_mpsoc_update_2	2023-05-12 09:37:13 +02:00
Robin Mueller	cbf3315e16	Various fixes and improvements	2023-05-12 09:32:24 +02:00
Robin Mueller	7e6c25901b	Squashed commit of the following: ... commit c137df64ab Merge: a919b3d1 4179e8e1 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:38:52 2023 +0200 Merge remote-tracking branch 'origin/main' into update_ptme_code commit 4179e8e124 Merge: 26f5eff6 51f9d5e1 Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:35:54 2023 +0200 Merge pull request 'This bugfix might be super important' (#621) from possible_bugfix_dual_lane_assy into main Reviewed-on: #621 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de> Reviewed-by: Steffen Gaisser <gaisser@irs.uni-stuttgart.de> commit 51f9d5e1fe Merge: a17f57cb 26f5eff6 Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:35:10 2023 +0200 Merge branch 'main' into possible_bugfix_dual_lane_assy commit a17f57cbb5 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:34:45 2023 +0200 changelog commit 26f5eff6d5 Merge: 4074e084 8a0f13ba Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:32:03 2023 +0200 Merge pull request 'More System Modes' (#612) from more-system-modes into main Reviewed-on: #612 commit 8a0f13bafb Merge: 14baa356 4074e084 Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:31:51 2023 +0200 Merge branch 'main' into more-system-modes commit 14baa3563c Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:30:09 2023 +0200 hello commit 7045b6034a Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:18:47 2023 +0200 changelog commit 37b9615525 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:18:16 2023 +0200 changelog commit 4074e08480 Merge: 862a4f26 38686ac3 Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:12:46 2023 +0200 Merge pull request 'Adaption for EM: Add P60 dock without ACU' (#620) from adaption_em_p60_dock_without_acu into main Reviewed-on: #620 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de> commit 23796345d9 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:04:30 2023 +0200 changelog and stop payload tracking commit b10275ca43 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 14:28:05 2023 +0200 changelog commit 383849c5cb Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 14:25:14 2023 +0200 that is more robust commit c66cef9129 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 14:23:21 2023 +0200 changelog commit 02ea8a7298 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 14:22:21 2023 +0200 changelog commit 38686ac3f6 Merge: 189a3126 74d5d709 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 14:04:03 2023 +0200 Merge branch 'possible_bugfix_dual_lane_assy' into adaption_em_p60_dock_without_acu commit 74d5d70973 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 13:58:08 2023 +0200 this bugfix might be super important commit 48355e8263 Merge: 5691fe8e 862a4f26 Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 10:25:50 2023 +0200 Merge branch 'main' into more-system-modes commit 189a312628 Merge: a1279428 862a4f26 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 10:23:46 2023 +0200 Merge remote-tracking branch 'origin/main' into adaption_em_p60_dock_without_acu commit a12794281b Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 10:20:31 2023 +0200 changelog commit fcaabb4e42 Merge: 6c326489 4aafca64 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 10:20:02 2023 +0200 Merge remote-tracking branch 'origin/main' into adaption_em_p60_dock_without_acu commit 6c326489cb Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 10:18:46 2023 +0200 adapt EM SW: GS PCDU added, but use dummy for ACU commit 862a4f2685 Merge: 4aafca64 2daca272 Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 09:37:55 2023 +0200 Merge pull request 'Host SW bugfixes' (#618) from try_fix_host_obsw into main Reviewed-on: #618 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de> commit 5691fe8e72 Merge: 097be17a 4aafca64 Author: meggert <eggertm@irs.uni-stuttgart.de> Date: Thu Apr 27 15:40:31 2023 +0200 Merge branch 'main' into more-system-modes commit 2daca272f8 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Thu Apr 27 11:29:18 2023 +0200 changelog commit 03762f9620 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 17:38:06 2023 +0200 lower live TM handler frequency commit a296f16e5c Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 17:36:38 2023 +0200 host SW works properly again commit 83f07a6e16 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 17:26:32 2023 +0200 configurable event manager queue depth commit 00dab64628 Merge: 641b8e84 4aafca64 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 17:03:35 2023 +0200 Merge remote-tracking branch 'origin/main' into try_fix_host_obsw commit 4aafca64a6 Merge: f271242d 6901eae8 Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 17:03:01 2023 +0200 Merge pull request 'EM adaptions' (#619) from em_adaptions into main Reviewed-on: #619 commit 6901eae816 Merge: 7d630ebc f271242d Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 17:02:24 2023 +0200 Merge remote-tracking branch 'origin/main' into em_adaptions commit 7d630ebcf3 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 17:00:04 2023 +0200 EM adaptions commit 641b8e847d Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 16:41:40 2023 +0200 add back tm funnel handler for hosted build commit 1314268682 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 16:23:50 2023 +0200 host build requires dedicated live TM task.. commit 4040304ef0 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 13:15:42 2023 +0200 this is annoying commit a919b3d164 Merge: e22f2a53 9672d6d6 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 11:11:30 2023 +0200 Merge remote-tracking branch 'origin/develop' into update_ptme_code commit 9672d6d6cc Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 11:11:09 2023 +0200 changelog commit e22f2a53ea Merge: b076e80b 0eb6b7cc Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 11:05:58 2023 +0200 Merge remote-tracking branch 'origin/develop' into update_ptme_code commit b076e80b44 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 11:04:10 2023 +0200 changelog commit 269aa6f7b0 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 11:03:42 2023 +0200 changelog commit caae2b4ba9 Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 11:02:24 2023 +0200 update PTME code commit 097be17a29 Author: meggert <eggertm@irs.uni-stuttgart.de> Date: Wed Apr 19 15:07:21 2023 +0200 added remaining acs modes as system modes	2023-05-12 09:13:02 +02:00
Robin Mueller	92fd1548cb	dynamically enable/disable MPSoC	2023-05-11 21:28:50 +02:00
Robin Mueller	bacc46a8dc	i think that should do the job	2023-05-11 21:28:50 +02:00
Robin Mueller	0fb07fd3d5	implement dir content report in OBSW	2023-05-11 21:28:50 +02:00
Robin Mueller	98a858876a	add some more commands	2023-05-11 21:28:50 +02:00
Robin Mueller	d4fc95ed9f	start adding dir content report	2023-05-11 21:28:50 +02:00
Robin Mueller	2e00e10e09	request HK regularly now	2023-05-11 21:28:50 +02:00
Robin Mueller	4a3af32a65	MPSoC HK packet	2023-05-11 21:28:46 +02:00
Robin Mueller	66ca156ab3	mpsoc update	2023-05-11 21:17:14 +02:00
Robin Mueller	d67414e829	bugfxi by marius	2023-05-11 21:17:14 +02:00
Robin Mueller	0fd18204bf	add new set	2023-05-11 21:17:14 +02:00
Robin Mueller	f225d9a7c1	add HK request command	2023-05-11 21:17:14 +02:00
Robin Mueller	f72c797f53	this should do the job	2023-05-11 20:21:44 +02:00
Robin Mueller	98ef38f3eb	i think that should do the job	2023-05-11 20:20:51 +02:00
Robin Mueller	827419ef34	implement dir content report in OBSW	2023-05-11 20:20:51 +02:00
Robin Mueller	5b4261104e	add some more commands	2023-05-11 20:20:47 +02:00
Robin Mueller	ff175170aa	start adding dir content report	2023-05-11 20:19:46 +02:00
Robin Mueller	e4431d20c4	driving code almost done as well	2023-05-11 20:19:19 +02:00
Robin Mueller	119afe6148	now the helper just needs to be driven	2023-05-11 20:19:19 +02:00
Robin Mueller	ff47fafdc2	first flash read impl almost done	2023-05-11 20:19:19 +02:00
Robin Mueller	0a109e552d	start adding flash read	2023-05-11 20:19:19 +02:00
Robin Mueller	2b36195dac	dynamically enable/disable MPSoC	2023-05-11 20:14:17 +02:00
Robin Mueller	758ed22b08	request HK regularly now	2023-05-11 20:14:17 +02:00
Robin Mueller	30fba0456b	MPSoC HK packet	2023-05-11 20:14:12 +02:00
Robin Mueller	98e69b9a6a	mpsoc update	2023-05-11 20:13:31 +02:00
Robin Mueller	531f87cd76	bugfxi by marius	2023-05-11 20:13:31 +02:00
Robin Mueller	3a0db9c9ad	add new set	2023-05-11 20:13:31 +02:00
Robin Mueller	c8d1ce40ba	add HK request command	2023-05-11 20:13:31 +02:00
Robin Mueller	ab588b4844	fixes and tweaks TCS and EM build	2023-04-17 11:35:10 +02:00
Robin Mueller	500b3b6fc6	re-run generators. bump tmtc	2023-04-14 20:24:37 +02:00
Robin Mueller	4de71062af	fix host build	2023-04-14 20:11:33 +02:00
Robin Mueller	379fd6046e	ge-generate files	2023-04-14 20:08:05 +02:00
Robin Mueller	7f1fe3a2d8	bugfix	2023-04-14 19:58:22 +02:00
Robin Mueller	e023220be4	better reset handling	2023-04-14 19:42:11 +02:00
Robin Mueller	62d18826f1	proper post reset handling for PDEC reset	2023-04-14 19:29:22 +02:00
Robin Mueller	644a768778	re-run generators	2023-04-14 19:02:18 +02:00
Robin Mueller	756ea6d90d	Merge remote-tracking branch 'origin/develop' into feature_com_pdec_fdir	2023-04-14 19:01:22 +02:00
Robin Müller	5e53795cbe	Merge branch 'develop' into tmp_dev_custom_fdir	2023-04-14 18:55:36 +02:00
Robin Mueller	ca30fed4c3	Merge remote-tracking branch 'origin/develop' into str_update_v10.7	2023-04-14 18:53:45 +02:00
Robin Mueller	4bfd675073	Merge remote-tracking branch 'origin/develop' into tmp_dev_custom_fdir	2023-04-14 18:48:20 +02:00
Robin Mueller	b0a2b5886f	hotfix ACS/SUS	2023-04-14 18:45:58 +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 Müller	b5e1e0c31b	Merge branch 'develop' into feature_com_pdec_fdir	2023-04-14 14:29:59 +02:00
Robin Mueller	dc1e51891e	added rest of necessary logic	2023-04-14 13:26:44 +02:00
Robin Mueller	4e686b4ad0	better PDEC FDIR	2023-04-14 13:11:11 +02:00
Robin Mueller	33773179a7	custom FDIR for tmp devices	2023-04-13 23:54:23 +02:00
Robin Mueller	af354bd9fb	systemctl helper	2023-04-13 23:24:32 +02:00
Robin Mueller	3e3ac9f5be	conditional build of STR components	2023-04-13 21:14:38 +02:00
Robin Mueller	f7bc052070	stupid submodules	2023-04-13 17:55:56 +02:00
Robin Mueller	8620bd0283	avoid faulty reply for STR special requests	2023-04-13 12:35:56 +02:00
Robin Mueller	ea606ce217	adaptions and possible small fix for update process	2023-04-13 12:08:31 +02:00
Robin Mueller	c9cc1d4cfe	done	2023-04-11 22:58:13 +02:00
Robin Mueller	ff28b628a4	leave that value	2023-04-11 18:17:30 +02:00
Robin Mueller	7c36660000	that was nasty	2023-04-11 18:15:12 +02:00
Robin Mueller	d42b6798e0	better reply result handling	2023-04-11 17:29:32 +02:00
Robin Mueller	b82f19ea50	reset reply result on mode change	2023-04-11 17:18:12 +02:00
Robin Mueller	271830422a	add a way to detect off devices	2023-04-11 17:12:31 +02:00
Robin Mueller	6b671cfa65	bump eive-tmtc, compile fix	2023-04-07 18:19:33 +02:00
Robin Mueller	3408624056	prep v1.44.9	2023-04-07 17:43:48 +02:00
Robin Mueller	ebcd0cdfa1	remove obsolete code	2023-04-07 17:20:20 +02:00
Robin Mueller	9960fc8ce7	a bit more thread safety	2023-04-07 17:15:40 +02:00
Robin Mueller	353b9bd322	add some thread safety	2023-04-07 17:10:30 +02:00
Robin Mueller	cd8bbaf1f9	RW fixes and test	2023-04-07 17:02:37 +02:00
Robin Mueller	55dd4b28ee	added missing event	2023-04-07 11:06:43 +02:00
Robin Mueller	f9ed42f8a5	re-ran generators	2023-04-07 11:04:13 +02:00
Robin Mueller	2968856d71	finally works	2023-04-06 22:35:23 +02:00
Robin Mueller	3299260653	fix GPS HK enabling	2023-04-04 20:59:25 +02:00
Robin Mueller	69bbe4ea39	update HK frequencies	2023-04-04 19:18:53 +02:00
Robin Mueller	e10359077c	finally works	2023-04-04 14:01:13 +02:00
Robin Mueller	143fb44037	try something	2023-04-04 13:41:55 +02:00
Robin Mueller	9270165bf8	fix STR bugs and improve code ... - Reset reply size after returning a reply - Reset data link layer and flush RX for regular commands and before performing special commands to ensure consistent start state - Clean up DHB a bit - Set STR dev to OFF in assembly when it is faulty.	2023-04-04 01:35:05 +02:00
Robin Mueller	5267bfcd82	Merge remote-tracking branch 'origin/develop' into imtq_lower_integration_time	2023-04-03 15:34:51 +02:00
Robin Mueller	1b2dd12e61	remove double lock	2023-04-03 15:29:18 +02:00
Robin Mueller	958abadd65	somethings buggy	2023-04-03 15:16:53 +02:00
Robin Müller	fba856a9a9	Merge branch 'develop' into imtq_lower_integration_time	2023-04-03 15:13:00 +02:00
Robin Müller	ba7a2c3ece	Merge branch 'develop' into thermal_controller	2023-04-03 15:12:30 +02:00
Robin Mueller	e9c5bfe324	event spam has stopped	2023-04-03 14:09:54 +02:00
Robin Mueller	5dcafa1de0	lower integration time	2023-04-03 10:12:19 +02:00
Robin Mueller	7522eac9eb	done	2023-04-02 23:43:41 +02:00
Robin Mueller	847e3bb51d	prep imtq startup handling	2023-04-02 20:12:24 +02:00
Robin Mueller	703eaaa9aa	poll threshold param cmd handling	2023-04-02 15:32:04 +02:00
Robin Mueller	cab55c79dc	add SW IF for manipulating poll threshold	2023-04-02 14:22:52 +02:00
Robin Mueller	62952b89b1	Merge remote-tracking branch 'origin/develop' into thermal_controller	2023-04-01 16:00:15 +02:00
Robin Mueller	601318d7eb	prep v1.42.0	2023-04-01 15:33:02 +02:00
Robin Mueller	d1775a52aa	Merge remote-tracking branch 'origin/develop' into thermal_controller	2023-03-31 19:18:05 +02:00
Robin Mueller	2f9de8c36e	some tweaks	2023-03-31 17:41:01 +02:00
Robin Mueller	f51656a813	add back volatile keyword	2023-03-31 17:36:49 +02:00
Robin Mueller	bb7a616283	some minor tweaks	2023-03-31 17:35:53 +02:00
Robin Mueller	028f94a2f7	Merge remote-tracking branch 'origin/develop' into papb_multi_byte_write_support	2023-03-31 17:34:35 +02:00
Robin Mueller	62ba7a1f80	Merge remote-tracking branch 'origin/develop' into papb_multi_byte_write_support	2023-03-31 17:29:10 +02:00
Robin Mueller	55a22c840c	PTME_LOCK atomic boolean and related handling	2023-03-31 16:51:30 +02:00
Robin Mueller	caa7c20adf	tweaks	2023-03-31 15:12:05 +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	74a38dc76b	re-run generators	2023-03-30 17:22:28 +02:00
Robin Mueller	5f6f85a778	done	2023-03-30 17:16:59 +02:00
Robin Mueller	27370fcd44	multi byte write support but does not work..	2023-03-30 13:36:44 +02:00
Robin Mueller	770fee0097	some minor tweaks	2023-03-29 17:38:38 +02:00
Robin Mueller	e2b36313c1	afmt	2023-03-28 22:28:58 +02:00
Robin Mueller	9cfee12774	docs + TODO	2023-03-28 22:04:40 +02:00
Robin Mueller	4d1fbbcabd	re-generate files	2023-03-28 21:51:54 +02:00
Robin Mueller	053cfed093	docs	2023-03-28 21:49:16 +02:00
Robin Mueller	d09b53f6df	ns delay between gpio polls solves it	2023-03-28 21:45:04 +02:00
Robin Mueller	28d7dcf177	Merge remote-tracking branch 'origin/develop' into thermal_controller	2023-03-28 16:37:09 +02:00
Robin Mueller	1f6c986a0c	add instrumentation code	2023-03-28 14:59:31 +02:00
Robin Mueller	534945cfec	last know working cfg for slow downlink	2023-03-27 22:57:01 +02:00
Robin Mueller	00214dc378	found some more bugs	2023-03-27 21:39:37 +02:00
Robin Mueller	fb324516bb	this is insane	2023-03-27 21:23:09 +02:00
Robin Mueller	7023fe5c42	this is weird	2023-03-27 18:59:31 +02:00
Robin Mueller	1727168ee5	now its getitng weird	2023-03-27 18:39:53 +02:00
Robin Mueller	f1774fe80f	docs	2023-03-27 18:13:00 +02:00
Robin Mueller	363fc89209	thsi is cleaner	2023-03-27 17:43:52 +02:00
Robin Mueller	1a0e632d2f	go down to nanoseconds	2023-03-27 17:42:54 +02:00
Robin Mueller	c53c052876	lower delays	2023-03-27 17:02:02 +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	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	bee8838010	Merge remote-tracking branch 'origin/develop' into feature_allow_side_switch	2023-03-24 21:09:43 +01:00
Robin Mueller	59d40a6794	finish acs and com	2023-03-24 21:01:00 +01:00
Robin Mueller	29ba7b87b7	re-run generators	2023-03-24 20:51:03 +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	9dc0c5bde0	cleaning up com	2023-03-24 19:37:03 +01:00
Robin Mueller	ec40044b6e	some bugfixes	2023-03-24 19:14:27 +01:00
Robin Mueller	bea0c31a12	Merge remote-tracking branch 'origin/develop' into feature_allow_side_switch	2023-03-24 17:29:13 +01:00
Robin Mueller	fe1fb9425e	bugfix fsfwgen	2023-03-24 15:39:45 +01:00
Robin Mueller	613d7738a8	update generates files	2023-03-24 15:02:13 +01:00
Robin Mueller	b32e0ef4fb	Merge remote-tracking branch 'origin/develop' into mekf-invalid-reset-counter	2023-03-24 15:01:01 +01:00
Robin Müller	7e35a0a481	Merge branch 'develop' into custom_csp_router_task	2023-03-24 14:55:02 +01:00
Robin Mueller	7dc587e2df	some bugfixes	2023-03-24 14:53:07 +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	349332c1e1	adapt all priorities	2023-03-24 13:26:27 +01:00