4163 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Mueller	964f9dc688	Merge remote-tracking branch 'origin/develop' into mueller/pdec_irq_handling	2022-11-02 14:16:14 +01:00
Robin Mueller	ce743e238b	Merge branch 'mueller/tm_funnel_improvements' into dhb2normal	2022-11-02 14:07:15 +01:00
Robin Mueller	53214f0019	hosted build works again	2022-11-02 14:03:54 +01:00
Jakob Meier	004e79580e	Merge pull request 'refactored TM funnels to allow multiple TM recipients' (#312) from mueller/tm_funnel_improvements into develop ... Reviewed-on: #312 Reviewed-by: Jakob Meier <meierj@irs.uni-stuttgart.de>	2022-11-02 13:10:42 +01:00
Robin Mueller	802b851924	bump changelog	2022-11-02 10:59:21 +01:00
Robin Mueller	e1526f712e	bump changelog	2022-11-02 10:58:40 +01:00
Robin Mueller	14b8b00880	small logic fix	2022-11-02 10:55:40 +01:00
Robin Mueller	621966b6f3	Merge remote-tracking branch 'origin/develop' into dhb2normal	2022-11-02 10:47:49 +01:00
Robin Mueller	b6cde9e8fc	Merge remote-tracking branch 'origin/develop' into mueller/pl-ss	2022-11-02 10:39:50 +01:00
Robin Mueller	b1f7c66066	Merge remote-tracking branch 'origin/develop' into mueller/pdec_irq_handling	2022-11-02 10:37:52 +01:00
Robin Mueller	39778f9663	Merge remote-tracking branch 'origin/develop' into mueller/tm_funnel_improvements	2022-11-02 10:37:15 +01:00
Robin Müller	a0c784113b	Merge pull request 'ACS Subsystem Init' (#228) from mueller/acs-ss-init into develop ... Reviewed-on: #228	2022-11-02 10:34:38 +01:00
Robin Mueller	0c549dd1ce	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-11-02 10:33:34 +01:00
Robin Mueller	76283e0e49	refactored TM funnels to allow multiple TM recipients	2022-11-02 10:26:45 +01:00
Robin Mueller	97fd35fe7b	bump fsfw	2022-11-02 10:25:42 +01:00
Robin Mueller	191d5f1268	refactored TM funnels to allow multiple TM recipients	2022-11-02 10:20:14 +01:00
Robin Mueller	e5fd62a121	some updates for pdec and EM syrlinks tests	2022-10-31 18:45:39 +01:00
Robin Mueller	3f3162fb36	Merge remote-tracking branch 'origin/develop' into mueller/pdec_irq_handling	2022-10-31 18:13:34 +01:00
Robin Mueller	885a7b0c6a	bump submodules	2022-10-31 18:13:29 +01:00
Robin Mueller	7dcc00312f	bump fsfw	2022-10-28 10:11:42 +02:00
Robin Mueller	d19ddaa46c	Merge branch 'mueller/acs-ss-init' into mueller/pl-ss	2022-10-27 17:00:14 +02:00
Robin Mueller	51572208a9	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-10-27 16:59:32 +02:00
Robin Mueller	745fad2a19	use baudrate 115200 for SCEX now	2022-10-27 16:37:16 +02:00
Robin Mueller	655c38a210	Merge remote-tracking branch 'origin/develop' into mueller/pdec_irq_handling	2022-10-27 15:34:54 +02:00
Robin Mueller	09642eb6bf	fixes for bash script	2022-10-27 14:11:09 +02:00
Robin Mueller	23da59fec5	bugfixes and improvements	2022-10-27 14:09:55 +02:00
Robin Mueller	833f7c6885	syrlink sim flag now EM/FM dependent	2022-10-27 14:04:55 +02:00
Robin Mueller	82af8e00df	bufixes for PDEC	2022-10-27 14:02:34 +02:00
Robin Mueller	e5ccc6473e	Merge remote-tracking branch 'origin/main' into mueller/pdec_irq_handling	2022-10-27 11:32:01 +02:00
Robin Müller	59bfa2526e	Merge pull request 'v1.15.0' (#311) from develop into main ... Reviewed-on: #311	2022-10-27 11:28:45 +02:00
Robin Mueller	24c050765b	countdown to ensure periodic lock checking	2022-10-27 10:51:34 +02:00
Robin Mueller	95d2bc0887	first IRQ impl	2022-10-27 10:49:52 +02:00
Robin Mueller	bc277067ed	add PDEC IRQ uio file entry	2022-10-27 09:20:41 +02:00
Robin Mueller	890fba18e1	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-10-27 09:18:12 +02:00
Robin Mueller	a3a9bc8b39	Merge remote-tracking branch 'origin/develop' into mueller/pdec_irq_handling	2022-10-27 09:17:01 +02:00
Robin Mueller	d6adde92fc	add dates to changelog	2022-10-27 09:11:10 +02:00
Robin Mueller	1d6b5cbda4	add missing changelog entry	2022-10-27 09:08:26 +02:00
Robin Mueller	b54c40db11	missing define renaming	2022-10-27 09:06:34 +02:00
Robin Mueller	cd1eb02f02	re-run generators	2022-10-27 09:03:39 +02:00
Robin Mueller	b059e831c0	complete changelog	2022-10-27 09:02:55 +02:00
Robin Mueller	35f9869861	tab replacements	2022-10-27 09:01:09 +02:00
Robin Mueller	ae16dcc4a7	afmt + changelog	2022-10-27 09:00:21 +02:00
Robin Mueller	0f60c7f356	bump minor version	2022-10-27 08:57:47 +02:00
Robin Mueller	ffb93dacd7	Merge remote-tracking branch 'origin/develop' into mueller/pdec_irq_handling	2022-10-27 08:57:24 +02:00
Robin Mueller	e1c0a451ee	update changelog	2022-10-27 08:56:20 +02:00
Robin Müller	4e1df940d9	Merge pull request 'New UIO file names' (#309) from mueller/uio-updates into develop ... Reviewed-on: #309	2022-10-27 08:53:21 +02:00
Robin Müller	f24ea413c8	Merge branch 'develop' into mueller/uio-updates	2022-10-27 08:53:08 +02:00
Robin Mueller	921f413888	small bugfix	2022-10-27 08:53:03 +02:00
Robin Mueller	8dd1d81e0d	consistent dev names	2022-10-27 08:51:49 +02:00
Robin Mueller	23238a1e58	reenable core ctrl + minor fm fix	2022-10-27 08:48:46 +02:00