8341 Commits

Author SHA1 Message Date
64f6f92ce6 Merge branch 'main' into fix-desaturation 2024-02-26 13:14:09 +01:00
a1570e94e7 Merge pull request 'PTG Ctrl Strat Priority' () from change-ptg-strat-prios into main
Reviewed-on: 
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2024-02-26 13:13:37 +01:00
962df7e86f fix changelog 2024-02-26 13:13:06 +01:00
f11240deb4 Merge branch 'main' into change-ptg-strat-prios 2024-02-26 13:12:01 +01:00
8df720e940 Merge pull request 'Fused Rotation Rate for Safe Mode' () from fused-rot-rate-safe into main
Reviewed-on: 
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2024-02-26 13:11:41 +01:00
3c389cb069 Merge branch 'main' into fused-rot-rate-safe 2024-02-26 13:10:58 +01:00
b2faa77ebe Merge pull request 'RW Cmd Antistiction Fix' () from rw-antistiction-fix into main
Reviewed-on: 
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2024-02-26 13:10:03 +01:00
96acca4847 removed redundant variable 2024-02-26 10:14:15 +01:00
d14b83fab9 changelog 2024-02-26 09:44:09 +01:00
7517b33d83 if this doesnt fix the invalid speeds ... 2024-02-26 09:39:13 +01:00
3313f58905 changelog 2024-02-23 14:56:02 +01:00
9adb4af0e5 update params 2024-02-23 14:53:53 +01:00
13aa6f50ff ignore rotation rates from quest and str for safe mode 2024-02-23 14:53:28 +01:00
585b8043e6 changed ptg strat prios 2024-02-23 14:44:59 +01:00
026776c1ec desaturation cares about disabled wheels now 2024-02-19 14:54:17 +01:00
77527c631c Merge pull request 'Fix no Sensors for Control FDIR' () from fix-no-sensors-fdir into main
Reviewed-on: 
2024-02-14 10:45:50 +01:00
79a659bc39 changelog 2024-02-13 16:47:03 +01:00
efc0be104c acs ctrl triggers event now 2024-02-13 16:45:59 +01:00
7314c71062 Merge branch 'main' into fix-no-sensors-fdir 2024-02-13 16:11:21 +01:00
cf7fbcef97 Merge pull request 'PLOC SUPV set bugfix' () from ploc-supv-set-bugfix into main
Reviewed-on: 
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2024-02-13 16:05:08 +01:00
16d909bd5b Merge branch 'main' into fix-no-sensors-fdir 2024-02-12 11:00:56 +01:00
2346866ba2 Merge branch 'main' into ploc-supv-set-bugfix 2024-02-12 10:59:03 +01:00
779bb4a277 Merge pull request 'small MPSoC bugfix' () from small-mpsoc-bugfix into main
Reviewed-on: 
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2024-02-12 10:48:46 +01:00
a562a45445 oops 2024-02-12 10:42:45 +01:00
b5a7db4e66 CHANGELOG 2024-02-12 10:41:58 +01:00
b3785628a7 changelog 2024-02-09 11:25:36 +01:00
36658d07f0
small MPSoC bugfix 2024-02-08 14:26:16 +01:00
617b956ac9
bugfix 2024-02-08 12:26:09 +01:00
13c180902d Merge branch 'main' into fix-no-sensors-fdir 2024-02-06 15:12:36 +01:00
4929cad198 Merge pull request 'PLOC SUPV bugfixes' () from smaller-ploc-tweaks into main
Reviewed-on: 
2024-02-06 15:10:50 +01:00
393d50a54f bump tmtc 2024-02-06 15:09:15 +01:00
3399620ba3 Merge branch 'main' into smaller-ploc-tweaks 2024-02-06 15:05:52 +01:00
b7f62ac3e2 changelog 2024-02-06 15:02:52 +01:00
6cbd873a97 fix 2024-02-06 15:01:20 +01:00
27c824eaec Merge pull request 'Prep v7.6.1' () from prep-v7.6.1 into main
Reviewed-on: 
v7.6.1
2024-02-05 11:14:33 +01:00
681aebe011 bump version 2024-02-05 10:11:01 +01:00
484dba7eb6 changelog 2024-02-05 10:10:41 +01:00
5ae97d7c09 Merge pull request 'PTG Something' () from fix-your-rfs into main
Reviewed-on: 
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2024-02-05 10:08:01 +01:00
01fde7193d Merge branch 'main' into fix-your-rfs 2024-02-05 10:06:59 +01:00
db9afe4a62 Merge pull request 'Improve Detumble State Machine' () from detumble-state-machine-vs-mode-change into main
Reviewed-on: 
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2024-02-05 10:02:25 +01:00
ecc147ca7f changelog 2024-02-05 09:43:20 +01:00
6ca1dda807 fix my ocd 2024-02-05 09:39:35 +01:00
6f3876d204 fixed quaternion multiplication bug 2024-02-05 09:24:41 +01:00
f0e551fa54 fix 2024-02-02 15:08:55 +01:00
15cddfdeb7 try to point STR away from earth during idle 2024-02-02 15:04:26 +01:00
e7dc9cddfd nadir target lul 2024-02-02 14:33:50 +01:00
84ba6262a8 cleanup 2024-02-02 14:32:12 +01:00
8be94cf2dc overloading is fun (but should be done right) 2024-02-02 12:38:16 +01:00
cc47114891
ups 2024-01-31 17:11:42 +01:00
0eebc4b00f
Merge remote-tracking branch 'origin/main' into smaller-ploc-tweaks 2024-01-31 17:11:13 +01:00