Commit Graph

8492 Commits

Author SHA1 Message Date
18d3c8fa91 not sure why this was ever archived 2024-03-18 17:20:40 +01:00
3e1ef8bcaf Merge branch 'main' into gnss-ctrl-improvements
Some checks failed
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
2024-03-18 16:55:04 +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
c65e813e94 changelog
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2024-03-16 13:53:22 +01:00
1c93f51f69 prevent switching of heaters in external control 2024-03-16 13:48:49 +01:00
7a43e1bc67 better but still not fixed
Some checks failed
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
2024-03-15 14:54:16 +01:00
dade2d519a 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-03-15 13:21:01 +01:00
c4680f85bb added param to disable str input for mekf
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2024-03-15 13:16:38 +01:00
6c9a7c3ee5 changelog
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2024-03-13 17:01:17 +01:00
346f4ff9de prevent sign jump
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
2024-03-13 16:59:55 +01:00
ad5282ca4a bump fsfw 2024-03-13 16:59:37 +01:00
3c869e5215 idk what i am doing here
Some checks failed
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
2024-03-13 16:08:21 +01:00
8374a02ae2 lets wait a bit longer
Some checks failed
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
2024-03-13 13:54:49 +01:00
f2d1e16697 Merge branch 'main' into gnss-ctrl-improvements
Some checks failed
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
2024-03-13 13:48:34 +01:00
158927ce5c Merge pull request 'Fix inverted X-Axis for PTG Target' (#875) from fix-tgt-ptg into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #875
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2024-03-06 13:33:07 +01:00
e97105820a version bump
Some checks are pending
EIVE/eive-obsw/pipeline/pr-main Build started...
2024-03-06 13:31:39 +01:00
88102b26a6 changelog
Some checks are pending
EIVE/eive-obsw/pipeline/pr-main Build started...
2024-03-06 13:30:22 +01:00
7e689c9f55 well ...
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2024-03-06 13:07:55 +01:00
97ada32f33 Merge pull request 'Prep v7.1.1' (#874) from prep-v7.1.1 into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #874
2024-03-06 11:37:05 +01:00
244c364f60 bumped version
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2024-03-06 11:16:02 +01:00
c0c3576131 changelog 2024-03-06 11:15:40 +01:00
c2a4578b81 Merge pull request 'Fix NaN for Limiting Rotation Rates' (#872) from limit-rot-rate-fix into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #872
2024-03-06 11:13:01 +01:00
781feffc90 bumped submodules
Some checks are pending
EIVE/eive-obsw/pipeline/pr-main Build started...
2024-03-06 11:10:35 +01:00
7efd48c695 make robin happy 2024-03-06 11:09:23 +01:00
d0765fdcce Merge branch 'main' into limit-rot-rate-fix
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2024-03-06 10:18:15 +01:00
be0bae58ac Merge pull request 'Fix Dimension Error in MEKF' (#873) from fix-mekf-dim into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #873
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2024-03-06 10:17:10 +01:00
616803c6a8 changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2024-03-06 09:47:47 +01:00
3501763cf0 fsfw
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2024-03-06 09:47:06 +01:00
efaf48beff we should actually use this 2024-03-06 09:46:51 +01:00
e052470cf4 changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2024-03-06 09:08:31 +01:00
2364f7d5d9 fix of the century
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2024-03-05 17:35:06 +01:00
c52818a5ce changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2024-03-05 15:49:11 +01:00
fb8a92ecb5 bumped fsfw
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2024-03-05 14:30:13 +01:00
39032249b2 -
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2024-03-05 14:10:32 +01:00
aa4bfa8d88 we might want an OK 2024-03-05 14:09:40 +01:00
c2d8ef9fe4 should be enough
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2024-03-05 13:48:09 +01:00