From 47336041d8ce25ccc9f681510e91d85c64e9f63f Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Sat, 6 Mar 2021 20:49:22 +0100
Subject: [PATCH] both magnetic sensors working at once now

---
 .../PollingSequenceFactory.cpp                | 20 +++++++++----------
 mission/devices/MGMHandlerRM3100.cpp          |  7 +++----
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/fsfwconfig/pollingsequence/PollingSequenceFactory.cpp b/fsfwconfig/pollingsequence/PollingSequenceFactory.cpp
index dc82c80d..6fd92ec6 100644
--- a/fsfwconfig/pollingsequence/PollingSequenceFactory.cpp
+++ b/fsfwconfig/pollingsequence/PollingSequenceFactory.cpp
@@ -99,16 +99,16 @@ ReturnValue_t pst::gomspacePstInit(FixedTimeslotTaskIF *thisSequence){
 ReturnValue_t pst::pollingSequenceAcsTest(FixedTimeslotTaskIF *thisSequence) {
     uint32_t length = thisSequence->getPeriodMs();
 
-//    thisSequence->addSlot(objects::MGM_0_LIS3_HANDLER, length * 0,
-//            DeviceHandlerIF::PERFORM_OPERATION);
-//    thisSequence->addSlot(objects::MGM_0_LIS3_HANDLER, length * 0.2,
-//            DeviceHandlerIF::SEND_WRITE);
-//    thisSequence->addSlot(objects::MGM_0_LIS3_HANDLER, length * 0.4,
-//            DeviceHandlerIF::GET_WRITE);
-//    thisSequence->addSlot(objects::MGM_0_LIS3_HANDLER, length * 0.6,
-//            DeviceHandlerIF::SEND_READ);
-//    thisSequence->addSlot(objects::MGM_0_LIS3_HANDLER, length * 0.8,
-//            DeviceHandlerIF::GET_READ);
+    thisSequence->addSlot(objects::MGM_0_LIS3_HANDLER, length * 0,
+            DeviceHandlerIF::PERFORM_OPERATION);
+    thisSequence->addSlot(objects::MGM_0_LIS3_HANDLER, length * 0.2,
+            DeviceHandlerIF::SEND_WRITE);
+    thisSequence->addSlot(objects::MGM_0_LIS3_HANDLER, length * 0.4,
+            DeviceHandlerIF::GET_WRITE);
+    thisSequence->addSlot(objects::MGM_0_LIS3_HANDLER, length * 0.6,
+            DeviceHandlerIF::SEND_READ);
+    thisSequence->addSlot(objects::MGM_0_LIS3_HANDLER, length * 0.8,
+            DeviceHandlerIF::GET_READ);
 
     thisSequence->addSlot(objects::MGM_1_RM3100_HANDLER, length * 0,
             DeviceHandlerIF::PERFORM_OPERATION);
diff --git a/mission/devices/MGMHandlerRM3100.cpp b/mission/devices/MGMHandlerRM3100.cpp
index 154f3574..2f6cef0e 100644
--- a/mission/devices/MGMHandlerRM3100.cpp
+++ b/mission/devices/MGMHandlerRM3100.cpp
@@ -41,8 +41,7 @@ void MGMHandlerRM3100::doStartUp() {
     case(InternalState::STATE_READ_TMRC): {
         if(commandExecuted) {
             internalState = InternalState::STATE_NORMAL;
-            //setMode(_MODE_TO_ON);
-            setMode(MODE_NORMAL);
+            setMode(_MODE_TO_ON);
         }
         break;
     }
@@ -317,7 +316,7 @@ ReturnValue_t MGMHandlerRM3100::initializeLocalDataPool(
 }
 
 uint32_t MGMHandlerRM3100::getTransitionDelayMs(Mode_t from, Mode_t to) {
-    return 60000;
+    return 10000;
 }
 
 ReturnValue_t MGMHandlerRM3100::handleDataReadout(const uint8_t *packet) {
@@ -334,7 +333,7 @@ ReturnValue_t MGMHandlerRM3100::handleDataReadout(const uint8_t *packet) {
 
 #if OBSW_VERBOSE_LEVEL >= 1
     if(debugDivider->checkAndIncrement()) {
-        sif::info << "MGMHandlerLIS3: Magnetic field strength in"
+        sif::info << "MGMHandlerRM3100: Magnetic field strength in"
                 " microtesla:" << std::endl;
         /* Set terminal to utf-8 if there is an issue with micro printout. */
         sif::info << "X: " << fieldStrengthX << " \xC2\xB5T" << std::endl;