From 15460624331a79fd73a6475e22c45f3ffc065eef Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 18 Jan 2023 14:24:17 +0100 Subject: [PATCH] update changelog --- CHANGELOG.md | 8 ++++++++ mission/devices/GyroADIS1650XHandler.cpp | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 82b6443c..55a1a84f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,14 @@ list yields a list of all related PRs for each release. - Bumped FSFW for Service 11 improvement which includes size and CRC check for contained TC - Syrlinks module now always included for both EM and FM +## Fixed + +- `GyroADIS1650XHandler`: Updated handler to determine correct dynamic range from `RANG_MDL` + register readout. This is because ADIS16505-3BMLZ devices are used on the ACS board and the + previous range setting was wrong. Also fixed a small error properly set internal state + on shut-down. + PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/342 + # [v1.19.0] 10.01.2023 ## Changed diff --git a/mission/devices/GyroADIS1650XHandler.cpp b/mission/devices/GyroADIS1650XHandler.cpp index 071376f2..6880ad5d 100644 --- a/mission/devices/GyroADIS1650XHandler.cpp +++ b/mission/devices/GyroADIS1650XHandler.cpp @@ -63,6 +63,7 @@ void GyroADIS1650XHandler::doStartUp() { void GyroADIS1650XHandler::doShutDown() { commandExecuted = false; + internalState = InternalState::STARTUP; setMode(_MODE_POWER_DOWN); } @@ -207,7 +208,7 @@ ReturnValue_t GyroADIS1650XHandler::interpretDeviceReply(DeviceCommandId_t id, using namespace ADIS1650X; switch (id) { case (ADIS1650X::READ_OUT_CONFIG): { - uint16_t readProdId = packet[10] << 8 | packet[11]; + uint16_t readProdId = packet[12] << 8 | packet[13]; if (((adisType == ADIS1650X::Type::ADIS16507) and (readProdId != ADIS1650X::PROD_ID_16507)) or ((adisType == ADIS1650X::Type::ADIS16505) and (readProdId != ADIS1650X::PROD_ID_16505))) { #if OBSW_VERBOSE_LEVEL >= 1