3586 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Mueller	214428295b	only do time file handling with mounted SD card	2022-10-12 12:01:48 +02:00
Robin Mueller	bcf7fa216a	bump changelog	2022-10-11 23:10:09 +02:00
Robin Mueller	5824b28993	Merge remote-tracking branch 'origin/main' into develop	2022-10-11 23:08:51 +02:00
Robin Mueller	f196838f6b	bump revision	2022-10-11 23:08:37 +02:00
Robin Mueller	607822b413	fix in SDC manager	2022-10-11 23:07:44 +02:00
Robin Mueller	21258c2d79	fix core controller	2022-10-11 22:58:31 +02:00
Robin Mueller	cca96f2a96	scoped thermal ctrl locks	2022-10-10 18:29:06 +02:00
Robin Mueller	7f3d827a6e	move finish action call	2022-10-10 18:00:43 +02:00
Robin Müller	28881b99d1	Merge pull request 'v1.14.0' (#304) from develop into main ... Reviewed-on: #304	2022-10-10 17:46:37 +02:00
Robin Mueller	74f053ae5d	bump subversion	2022-10-10 17:44:58 +02:00
Robin Mueller	964e0a3d8e	re-run afmt	2022-10-10 17:41:52 +02:00
Robin Müller	4f7ad7154b	Merge pull request 'scex code' (#303) from scex-additions into develop ... Reviewed-on: #303 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2022-10-10 17:36:36 +02:00
Robin Mueller	12feb989ae	small tweaks	2022-10-10 17:36:01 +02:00
Robin Mueller	5b4f97358f	bump fsfw	2022-10-10 15:32:03 +02:00
Robin Mueller	57dff4258a	disable parity bit	2022-10-10 15:21:41 +02:00
Robin Mueller	c82c4cf9d1	Merge remote-tracking branch 'origin/develop' into scex-additions	2022-10-10 11:16:19 +02:00
Jakob Meier	bba3ba7944	Merge pull request 'EM SW Update' (#300) from mueller/em-sw-updates into develop ... Reviewed-on: #300 Reviewed-by: Jakob Meier <meierj@irs.uni-stuttgart.de>	2022-10-10 11:00:18 +02:00
Robin Mueller	f4cceeb21e	fix one merge conflict	2022-10-10 10:26:26 +02:00
Robin Mueller	fd1d53aa23	Merge remote-tracking branch 'origin/develop' into scex-additions	2022-10-10 10:18:29 +02:00
Robin Mueller	50d41215fa	Merge remote-tracking branch 'origin/develop' into mueller/em-sw-updates	2022-10-10 10:15:55 +02:00
Robin Müller	7cf91a8ac3	Merge pull request 'Global Config Handler' (#271) from petri_dev into develop ... Reviewed-on: #271 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2022-10-10 10:14:21 +02:00
Robin Mueller	4d97a82206	Merge remote-tracking branch 'origin/develop' into scex-additions	2022-10-06 18:09:44 +02:00
Robin Mueller	9173c4d2cb	missing commandActive reset	2022-10-06 18:05:06 +02:00
Robin Mueller	36c9feaf3f	parity helps for some reason	2022-10-06 17:01:04 +02:00
Robin Mueller	f20acf417e	some fixes	2022-10-06 16:58:43 +02:00
Robin Mueller	6d9999292c	Merge branch 'mueller/scex-em-tests' into scex-additions	2022-10-06 15:36:26 +02:00
Robin Mueller	8b35bbd241	use new SCEX uart dev name	2022-10-06 15:08:33 +02:00
Robin Mueller	0341865e98	this seems to work	2022-10-06 11:15:55 +02:00
Robin Mueller	adbece25aa	add code to get frame, parity and overrun errors	2022-10-05 19:18:25 +02:00
Robin Mueller	9e81384c5e	two stop bits and even parity helps	2022-10-05 18:44:52 +02:00
Robin Mueller	c5e5df03d9	new Uart16550 for SCEX, try stop bits	2022-10-05 18:13:49 +02:00
Robin Mueller	3fa2c63a03	add EM code	2022-10-05 14:38:48 +02:00
Robin Mueller	1a192cd8fb	found the bug	2022-10-04 23:04:50 +02:00
Robin Mueller	a44141c476	something is still wrong	2022-10-04 21:17:54 +02:00
Robin Mueller	b930af52b0	simplified DLE parser	2022-10-04 20:52:11 +02:00
Robin Mueller	0c389177e3	refactor DLE parsing and move semaphore release up top	2022-10-04 18:38:53 +02:00
Robin Müller	526ddd0208	Merge branch 'develop' into petri_dev	2022-10-04 13:18:34 +02:00
Irini Kosmidou	68fdb68fe6	Merge branch 'irini' into scex-additions	2022-09-29 23:38:59 +02:00
Irini Kosmidou	612426ce3b	Merge branch 'scex-additions' into irini	2022-09-29 23:36:15 +02:00
Irini Kosmidou	9c07a26615	commets removed	2022-09-29 19:50:12 +02:00
Irini Kosmidou	43cda300e3	scex directory	2022-09-29 19:38:19 +02:00
Robin Mueller	3e5a717845	bump fsfw	2022-09-29 17:22:09 +02:00
Robin Müller	ee6d13abcc	Merge branch 'develop' into petri_dev	2022-09-29 14:21:08 +02:00
Robin Mueller	0f081e52bd	bump tmtc	2022-09-29 14:20:44 +02:00
Robin Mueller	660d42f615	Merge remote-tracking branch 'origin/develop' into scex-additions	2022-09-29 14:10:29 +02:00
Robin Mueller	541b44cea7	re-run afmt	2022-09-29 14:10:21 +02:00
Robin Mueller	b3f4eaa0f2	Merge remote-tracking branch 'origin/develop' into petri_dev	2022-09-29 14:09:33 +02:00
Robin Mueller	2ad93f7735	Merge remote-tracking branch 'origin/develop' into mueller/em-sw-updates	2022-09-29 14:09:02 +02:00
Robin Mueller	865ca46974	Merge remote-tracking branch 'origin/develop' into scex-additions	2022-09-29 14:08:22 +02:00
Robin Mueller	e161eeb537	re-run generators and bump dependencies	2022-09-29 14:06:46 +02:00