5417 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Mueller	74ffbf1dcd	Merge remote-tracking branch 'origin/develop' into bugfix_acs_brd_ass	2023-03-02 14:55:00 +01:00
Robin Müller	b5049fa8d0	Merge pull request 'allow quicker startup' (#411) from feature_allow_quicker_transition into develop ... Reviewed-on: #411 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-03-02 14:46:15 +01:00
Robin Müller	652326443b	Merge branch 'develop' into feature_allow_quicker_transition	2023-03-02 14:45:29 +01:00
Robin Müller	d4b7c6493a	Merge pull request 'CHANGELOG and tmtc' (#417) from bugfixes_acs_polling into develop ... Reviewed-on: #417	2023-03-02 14:45:17 +01:00
Robin Müller	4aa6ed4de4	Merge branch 'develop' into bugfixes_acs_polling	2023-03-02 14:45:08 +01:00
Robin Mueller	9067c4180e	bump tmtc	2023-03-02 14:48:00 +01:00
Robin Mueller	0056ebcb62	bump changelog	2023-03-02 14:46:20 +01:00
Robin Müller	a2485a2195	Merge branch 'develop' into feature_allow_quicker_transition	2023-03-02 14:44:12 +01:00
Robin Mueller	eaa0fc6cbe	bump changelog	2023-03-02 14:43:50 +01:00
Robin Mueller	14188a4f3b	bugfixes imtq	2023-03-02 14:42:42 +01:00
Marius Eggert	eee92baa6e	Merge pull request 'Set MGM3100 set valid and IMTQ handler bugfix' (#416) from bugfixes_acs_polling into develop ... Reviewed-on: #416 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-03-02 14:41:39 +01:00
Robin Mueller	6104bf7adb	set MGM3100 set valid	2023-03-02 13:39:29 +01:00
Robin Mueller	e52c909580	health handling for ACS brd assy	2023-03-02 13:32:02 +01:00
Robin Mueller	5f17b1f6e8	allow recovery for syrlinks	2023-03-02 11:36:35 +01:00
Robin Mueller	90175e5c9d	add health handling	2023-03-02 11:27:19 +01:00
Robin Mueller	7a8816e49a	Merge remote-tracking branch 'origin/develop' into feature_watchdog_extension	2023-03-02 10:18:00 +01:00
Robin Mueller	c4cd6332f8	Merge remote-tracking branch 'origin/develop' into feature_syrlinks_assembly	2023-03-02 10:15:08 +01:00
Robin Müller	8ff70462cb	Merge branch 'develop' into feature_allow_quicker_transition	2023-03-02 10:10:23 +01:00
Marius Eggert	2e9de68e17	Merge pull request 'all SPI sched in now in same PST' (#413) from rework_all_spi_sched_in_pst into develop ... Reviewed-on: #413 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-03-02 09:00:07 +01:00
meggert	8ad1daa11f	changelog	2023-03-02 09:02:49 +01:00
Robin Mueller	4a820fba55	all SPI sched in now in same PST	2023-03-01 23:17:33 +01:00
Robin Mueller	d045498761	allow quicker transition	2023-03-01 19:03:18 +01:00
Robin Müller	0a7eb6f6bc	Merge pull request 'v1.33.0' (#410) from v1.33.0 into develop ... Reviewed-on: #410	2023-03-01 18:40:11 +01:00
Robin Mueller	3784cf688f	missing includes	2023-03-01 18:42:43 +01:00
Robin Mueller	f646566228	prep v1.33.0	2023-03-01 18:40:05 +01:00
Robin Mueller	58527dacf6	regenerate csvs	2023-03-01 18:38:55 +01:00
Robin Müller	03cf5891b0	Merge pull request 'add profiling comment' (#409) from profiling_comment into develop ... Reviewed-on: #409	2023-03-01 18:22:41 +01:00
Robin Mueller	1b79bfc02a	add profiling comment	2023-03-01 18:24:44 +01:00
Robin Müller	3c6c990b8f	Merge pull request 'Rework SUS polling' (#408) from rework_sus_polling into develop ... Reviewed-on: #408	2023-03-01 18:12:54 +01:00
Robin Mueller	1252897a1c	cleaning up	2023-03-01 18:15:53 +01:00
Robin Mueller	22b2f137b4	changelog	2023-03-01 18:10:16 +01:00
Robin Mueller	c347b6d1d4	copy and pasta fixes	2023-03-01 18:09:33 +01:00
Robin Mueller	24b939c50b	add syrlinks assembly	2023-03-01 18:06:36 +01:00
Robin Müller	ef5bc9731d	Merge branch 'develop' into rework_sus_polling	2023-03-01 16:58:28 +01:00
Robin Mueller	67128b398c	bugfix, seems to work now	2023-03-01 16:58:07 +01:00
Robin Mueller	c251d93305	wörkz	2023-03-01 16:36:21 +01:00
Robin Mueller	26aeb88d84	conitniue sus polling	2023-03-01 10:47:57 +01:00
Robin Mueller	11f476878d	rework SUS polling	2023-02-28 19:14:15 +01:00
Jakob Meier	db90c59557	Merge pull request 'compile warning fix and defensive programming' (#407) from smaller_tweaks into develop ... Reviewed-on: #407 Reviewed-by: Jakob Meier <meierj@irs.uni-stuttgart.de>	2023-02-28 18:02:40 +01:00
Robin Mueller	543568be39	Merge remote-tracking branch 'origin/develop' into feature_watchdog_extension	2023-02-28 15:11:03 +01:00
Robin Mueller	a8e886200f	Merge remote-tracking branch 'origin/develop' into feature_watchdog_extension	2023-02-28 15:03:43 +01:00
Marius Eggert	0fabe3adb6	Merge pull request 'Rework ACS board polling' (#405) from rework_acs_board_polling into develop ... Reviewed-on: #405 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-02-28 15:01:22 +01:00
Robin Mueller	f2598b5c4c	small fix for sched blocks	2023-02-28 15:02:37 +01:00
Robin Mueller	f7573b4902	Merge remote-tracking branch 'origin/develop' into rework_acs_board_polling	2023-02-28 15:01:33 +01:00
Robin Müller	9556ce6d9f	Merge pull request 'that should fix the error printout' (#406) from bugfix_read_only_check into develop ... Reviewed-on: #406 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-02-28 14:52:09 +01:00
Robin Müller	6f1a2952d5	Merge branch 'develop' into bugfix_read_only_check	2023-02-28 14:52:02 +01:00
Robin Mueller	c09d94f003	Merge remote-tracking branch 'origin/develop' into feature_watchdog_extension	2023-02-28 11:54:18 +01:00
Robin Mueller	10807d577f	bump tmtc	2023-02-28 11:53:34 +01:00
Robin Mueller	6e6dff56f2	Merge remote-tracking branch 'origin/develop' into rework_acs_board_polling	2023-02-28 11:53:10 +01:00
Robin Müller	959adcafb1	Merge branch 'develop' into smaller_tweaks	2023-02-28 11:48:05 +01:00