Higher ACS Modes STR Only #818

Merged
meggert merged 38 commits from higher-acs-modes-only-str into dev-7.5.0 2023-12-06 17:15:52 +01:00
Owner
No description provided.
meggert added this to the v7.3.0 milestone 2023-11-02 17:00:00 +01:00
meggert added 17 commits 2023-11-02 17:00:01 +01:00
EIVE/eive-obsw/pipeline/head Build started... Details
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
740167ce99
monotonic for pwr ctrl
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
e7276f282a
Merge branch 'main' into make-robin-happy-about-timestuff
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit Details
f61da1002f
breaking the ACS controller only for Robin
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit Details
25354ee7b4
i hope i get a medal from Robin for this
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit Details
17c253d19b
this might just work
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit Details
dc0c24ce96
Merge branch 'main' into make-robin-happy-about-timestuff
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
823aa70954
fixed deprecated functions
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
9482ceb206
noice
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
8d8eb6bd88
Merge branch 'main' into make-robin-happy-about-timestuff
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
77a555debc
small improvement
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
d5e57501be
div by 0 check
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
3c383f6d01
Merge branch 'main' into make-robin-happy-about-timestuff
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
b8672d3453
Merge branch 'main' into make-robin-happy-about-timestuff
EIVE/eive-obsw/pipeline/head Build queued... Details
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit Details
60a348a08f
this gonna be fun
muellerr modified the milestone from v7.3.0 to v7.4.0 2023-11-06 14:41:44 +01:00
meggert added 1 commit 2023-11-14 13:22:42 +01:00
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit Details
c155f399b1
.
meggert added 1 commit 2023-11-14 16:07:19 +01:00
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit Details
74e7785c68
calc rot rate from STR
meggert added 1 commit 2023-11-14 16:07:35 +01:00
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit Details
c465558543
Merge branch 'main' into higher-acs-modes-only-str
meggert added 1 commit 2023-11-14 16:23:16 +01:00
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit Details
5512605cd7
param to enable/disable STR for rot rate calc
meggert added 1 commit 2023-11-14 16:58:00 +01:00
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit Details
9482f3cae9
fdir needs to change
meggert added 1 commit 2023-11-15 16:54:59 +01:00
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit Details
4a86d4ba4b
changed fdir to new variant
meggert added 1 commit 2023-11-22 13:36:08 +01:00
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit Details
a45e96b772
quest attitude estimation
meggert added 1 commit 2023-11-22 13:56:37 +01:00
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit Details
0aa09bd516
this is better
meggert added 1 commit 2023-11-23 11:50:33 +01:00
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit Details
886dd17e4a
dataset output
meggert added 1 commit 2023-11-23 16:56:42 +01:00
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit Details
4a67f9ffe5
this is a mess
meggert added 1 commit 2023-11-24 10:52:42 +01:00
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit Details
647d5fda7c
this is much better
meggert added 1 commit 2023-11-24 11:30:33 +01:00
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
c7ec9726c4
this should work
meggert added 1 commit 2023-11-24 11:32:25 +01:00
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
7ef55dcab1
small fix
meggert added 1 commit 2023-11-24 11:45:16 +01:00
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
f0247a9ab3
select the according quaternion and rotational rate
meggert added a new dependency 2023-11-24 11:48:23 +01:00
meggert modified the milestone from v7.4.0 to v7.5.0 2023-11-24 14:30:31 +01:00
meggert added 2 commits 2023-11-27 10:41:25 +01:00
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
70be396b62
bump fsfw
meggert added 2 commits 2023-11-27 11:15:44 +01:00
EIVE/eive-obsw/pipeline/pr-main This commit looks good Details
e3271b6b4d
bump fsfw
meggert changed target branch from main to dev-7.5.0 2023-11-29 10:38:30 +01:00
meggert added 1 commit 2023-12-01 15:20:34 +01:00
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good Details
08d0619b11
bump fsfw
meggert added 1 commit 2023-12-04 13:15:34 +01:00
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good Details
d0588b144a
Merge branch 'dev-7.5.0' into higher-acs-modes-only-str
meggert added 1 commit 2023-12-04 13:19:34 +01:00
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 There was a failure building this commit Details
b0b279e313
Merge branch 'dev-7.5.0' into higher-acs-modes-only-str
meggert added 1 commit 2023-12-04 17:13:46 +01:00
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good Details
9f5a198c5d
small fix
meggert added 1 commit 2023-12-04 17:54:29 +01:00
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good Details
fec4f64a07
bump fsfw
meggert added 1 commit 2023-12-04 18:07:29 +01:00
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good Details
f22236b419
fixed datasets
meggert added 1 commit 2023-12-05 13:12:53 +01:00
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good Details
a05fd75828
bump fsfw
meggert added 2 commits 2023-12-05 15:11:27 +01:00
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good Details
6c6b7ff53f
this is less confusing
meggert added 1 commit 2023-12-06 10:41:57 +01:00
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good Details
c6a0518515
bump fsfw
meggert added 1 commit 2023-12-06 13:06:43 +01:00
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good Details
09aa7bb439
Merge branch 'dev-7.5.0' into higher-acs-modes-only-str
meggert added 1 commit 2023-12-06 14:36:30 +01:00
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good Details
71193495f3
welp i guess i also deleted stuff i still needed
meggert requested review from muellerr 2023-12-06 14:41:48 +01:00
meggert changed title from WIP: Higher ACS Modes STR Only to Higher ACS Modes STR Only 2023-12-06 14:41:52 +01:00
meggert added 1 commit 2023-12-06 14:46:42 +01:00
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good Details
4cad1176d0
changelog
muellerr reviewed 2023-12-06 15:34:43 +01:00
@ -0,0 +51,4 @@
double beta = VectorOperations<double>::dot(helperSum, kSumVec);
double gamma = std::sqrt(std::pow(alpha, 2) + std::pow(beta, 2));
// I don't even know what this is supposed to be
Owner

imagine me

imagine me
meggert marked this conversation as resolved
muellerr requested changes 2023-12-06 15:42:40 +01:00
@ -0,0 +6,4 @@
AttitudeEstimation::~AttitudeEstimation() {}
void AttitudeEstimation::quest(acsctrl::SusDataProcessed *susData,
Owner

some subroutines might be a good idea, a lot of if else if else blocks in this function..

some subroutines might be a good idea, a lot of if else if else blocks in this function..
meggert marked this conversation as resolved
@ -0,0 +11,4 @@
acsctrl::AttitudeEstimationData *attitudeEstimation) {
if (susData->susVecTot.isValid() and susData->sunIjkModel.isValid() and
mgmData->mgmVecTot.value and mgmData->magIgrfModel.isValid()) {
// Normalize Data
Owner

maybe this block can be put into a subfunction?

maybe this block can be put into a subfunction?
meggert marked this conversation as resolved
@ -10,0 +73,4 @@
void FusedRotationEstimation::estimateFusedRotationRateStr(
ACS::SensorValues *sensorValues, const double timeDelta,
acsctrl::FusedRotRateSourcesData *fusedRotRateSourcesData) {
if ((sensorValues->strSet.caliQw.isValid() and sensorValues->strSet.caliQx.isValid() and
Owner

maybe use the negation of all conditions here, move the invalid setting handling into the block, and put the block below without a return?

maybe use the negation of all conditions here, move the invalid setting handling into the block, and put the block below without a return?
meggert marked this conversation as resolved
@ -10,0 +136,4 @@
void FusedRotationEstimation::estimateFusedRotationRateQuest(
acsctrl::AttitudeEstimationData *attitudeEstimationData, const double timeDelta,
acsctrl::FusedRotRateSourcesData *fusedRotRateSourcesData) {
if (attitudeEstimationData->quatQuest.isValid()) {
Owner

same as above: Put the error handling code with the pre-emptive return at the top, save one level of indentation for the regular code.

same as above: Put the error handling code with the pre-emptive return at the top, save one level of indentation for the regular code.
meggert marked this conversation as resolved
@ -499,3 +498,1 @@
bool rw2valid = (sensorValues->rw2Set.state.value && sensorValues->rw2Set.state.isValid());
bool rw3valid = (sensorValues->rw3Set.state.value && sensorValues->rw3Set.state.isValid());
bool rw4valid = (sensorValues->rw4Set.state.value && sensorValues->rw4Set.state.isValid());
bool rw1valid = (sensorValues->rw1Set.state.value and sensorValues->rw1Set.state.isValid());
Owner

value is a ptr?

value is a ptr?
meggert marked this conversation as resolved
muellerr added 1 commit 2023-12-06 15:43:34 +01:00
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good Details
42036f45f9
Merge branch 'dev-7.5.0' into higher-acs-modes-only-str
meggert added 1 commit 2023-12-06 15:56:37 +01:00
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good Details
8cd773d18b
maybe this makes him happy
meggert added 1 commit 2023-12-06 16:02:16 +01:00
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good Details
d762a2b703
fix
muellerr approved these changes 2023-12-06 17:01:49 +01:00
meggert merged commit 2c9500c7aa into dev-7.5.0 2023-12-06 17:15:52 +01:00
meggert deleted branch higher-acs-modes-only-str 2023-12-06 17:15:52 +01:00
Sign in to join this conversation.
No description provided.