Merge remote-tracking branch 'origin/develop' into add_heater_info_set

CHANGELOG.md

@@ -10,12 +10,14 @@ list yields a list of all related PRs for each release.
 
 # [unreleased]
 
-## Changed
+## 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
 
 ## Added
 
+- Startracker temperature set and PCDU switcher set are diagnostic now
 - Added new heater info set for the TCS controller. This set contains the heater switch states
   and the current draw.
   PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/351

mission/controller/acs/SensorProcessing.cpp

@@ -103,7 +103,7 @@ void SensorProcessing::processMgm(const float *mgm0Value, bool mgm0valid, const
   }
   if (mgm4valid) {
     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,
                                       mgm4ValueNoBias, 3);
     MatrixOperations<float>::multiply(mgmParameters->mgm4softIronInverse[0], mgm4ValueNoBias,

scripts/q7s-port-em.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+echo "Setting up all Q7S ports for EM"
+echo "-L 1538:192.168.133.10:1534 for connection to the TCF agent on the EM"
+echo "-L 1539:192.168.133.10:22 for file transfers to the EM"
+echo "-L 1540:192.168.133.10:7301 for TMTC commanding using the TCP/IP IF on the EM"
+
+ssh -L 1538:192.168.133.10:1534 \
+   -L 1539:192.168.133.10:22 \
+   -L 1540:192.168.133.10:7301 \
+   eive@2001:7c0:2018:1099:babe:0:e1fe:f1a5 \
+   -t 'CONSOLE_PREFIX="[Q7S Tunnel]" /bin/bash'

tmtc

@@ -1 +1 @@
-Subproject commit 5998aa12a4750584eb474b5d936fa461e9725154
+Subproject commit 49ccb4be8d42d6916be00ff9d8462a1f65481a6c