8494 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Mueller	c434882e37	code review	2024-02-27 10:54:26 +01:00
meggert	9e89482298	Merge branch 'main' into prevent-str-blinding	2024-02-26 16:28:56 +01:00
meggert	9e1e286b97	bump fsfw	2024-02-26 16:27:14 +01:00
Marius Eggert	9c73e89cbb	Merge branch 'main' into mekf-fix	2024-02-26 15:12:41 +01:00
meggert	386430b9f2	changelog	2024-02-26 14:06:59 +01:00
meggert	ab71014f67	bumped tmtc	2024-02-26 14:06:23 +01:00
meggert	fc40c5cc83	Merge branch 'main' into str-secondary-fw-slot-update	2024-02-26 14:05:32 +01:00
Marius Eggert	21ecbaaa7b	Merge pull request 'PSB update' (#862) from psb-update into main ... Reviewed-on: #862 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2024-02-26 13:59:41 +01:00
meggert	4c589e0c1b	changelog	2024-02-26 13:58:47 +01:00
meggert	f4d1dbb5df	bump fsfw	2024-02-26 13:57:57 +01:00
meggert	18a7705d97	Merge branch 'main' into mekf-fix	2024-02-26 13:25:25 +01:00
meggert	3aa3810cac	Merge branch 'main' into prevent-str-blinding	2024-02-26 13:18:45 +01:00
meggert	2965c63bf6	fixed changelog	2024-02-26 13:16:17 +01:00
meggert	7066939d76	Merge branch 'main' into psb-update	2024-02-26 13:15:34 +01:00
meggert	c04be384a1	Merge branch 'main' into str-secondary-fw-slot-update	2024-02-26 13:14:36 +01:00
meggert	64f6f92ce6	Merge branch 'main' into fix-desaturation	2024-02-26 13:14:09 +01:00
Marius Eggert	a1570e94e7	Merge pull request 'PTG Ctrl Strat Priority' (#866) from change-ptg-strat-prios into main ... Reviewed-on: #866 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2024-02-26 13:13:37 +01:00
meggert	962df7e86f	fix changelog	2024-02-26 13:13:06 +01:00
meggert	f11240deb4	Merge branch 'main' into change-ptg-strat-prios	2024-02-26 13:12:01 +01:00
Marius Eggert	8df720e940	Merge pull request 'Fused Rotation Rate for Safe Mode' (#867) from fused-rot-rate-safe into main ... Reviewed-on: #867 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2024-02-26 13:11:41 +01:00
meggert	3c389cb069	Merge branch 'main' into fused-rot-rate-safe	2024-02-26 13:10:58 +01:00
Marius Eggert	b2faa77ebe	Merge pull request 'RW Cmd Antistiction Fix' (#868) from rw-antistiction-fix into main ... Reviewed-on: #868 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2024-02-26 13:10:03 +01:00
meggert	96acca4847	removed redundant variable	2024-02-26 10:14:15 +01:00
meggert	d14b83fab9	changelog	2024-02-26 09:44:09 +01:00
meggert	7517b33d83	if this doesnt fix the invalid speeds ...	2024-02-26 09:39:13 +01:00
meggert	3313f58905	changelog	2024-02-23 14:56:02 +01:00
meggert	9adb4af0e5	update params	2024-02-23 14:53:53 +01:00
meggert	13aa6f50ff	ignore rotation rates from quest and str for safe mode	2024-02-23 14:53:28 +01:00
meggert	585b8043e6	changed ptg strat prios	2024-02-23 14:44:59 +01:00
meggert	688943cacb	thanks for automatically not updating the references eclipse	2024-02-23 11:35:49 +01:00
meggert	a8172e641f	bump fsfw	2024-02-23 11:34:03 +01:00
meggert	2e08f3b393	not that we need this right now	2024-02-23 11:27:01 +01:00
meggert	ff3bf4e291	changelog	2024-02-23 11:22:59 +01:00
meggert	4d5ac727a8	changed sus filter param	2024-02-23 11:22:03 +01:00
meggert	2f43f58792	cleanup	2024-02-23 11:10:52 +01:00
meggert	75654277b2	pain	2024-02-23 11:05:10 +01:00
meggert	58a8c5869c	some fixes and debug stuff	2024-02-22 16:59:26 +01:00
meggert	5e6b0f5ea2	changelog	2024-02-22 15:08:27 +01:00
meggert	e445f8942a	limit rotation	2024-02-22 15:04:30 +01:00
Robin Müller	1fd6db8138	Merge branch 'main' into psb-update	2024-02-19 17:25:43 +01:00
Robin Mueller	2d92368240	small bugfix	2024-02-19 17:23:02 +01:00
Robin Mueller	9a1d91c261	changelog	2024-02-19 17:16:56 +01:00
Robin Mueller	dbb530e27b	Unlock STR second firmware slot	2024-02-19 17:16:08 +01:00
meggert	026776c1ec	desaturation cares about disabled wheels now	2024-02-19 14:54:17 +01:00
meggert	7d4b97d977	Merge branch 'main' into prevent-str-blinding	2024-02-14 16:23:28 +01:00
Robin Müller	77527c631c	Merge pull request 'Fix no Sensors for Control FDIR' (#858) from fix-no-sensors-fdir into main ... Reviewed-on: #858	2024-02-14 10:45:50 +01:00
Robin Mueller	43cca9ed0c	PSB update	2024-02-14 10:36:53 +01:00
meggert	2b09ec8bc0	fixes	2024-02-14 10:09:39 +01:00
meggert	9124cb85fa	nvm this is since c++ 23 lol	2024-02-14 09:06:39 +01:00
meggert	124ae6cc7e	as i dont like being surprised by implicit stuff ...	2024-02-14 09:04:56 +01:00