ACS board devs go to on first
This commit is contained in:
parent
68bc7f7682
commit
ec95792bc3
@ -16,6 +16,11 @@ will consitute of a breaking change warranting a new major release:
|
|||||||
|
|
||||||
# [unreleased]
|
# [unreleased]
|
||||||
|
|
||||||
|
## Fixed
|
||||||
|
|
||||||
|
- Proper Faulty/External Control handling for the dual lane assemblies.
|
||||||
|
- ACS board devices: Go to ON mode instead of going to NORMAL mode directly.
|
||||||
|
|
||||||
## Changed
|
## Changed
|
||||||
|
|
||||||
- Enabled periodic hosuekeeping generation for release images.
|
- Enabled periodic hosuekeeping generation for release images.
|
||||||
|
@ -28,11 +28,7 @@ void GyrAdis1650XHandler::doStartUp() {
|
|||||||
}
|
}
|
||||||
if (breakCountdown.hasTimedOut()) {
|
if (breakCountdown.hasTimedOut()) {
|
||||||
updatePeriodicReply(true, adis1650x::REPLY);
|
updatePeriodicReply(true, adis1650x::REPLY);
|
||||||
if (goToNormalMode) {
|
|
||||||
setMode(MODE_NORMAL);
|
|
||||||
} else {
|
|
||||||
setMode(MODE_ON);
|
setMode(MODE_ON);
|
||||||
}
|
|
||||||
internalState = InternalState::NONE;
|
internalState = InternalState::NONE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -47,7 +47,6 @@ class GyrAdis1650XHandler : public DeviceHandlerBase {
|
|||||||
AdisGyroConfigDataset configDataset;
|
AdisGyroConfigDataset configDataset;
|
||||||
double sensitivity = adis1650x::SENSITIVITY_UNSET;
|
double sensitivity = adis1650x::SENSITIVITY_UNSET;
|
||||||
|
|
||||||
bool goToNormalMode = false;
|
|
||||||
bool warningSwitch = true;
|
bool warningSwitch = true;
|
||||||
|
|
||||||
enum class InternalState { NONE, STARTUP, SHUTDOWN };
|
enum class InternalState { NONE, STARTUP, SHUTDOWN };
|
||||||
|
@ -23,11 +23,7 @@ void GyrL3gCustomHandler::doStartUp() {
|
|||||||
|
|
||||||
if (internalState == InternalState::STARTUP) {
|
if (internalState == InternalState::STARTUP) {
|
||||||
if (commandExecuted) {
|
if (commandExecuted) {
|
||||||
if (goNormalModeImmediately) {
|
setMode(MODE_ON);
|
||||||
setMode(MODE_NORMAL);
|
|
||||||
} else {
|
|
||||||
setMode(_MODE_TO_ON);
|
|
||||||
}
|
|
||||||
internalState = InternalState::NONE;
|
internalState = InternalState::NONE;
|
||||||
commandExecuted = false;
|
commandExecuted = false;
|
||||||
}
|
}
|
||||||
|
@ -69,7 +69,6 @@ class GyrL3gCustomHandler : public DeviceHandlerBase {
|
|||||||
bool commandExecuted = false;
|
bool commandExecuted = false;
|
||||||
|
|
||||||
uint8_t statusReg = 0;
|
uint8_t statusReg = 0;
|
||||||
bool goNormalModeImmediately = false;
|
|
||||||
|
|
||||||
uint8_t ctrlReg1Value = l3gd20h::CTRL_REG_1_VAL;
|
uint8_t ctrlReg1Value = l3gd20h::CTRL_REG_1_VAL;
|
||||||
uint8_t ctrlReg2Value = l3gd20h::CTRL_REG_2_VAL;
|
uint8_t ctrlReg2Value = l3gd20h::CTRL_REG_2_VAL;
|
||||||
|
@ -20,7 +20,7 @@ void MgmLis3CustomHandler::doStartUp() {
|
|||||||
}
|
}
|
||||||
if (internalState == InternalState::STARTUP) {
|
if (internalState == InternalState::STARTUP) {
|
||||||
if (commandExecuted) {
|
if (commandExecuted) {
|
||||||
setMode(MODE_NORMAL);
|
setMode(MODE_ON);
|
||||||
internalState = InternalState::NONE;
|
internalState = InternalState::NONE;
|
||||||
commandExecuted = false;
|
commandExecuted = false;
|
||||||
}
|
}
|
||||||
|
@ -25,7 +25,7 @@ void MgmRm3100CustomHandler::doStartUp() {
|
|||||||
if (commandExecuted) {
|
if (commandExecuted) {
|
||||||
commandExecuted = false;
|
commandExecuted = false;
|
||||||
internalState = InternalState::NONE;
|
internalState = InternalState::NONE;
|
||||||
setMode(MODE_NORMAL);
|
setMode(MODE_ON);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
2
tmtc
2
tmtc
@ -1 +1 @@
|
|||||||
Subproject commit f6fcb2fb282d79b1e250722eba46a319603b0232
|
Subproject commit 333faaa5f70646bfde1101f8e0538505574d1d7e
|
Loading…
Reference in New Issue
Block a user