8620 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Mueller	d0f8b7981f	changelog	2024-02-29 12:31:22 +01:00
Robin Mueller	6d5f86ff77	bump tmtc again	2024-02-29 12:27:39 +01:00
Robin Mueller	e77e403e38	STR bugfix	2024-02-29 12:14:47 +01:00
Robin Mueller	6609ac85e3	bugfix and tmtc bump	2024-02-29 12:07:33 +01:00
Robin Mueller	e97970ef64	that should be all necessary changes	2024-02-29 11:51:06 +01:00
meggert	af6acb035c	changelog	2024-02-29 10:57:36 +01:00
meggert	dbb5d6d359	small improv	2024-02-29 10:33:25 +01:00
meggert	efd17a971f	to keep it in line	2024-02-29 10:28:08 +01:00
meggert	557051ba37	detumble fixes and improvements	2024-02-29 10:25:02 +01:00
meggert	21ef879cae	changelog fix	2024-02-28 09:25:21 +01:00
meggert	e9a665ee90	Merge branch 'main' into mekf-fix	2024-02-28 09:23:51 +01:00
Marius Eggert	a2a360c1d7	Merge branch 'main' into fix-desaturation	2024-02-28 09:23:30 +01:00
Robin Mueller	d43d1c4f65	almost done	2024-02-28 09:22:05 +01:00
Robin Mueller	b8a07a3299	continue with new set	2024-02-28 09:22:05 +01:00
Robin Mueller	dc730bb6de	stupid new set	2024-02-28 09:22:05 +01:00
Marius Eggert	61555aa5cf	Merge pull request 'Unlock STR secondary slot' (#864) from str-secondary-fw-slot-update into main ... Reviewed-on: #864 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2024-02-28 09:21:28 +01:00
meggert	a7b05f60a7	Merge branch 'main' into str-secondary-fw-slot-update	2024-02-28 09:12:06 +01:00
meggert	8749e4cf6e	changelog	2024-02-27 16:28:42 +01:00
meggert	97a54c6691	smoll improv	2024-02-27 16:28:30 +01:00
meggert	2d0f13b6e6	bumped tmtc	2024-02-27 16:27:54 +01:00
meggert	352053f1d2	this mekf should work	2024-02-27 16:05:05 +01:00
meggert	f382bd3e61	Merge branch 'main' into mekf-fix	2024-02-27 13:48:37 +01:00
Marius Eggert	b987b6e70c	Merge pull request 'Prevent STR Blinding' (#859) from prevent-str-blinding into main ... Reviewed-on: #859 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2024-02-27 13:48:18 +01:00
meggert	4cf34cb99a	bump fsfw	2024-02-27 12:51:20 +01:00
Robin Mueller	2ac9f972da	remove debug printout	2024-02-27 10:58:23 +01:00
Robin Mueller	69f4b6de06	I LOVE STATIC_CAST. I LOVE TYPING A LOT	2024-02-27 10:55:53 +01:00
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