8352 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	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
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
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
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	79a659bc39	changelog	2024-02-13 16:47:03 +01:00
meggert	efc0be104c	acs ctrl triggers event now	2024-02-13 16:45:59 +01:00
meggert	7314c71062	Merge branch 'main' into fix-no-sensors-fdir	2024-02-13 16:11:21 +01:00
Marius Eggert	cf7fbcef97	Merge pull request 'PLOC SUPV set bugfix' (#860) from ploc-supv-set-bugfix into main ... Reviewed-on: #860 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2024-02-13 16:05:08 +01:00
meggert	16d909bd5b	Merge branch 'main' into fix-no-sensors-fdir	2024-02-12 11:00:56 +01:00
Marius Eggert	2346866ba2	Merge branch 'main' into ploc-supv-set-bugfix	2024-02-12 10:59:03 +01:00
Marius Eggert	779bb4a277	Merge pull request 'small MPSoC bugfix' (#861) from small-mpsoc-bugfix into main ... Reviewed-on: #861 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2024-02-12 10:48:46 +01:00
Robin Mueller	a562a45445	oops	2024-02-12 10:42:45 +01:00
Robin Mueller	b5a7db4e66	CHANGELOG	2024-02-12 10:41:58 +01:00
Robin Mueller	b3785628a7	changelog	2024-02-09 11:25:36 +01:00
Robin Mueller	36658d07f0	small MPSoC bugfix	2024-02-08 14:26:16 +01:00
Robin Mueller	617b956ac9	bugfix	2024-02-08 12:26:09 +01:00
meggert	13c180902d	Merge branch 'main' into fix-no-sensors-fdir	2024-02-06 15:12:36 +01:00
Marius Eggert	4929cad198	Merge pull request 'PLOC SUPV bugfixes' (#855) from smaller-ploc-tweaks into main ... Reviewed-on: #855	2024-02-06 15:10:50 +01:00
meggert	393d50a54f	bump tmtc	2024-02-06 15:09:15 +01:00
meggert	3399620ba3	Merge branch 'main' into smaller-ploc-tweaks	2024-02-06 15:05:52 +01:00
meggert	b7f62ac3e2	changelog	2024-02-06 15:02:52 +01:00
meggert	6cbd873a97	fix	2024-02-06 15:01:20 +01:00
Marius Eggert	27c824eaec	Merge pull request 'Prep v7.6.1' (#857) from prep-v7.6.1 into main ... Reviewed-on: #857	2024-02-05 11:14:33 +01:00
meggert	681aebe011	bump version	2024-02-05 10:11:01 +01:00
meggert	484dba7eb6	changelog	2024-02-05 10:10:41 +01:00
Marius Eggert	5ae97d7c09	Merge pull request 'PTG Something' (#856) from fix-your-rfs into main ... Reviewed-on: #856 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2024-02-05 10:08:01 +01:00
meggert	01fde7193d	Merge branch 'main' into fix-your-rfs	2024-02-05 10:06:59 +01:00