eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 121 Wiki Activity

Merge remote-tracking branch 'origin/develop' into refactor_syrlinks
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller 2023-01-25 14:05:23 +01:00
commit a4bf6d9872
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -10,9 +10,10 @@ list yields a list of all related PRs for each release.
# [unreleased] # [unreleased]
## Added ## Fixed
- Startracker temperature set and PCDU switcher set are diagnostic now - MGM4 handling in ACS sensor processing: Bugfix in `mulScalar` operation
PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/354
## Changed ## Changed
@ -26,6 +27,7 @@ list yields a list of all related PRs for each release.
- The Syrlinks handler has submodes for the TX mode now: TX Standby (1), TX Modulation (2) and - The Syrlinks handler has submodes for the TX mode now: TX Standby (1), TX Modulation (2) and
TX Carrier Wave (3). The submodes apply for both ON and NORMAL mode. TX Carrier Wave (3). The submodes apply for both ON and NORMAL mode.
PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/353 PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/353
- Startracker temperature set and PCDU switcher set are diagnostic now
# [v1.20.0] 2023-01-24 # [v1.20.0] 2023-01-24

2
mission/controller/acs/SensorProcessing.cpp
View File

@ -103,7 +103,7 @@ void SensorProcessing::processMgm(const float *mgm0Value, bool mgm0valid, const
} }
if (mgm4valid) { if (mgm4valid) {
float mgm4ValueNT[3]; float mgm4ValueNT[3];
VectorOperations<float>::mulScalar(mgm4Value, 1e3, mgm4ValueNT, 3); // uT to nT VectorOperations<float>::mulScalar(mgm4Value, 1e-3, mgm4ValueNT, 3); // uT to nT
VectorOperations<float>::subtract(mgm4ValueNT, mgmParameters->mgm4hardIronOffset, VectorOperations<float>::subtract(mgm4ValueNT, mgmParameters->mgm4hardIronOffset,
mgm4ValueNoBias, 3); mgm4ValueNoBias, 3);
MatrixOperations<float>::multiply(mgmParameters->mgm4softIronInverse[0], mgm4ValueNoBias, MatrixOperations<float>::multiply(mgmParameters->mgm4softIronInverse[0], mgm4ValueNoBias,