|
0301c18af2
|
resolve some merge conflicts
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-24 21:20:27 +01:00 |
|
|
f71972609c
|
Merge remote-tracking branch 'origin/develop' into thermal_controller
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-03-24 21:15:29 +01:00 |
|
|
87e1746d71
|
done
|
2023-03-24 20:50:33 +01:00 |
|
|
3135bb923e
|
afmt
|
2023-03-24 19:49:08 +01:00 |
|
|
9dc0c5bde0
|
cleaning up com
EIVE/eive-obsw/pipeline/head There was a failure building this commit
|
2023-03-24 19:37:03 +01:00 |
|
|
90db9785ea
|
fixes
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-24 15:18:52 +01:00 |
|
|
506c8a3fa6
|
Merge branch 'develop' into acs-flp-safe
|
2023-03-24 15:10:34 +01:00 |
|
|
b32e0ef4fb
|
Merge remote-tracking branch 'origin/develop' into mekf-invalid-reset-counter
|
2023-03-24 15:01:01 +01:00 |
|
|
330e26b2ba
|
Merge branch 'develop' into acs-flp-safe
|
2023-03-24 14:53:07 +01:00 |
|
|
dce6323090
|
use safeCtrl strategy
|
2023-03-24 14:52:12 +01:00 |
|
|
906413e800
|
also check for inertia
|
2023-03-24 14:51:45 +01:00 |
|
|
ad72301ea0
|
for now final version of controller
|
2023-03-24 14:51:33 +01:00 |
|
|
44d0f1c533
|
frmt
|
2023-03-24 14:51:07 +01:00 |
|
|
9d8dfdfd4f
|
nearly there
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-03-24 11:35:46 +01:00 |
|
|
e6813efb88
|
realistic parameters
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-03-23 17:34:48 +01:00 |
|
|
7af2b5ddf9
|
TCS local pool variables as members
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-23 12:13:24 +01:00 |
|
|
9c735e36b8
|
reset mekfInvalidCounter after STR FDIR event and also trigger event in case mekf has recovered
|
2023-03-23 10:27:32 +01:00 |
|
|
d6331aab0b
|
Merge branch 'develop' into acs-flp-safe
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-03-22 09:08:04 +01:00 |
|
|
56642a11f7
|
frmt
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-03-22 08:59:29 +01:00 |
|
|
f6a0954315
|
added relevant parameters
|
2023-03-22 08:59:13 +01:00 |
|
|
d00cfc420c
|
shameless copy of FLP code
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-03-21 17:19:27 +01:00 |
|
|
0fdc79df5e
|
Merge remote-tracking branch 'origin/develop' into thermal_controller
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-21 14:55:55 +01:00 |
|
|
b81618344e
|
update eive system FDIR
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-21 14:38:10 +01:00 |
|
|
d85ddcdbff
|
Merge remote-tracking branch 'origin/develop' into thermal_controller
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-21 14:18:57 +01:00 |
|
|
078299a07c
|
Merge branch 'develop' into stop-the-spam
|
2023-03-21 13:24:21 +01:00 |
|
|
2f5ec84237
|
stop the spam
EIVE/eive-obsw/pipeline/head Build started...
|
2023-03-21 13:23:50 +01:00 |
|
|
573ff334b8
|
fixes
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-21 11:37:54 +01:00 |
|
|
19dd7a0964
|
?
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-21 11:36:10 +01:00 |
|
|
a92f664770
|
Merge branch 'develop' into acs-ctrl-finite-check
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-03-21 11:30:26 +01:00 |
|
|
f9e04ed9a2
|
updated gyr bias
|
2023-03-20 15:42:45 +01:00 |
|
|
ba9cf5d79d
|
small changes
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-18 18:03:59 +01:00 |
|
|
d44142ac26
|
Merge remote-tracking branch 'origin/develop' into thermal_controller
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-03-17 17:36:51 +01:00 |
|
|
5b84808d7c
|
reset the counter
EIVE/eive-obsw/pipeline/head Build queued...
|
2023-03-17 16:16:53 +01:00 |
|
|
f7be8ea63c
|
use supervisor fdir
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
controls the power switch
|
2023-03-16 19:10:05 +01:00 |
|
|
eda1f7e212
|
syrlinks event works
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-16 18:28:51 +01:00 |
|
|
a16671762d
|
Merge remote-tracking branch 'origin/develop' into thermal_controller
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-16 17:48:17 +01:00 |
|
|
11e5866f31
|
added some defines
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-15 16:24:46 +01:00 |
|
|
9b8092fb09
|
this seems to work
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-15 16:24:01 +01:00 |
|
|
8201a4140a
|
works better now
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-15 16:19:37 +01:00 |
|
|
715a69db89
|
this should cover upper bound checking when heater is off
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-15 15:43:20 +01:00 |
|
|
dc44af5b29
|
copy and paste error
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-15 15:20:47 +01:00 |
|
|
27f29eda40
|
small error
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-15 15:16:12 +01:00 |
|
|
50a62b9243
|
sth broke..
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-15 15:13:53 +01:00 |
|
|
da7c450e06
|
most temps should be valid now
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-15 15:00:06 +01:00 |
|
|
a92fa31cb5
|
better variable names, tweaks for less init events
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-15 14:56:26 +01:00 |
|
|
d273621419
|
some tweaks
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-15 14:36:18 +01:00 |
|
|
95a4d88ed4
|
cleanup
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-15 10:17:24 +01:00 |
|
|
ccf1fcaa79
|
stuff
|
2023-03-15 10:06:24 +01:00 |
|
|
4fdb2de510
|
Merge branch 'develop' into acs-safe-mode-failure
# Conflicts:
# CHANGELOG.md
# mission/controller/AcsController.cpp
# mission/controller/AcsController.h
|
2023-03-15 10:06:02 +01:00 |
|
|
f2210010de
|
prevent event spam and add action command to restore automatic recovery
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-14 17:19:50 +01:00 |
|