CHANGELOG.md

@@ -16,6 +16,16 @@ will consitute of a breaking change warranting a new major release:
 
 # [unreleased]
 
+## Fixed
+
+- Fixed transition for dual power lane assemblies: When going from dual side submode to single side
+  submode, perform logical commanding first, similarly to when going to OFF mode.
+
+## Changed
+
+- Updated GYR bias values to newest measurements. This also corrects the ADIS values to always
+  consit of just one digit.
+
 # [v1.38.0] 2023-03-17
 
 eive-tmtc: v2.19.2

linux/devices/AcsBoardPolling.cpp

@@ -451,95 +451,99 @@ void AcsBoardPolling::gyroAdisHandler(GyroAdis& gyro) {
     cdHasTimedOut = gyro.countdown.hasTimedOut();
     mustPerformStartup = gyro.performStartup;
   }
-  if (mode == acs::SimpleSensorMode::NORMAL and cdHasTimedOut) {
+  if (mode == acs::SimpleSensorMode::OFF) {
-    if (mustPerformStartup) {
+    return;
-      uint8_t regList[6];
+  }
-      // Read configuration
+  if (not cdHasTimedOut) {
-      regList[0] = adis1650x::DIAG_STAT_REG;
+    return;
-      regList[1] = adis1650x::FILTER_CTRL_REG;
+  }
-      regList[2] = adis1650x::RANG_MDL_REG;
+  if (mustPerformStartup) {
-      regList[3] = adis1650x::MSC_CTRL_REG;
+    uint8_t regList[6];
-      regList[4] = adis1650x::DEC_RATE_REG;
+    // Read configuration
-      regList[5] = adis1650x::PROD_ID_REG;
+    regList[0] = adis1650x::DIAG_STAT_REG;
-      size_t transferLen =
+    regList[1] = adis1650x::FILTER_CTRL_REG;
-          adis1650x::prepareReadCommand(regList, sizeof(regList), cmdBuf.data(), cmdBuf.size());
+    regList[2] = adis1650x::RANG_MDL_REG;
-      result = readAdisCfg(*gyro.cookie, transferLen);
+    regList[3] = adis1650x::MSC_CTRL_REG;
-      if (result != returnvalue::OK) {
+    regList[4] = adis1650x::DEC_RATE_REG;
-        gyro.replyResult = result;
+    regList[5] = adis1650x::PROD_ID_REG;
-        return;
+    size_t transferLen =
-      }
+        adis1650x::prepareReadCommand(regList, sizeof(regList), cmdBuf.data(), cmdBuf.size());
-      result = spiComIF.readReceivedMessage(gyro.cookie, &rawReply, &dummy);
+    result = readAdisCfg(*gyro.cookie, transferLen);
-      if (result != returnvalue::OK or rawReply == nullptr) {
-        gyro.replyResult = result;
-        return;
-      }
-      uint16_t prodId = (rawReply[12] << 8) | rawReply[13];
-      if (((gyro.type == adis1650x::Type::ADIS16505) and (prodId != adis1650x::PROD_ID_16505)) or
-          ((gyro.type == adis1650x::Type::ADIS16507) and (prodId != adis1650x::PROD_ID_16507))) {
-        sif::warning << "AcsPollingTask: Invalid  ADIS product ID " << prodId << std::endl;
-        gyro.replyResult = returnvalue::FAILED;
-        return;
-      }
-      MutexGuard mg(ipcLock, LOCK_TYPE, LOCK_TIMEOUT, LOCK_CTX);
-      gyro.ownReply.cfgWasSet = true;
-      gyro.ownReply.cfg.diagStat = (rawReply[2] << 8) | rawReply[3];
-      gyro.ownReply.cfg.filterSetting = (rawReply[4] << 8) | rawReply[5];
-      gyro.ownReply.cfg.rangMdl = (rawReply[6] << 8) | rawReply[7];
-      gyro.ownReply.cfg.mscCtrlReg = (rawReply[8] << 8) | rawReply[9];
-      gyro.ownReply.cfg.decRateReg = (rawReply[10] << 8) | rawReply[11];
-      gyro.ownReply.cfg.prodId = prodId;
-      gyro.ownReply.data.sensitivity = adis1650x::rangMdlToSensitivity(gyro.ownReply.cfg.rangMdl);
-      gyro.performStartup = false;
-    }
-    // Read regular registers
-    std::memcpy(cmdBuf.data(), adis1650x::BURST_READ_ENABLE.data(),
-                adis1650x::BURST_READ_ENABLE.size());
-    std::memset(cmdBuf.data() + 2, 0, 10 * 2);
-    result = spiComIF.sendMessage(gyro.cookie, cmdBuf.data(), adis1650x::SENSOR_READOUT_SIZE);
     if (result != returnvalue::OK) {
-      gyro.replyResult = returnvalue::FAILED;
+      gyro.replyResult = result;
       return;
     }
     result = spiComIF.readReceivedMessage(gyro.cookie, &rawReply, &dummy);
     if (result != returnvalue::OK or rawReply == nullptr) {
+      gyro.replyResult = result;
+      return;
+    }
+    uint16_t prodId = (rawReply[12] << 8) | rawReply[13];
+    if (((gyro.type == adis1650x::Type::ADIS16505) and (prodId != adis1650x::PROD_ID_16505)) or
+        ((gyro.type == adis1650x::Type::ADIS16507) and (prodId != adis1650x::PROD_ID_16507))) {
+      sif::warning << "AcsPollingTask: Invalid  ADIS product ID " << prodId << std::endl;
       gyro.replyResult = returnvalue::FAILED;
       return;
     }
-    uint16_t checksum = (rawReply[20] << 8) | rawReply[21];
-
-    // Now verify the read checksum with the expected checksum according to datasheet p. 20
-    uint16_t calcChecksum = 0;
-    for (size_t idx = 2; idx < 20; idx++) {
-      calcChecksum += rawReply[idx];
-    }
-    if (checksum != calcChecksum) {
-      sif::warning << "AcsPollingTask: Invalid ADIS reply checksum" << std::endl;
-      gyro.replyResult = returnvalue::FAILED;
-      return;
-    }
-
-    auto burstMode = adis1650x::burstModeFromMscCtrl(gyro.ownReply.cfg.mscCtrlReg);
-    if (burstMode != adis1650x::BurstModes::BURST_16_BURST_SEL_0) {
-      sif::error << "GyroADIS1650XHandler::interpretDeviceReply: Analysis for select burst mode"
-                    " not implemented!"
-                 << std::endl;
-      gyro.replyResult = returnvalue::FAILED;
-      return;
-    }
-
     MutexGuard mg(ipcLock, LOCK_TYPE, LOCK_TIMEOUT, LOCK_CTX);
-    gyro.ownReply.dataWasSet = true;
+    gyro.ownReply.cfgWasSet = true;
-    gyro.ownReply.cfg.diagStat = rawReply[2] << 8 | rawReply[3];
+    gyro.ownReply.cfg.diagStat = (rawReply[2] << 8) | rawReply[3];
-    gyro.ownReply.data.angVelocities[0] = (rawReply[4] << 8) | rawReply[5];
+    gyro.ownReply.cfg.filterSetting = (rawReply[4] << 8) | rawReply[5];
-    gyro.ownReply.data.angVelocities[1] = (rawReply[6] << 8) | rawReply[7];
+    gyro.ownReply.cfg.rangMdl = (rawReply[6] << 8) | rawReply[7];
-    gyro.ownReply.data.angVelocities[2] = (rawReply[8] << 8) | rawReply[9];
+    gyro.ownReply.cfg.mscCtrlReg = (rawReply[8] << 8) | rawReply[9];
-
+    gyro.ownReply.cfg.decRateReg = (rawReply[10] << 8) | rawReply[11];
-    gyro.ownReply.data.accelerations[0] = (rawReply[10] << 8) | rawReply[11];
+    gyro.ownReply.cfg.prodId = prodId;
-    gyro.ownReply.data.accelerations[1] = (rawReply[12] << 8) | rawReply[13];
+    gyro.ownReply.data.sensitivity = adis1650x::rangMdlToSensitivity(gyro.ownReply.cfg.rangMdl);
-    gyro.ownReply.data.accelerations[2] = (rawReply[14] << 8) | rawReply[15];
+    gyro.performStartup = false;
-
-    gyro.ownReply.data.temperatureRaw = (rawReply[16] << 8) | rawReply[17];
   }
+  // Read regular registers
+  std::memcpy(cmdBuf.data(), adis1650x::BURST_READ_ENABLE.data(),
+              adis1650x::BURST_READ_ENABLE.size());
+  std::memset(cmdBuf.data() + 2, 0, 10 * 2);
+  result = spiComIF.sendMessage(gyro.cookie, cmdBuf.data(), adis1650x::SENSOR_READOUT_SIZE);
+  if (result != returnvalue::OK) {
+    gyro.replyResult = returnvalue::FAILED;
+    return;
+  }
+  result = spiComIF.readReceivedMessage(gyro.cookie, &rawReply, &dummy);
+  if (result != returnvalue::OK or rawReply == nullptr) {
+    gyro.replyResult = returnvalue::FAILED;
+    return;
+  }
+  uint16_t checksum = (rawReply[20] << 8) | rawReply[21];
+
+  // Now verify the read checksum with the expected checksum according to datasheet p. 20
+  uint16_t calcChecksum = 0;
+  for (size_t idx = 2; idx < 20; idx++) {
+    calcChecksum += rawReply[idx];
+  }
+  if (checksum != calcChecksum) {
+    sif::warning << "AcsPollingTask: Invalid ADIS reply checksum" << std::endl;
+    gyro.replyResult = returnvalue::FAILED;
+    return;
+  }
+
+  auto burstMode = adis1650x::burstModeFromMscCtrl(gyro.ownReply.cfg.mscCtrlReg);
+  if (burstMode != adis1650x::BurstModes::BURST_16_BURST_SEL_0) {
+    sif::error << "GyroADIS1650XHandler::interpretDeviceReply: Analysis for select burst mode"
+                  " not implemented!"
+               << std::endl;
+    gyro.replyResult = returnvalue::FAILED;
+    return;
+  }
+
+  MutexGuard mg(ipcLock, LOCK_TYPE, LOCK_TIMEOUT, LOCK_CTX);
+  gyro.ownReply.dataWasSet = true;
+  gyro.ownReply.cfg.diagStat = rawReply[2] << 8 | rawReply[3];
+  gyro.ownReply.data.angVelocities[0] = (rawReply[4] << 8) | rawReply[5];
+  gyro.ownReply.data.angVelocities[1] = (rawReply[6] << 8) | rawReply[7];
+  gyro.ownReply.data.angVelocities[2] = (rawReply[8] << 8) | rawReply[9];
+
+  gyro.ownReply.data.accelerations[0] = (rawReply[10] << 8) | rawReply[11];
+  gyro.ownReply.data.accelerations[1] = (rawReply[12] << 8) | rawReply[13];
+  gyro.ownReply.data.accelerations[2] = (rawReply[14] << 8) | rawReply[15];
+
+  gyro.ownReply.data.temperatureRaw = (rawReply[16] << 8) | rawReply[17];
 }
 
 void AcsBoardPolling::mgmLis3Handler(MgmLis3& mgm) {

mission/controller/acs/AcsParameters.h

@@ -768,10 +768,10 @@ class AcsParameters : public HasParametersIF {
     double gyr2orientationMatrix[3][3] = {{0, 0, -1}, {0, -1, 0}, {-1, 0, 0}};
     double gyr3orientationMatrix[3][3] = {{0, 0, -1}, {0, 1, 0}, {1, 0, 0}};
 
-    double gyr0bias[3] = {0.06318149743589743, 0.4283235025641024, -0.16383500000000004};
+    double gyr0bias[3] = {0.0, 0.4, -0.1};
-    double gyr1bias[3] = {-0.12855128205128205, 1.6737307692307695, 1.031724358974359};
+    double gyr1bias[3] = {0.0956745283018868, 2.0854575471698116, 1.2505990566037737};
-    double gyr2bias[3] = {0.15039212820512823, 0.7094475589743591, -0.22298363589743594};
+    double gyr2bias[3] = {0.1, 0.7, -0.2};
-    double gyr3bias[3] = {0.0021730769230769217, -0.6655897435897435, 0.034096153846153845};
+    double gyr3bias[3] = {-0.10721698113207549, -0.6111650943396226, 0.1716462264150944};
 
     /* var = sigma^2, sigma = RND*sqrt(freq), following values are RND^2 and not var as freq is
      * assumed to be equal for the same class of sensors */

mission/devices/GyrAdis1650XHandler.cpp

@@ -65,10 +65,7 @@ ReturnValue_t GyrAdis1650XHandler::buildTransitionDeviceCommand(DeviceCommandId_
     }
     case (InternalState::SHUTDOWN): {
       *id = adis1650x::REQUEST;
-      acs::Adis1650XRequest *request = reinterpret_cast<acs::Adis1650XRequest *>(cmdBuf.data());
+      return preparePeriodicRequest(acs::SimpleSensorMode::OFF);
-      request->mode = acs::SimpleSensorMode::OFF;
-      request->type = adisType;
-      return returnvalue::OK;
     }
     default: {
       return NOTHING_TO_SEND;

mission/system/objects/DualLaneAssemblyBase.cpp

@@ -34,10 +34,17 @@ void DualLaneAssemblyBase::performChildOperation() {
 }
 
 void DualLaneAssemblyBase::startTransition(Mode_t mode, Submode_t submode) {
-  // doStartTransition(mode, submode);
   using namespace duallane;
   pwrStateMachine.reset();
   if (mode != MODE_OFF) {
+    // Special exception: A transition from dual side to single mode must be handled like
+    // going OFF.
+    if ((this->mode == MODE_ON or this->mode == DeviceHandlerIF::MODE_NORMAL) and
+        this->submode == DUAL_MODE and submode != DUAL_MODE) {
+      dualToSingleSideTransition = true;
+      AssemblyBase::startTransition(mode, submode);
+      return;
+    }
     // If anything other than MODE_OFF is commanded, perform power state machine first
     // Cache the target modes, required by power state machine
     pwrStateMachine.start(mode, submode);
@@ -75,9 +82,13 @@ ReturnValue_t DualLaneAssemblyBase::pwrStateMachineWrapper() {
       // Will be called for transitions to MODE_OFF, where everything is done after power switching
       finishModeOp();
     } else if (opCode == OpCodes::TO_NOT_OFF_DONE) {
-      // Will be called for transitions from MODE_OFF to anything else, where the mode still has
+      if (dualToSingleSideTransition) {
-      // to be commanded after power switching
+        finishModeOp();
-      AssemblyBase::startTransition(targetMode, targetSubmode);
+      } else {
+        // Will be called for transitions from MODE_OFF to anything else, where the mode still has
+        // to be commanded after power switching
+        AssemblyBase::startTransition(targetMode, targetSubmode);
+      }
     } else if (opCode == OpCodes::TIMEOUT_OCCURED) {
       if (powerRetryCounter == 0) {
         powerRetryCounter++;
@@ -118,6 +129,13 @@ void DualLaneAssemblyBase::handleModeReached() {
     // Ignore failures for now.
     pwrStateMachineWrapper();
   } else {
+    // For dual to single side transition, devices should be logically off, but the switch
+    // handling still needs to be done.
+    if (dualToSingleSideTransition) {
+      pwrStateMachine.start(targetMode, targetSubmode);
+      pwrStateMachineWrapper();
+      return;
+    }
     finishModeOp();
   }
 }
@@ -229,6 +247,7 @@ void DualLaneAssemblyBase::finishModeOp() {
   pwrStateMachine.reset();
   powerRetryCounter = 0;
   tryingOtherSide = false;
+  dualToSingleSideTransition = false;
   dualModeErrorSwitch = true;
 }
 

mission/system/objects/DualLaneAssemblyBase.h

@@ -31,6 +31,7 @@ class DualLaneAssemblyBase : public AssemblyBase, public ConfirmsFailuresIF {
   uint8_t powerRetryCounter = 0;
   bool tryingOtherSide = false;
   bool dualModeErrorSwitch = true;
+  bool dualToSingleSideTransition = false;
   duallane::Submodes defaultSubmode = duallane::Submodes::A_SIDE;
 
   enum RecoveryCustomStates {