Commit Graph

8516 Commits

Author SHA1 Message Date
df392d3319 Merge branch 'main' into error-quat-fix
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2024-04-10 10:49:59 +02:00
b079ce85f2 Merge pull request 'Update for PWR CTRL Limits' (#884) from change-pwr-ctrl-limits into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #884
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2024-04-10 10:48:12 +02:00
bc9b8efdb8 Merge branch 'main' into change-pwr-ctrl-limits
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2024-04-10 08:57:07 +02:00
3a70155105 Merge pull request 'Enable MEKF for PTG as Default' (#888) from enable-mekf into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #888
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2024-04-09 14:45:10 +02:00
0f1c41e828 Merge branch 'main' into enable-mekf
Some checks are pending
EIVE/eive-obsw/pipeline/pr-main Build queued...
2024-04-09 14:33:36 +02:00
c3237cae3c Merge pull request 'impl relative timeshift in framework' (#886) from relative-timeshift into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #886
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2024-04-09 14:29:28 +02:00
c89e81cac9 Merge branch 'main' into enable-mekf
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2024-04-09 13:55:11 +02:00
fb54d976d2 Merge branch 'main' into relative-timeshift
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2024-04-09 13:41:34 +02:00
a63eb331eb Merge pull request 'Revert lower PLOC OP Limits' (#887) from ploc-op-limit into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #887
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2024-04-09 13:34:37 +02:00
47cedb90f9 bump fsfw
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2024-04-09 11:07:05 +02:00
1f0e2d99e9 fix comment block
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2024-04-08 13:38:35 +02:00
35181a2693 changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2024-04-08 13:36:21 +02:00
e1b5625086 update events 2024-04-08 13:35:42 +02:00
72626582f6 bump submodules
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2024-04-08 13:27:08 +02:00
3e6d26669a bump submodules
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2024-04-08 11:37:43 +02:00
69f378f8b6 changelog
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2024-04-08 10:48:03 +02:00
a46f6f34d6 allow mekf to be used for ptg laws as default 2024-04-08 10:47:14 +02:00
e6855120f3 changelog
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2024-04-08 10:28:57 +02:00
e59235fd75 reverted values 2024-04-08 10:28:36 +02:00
3875ddf92b
bump fsfw again
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2024-04-03 16:24:07 +02:00
4171b11928
impl relative timeshift in framework
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2024-04-03 16:20:18 +02:00
539221a458 updated limits within the pwr ctrl
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2024-03-27 09:24:41 +01:00
9f03341108 changelog
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2024-03-22 11:40:00 +01:00
4193a565a4 i hate this 2024-03-22 11:39:18 +01:00
c1c254330b Merge pull request 'Prep v7.7.4' (#882) from prep-v7.7.4 into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #882
2024-03-21 10:47:20 +01:00
c46c6cd28b changelog
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2024-03-21 10:18:03 +01:00
aeb8b92bc4 bump version 2024-03-21 10:16:47 +01:00
8011686fbe Merge pull request 'GS Target Pointing Limit Change' (#881) from ptg-improv into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #881
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2024-03-21 10:10:44 +01:00
58be09bd4b Merge branch 'main' into ptg-improv
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2024-03-21 09:15:53 +01:00
ad82573a35 Merge pull request 'Fix for Current Calculation in PWR Ctrl' (#880) from fix-soc into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #880
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2024-03-21 09:14:52 +01:00
a1be15e939 lets rather be gentle here
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2024-03-21 09:14:35 +01:00
ba7c9e1c26 changelog
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2024-03-20 16:19:20 +01:00
46c125d9fe rot rate limit change 2024-03-20 16:18:03 +01:00
889dd04c6b changelog
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2024-03-20 16:01:20 +01:00
c52746a2df fix 2024-03-20 15:53:51 +01:00
d1fc876f03 Merge pull request 'Prep v7.7.3' (#879) from prep-v7.7.3 into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #879
2024-03-18 12:34:10 +01:00
0278aabee0 Merge branch 'main' into prep-v7.7.3
Some checks are pending
EIVE/eive-obsw/pipeline/pr-main Build queued...
2024-03-18 11:37:09 +01:00
a9f5b6d2c7 Merge pull request 'TCS Ctrl Time Limit not for Heaters in External Control' (#878) from tcs-ctrl-ignores-ext-ctrl into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #878
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2024-03-18 11:36:32 +01:00
80ea0b341b changelog
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-main Build queued...
2024-03-18 11:14:10 +01:00
9740831755 bumped version 2024-03-18 11:14:00 +01:00
c4e18432e2 Merge branch 'main' into tcs-ctrl-ignores-ext-ctrl
Some checks are pending
EIVE/eive-obsw/pipeline/pr-main Build queued...
2024-03-18 11:05:23 +01:00
f9f5ba5d46 Merge pull request 'Improve GS PTG' (#876) from gs-ptr-improv into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #876
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2024-03-18 11:04:01 +01:00
3b521966a9 bumped fsfw 2024-03-18 11:03:44 +01:00
c58bae5aa5 Merge branch 'main' into gs-ptr-improv 2024-03-18 11:03:06 +01:00
67e6ccf4ae cleanup
Some checks are pending
EIVE/eive-obsw/pipeline/pr-main Build started...
2024-03-18 11:00:29 +01:00
b795beef85 Merge pull request 'Parameter for STR for MEKF' (#877) from no-str-for-mekf into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #877
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2024-03-18 10:58:53 +01:00
311ecd7fd2 changelog 2024-03-18 10:58:19 +01:00
950e86ce4b cleaner solution
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2024-03-18 10:56:57 +01:00
096328aadc backup heater will not be chosen if heater is on ext ctrl and on
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2024-03-18 10:34:21 +01:00
36edd3e324 changed lower op limits for ploc 2024-03-18 10:33:51 +01:00