Merge branch 'mueller/rad-sensor-update' into mueller/master
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
This commit is contained in:
commit
446940f219
@ -69,7 +69,14 @@ ReturnValue_t RadiationSensorHandler::buildCommandFromCommand(DeviceCommandId_t
|
|||||||
return RETURN_OK;
|
return RETURN_OK;
|
||||||
}
|
}
|
||||||
case (RAD_SENSOR::START_CONVERSION): {
|
case (RAD_SENSOR::START_CONVERSION): {
|
||||||
gpioIF->pullHigh(gpioIds::ENABLE_RADFET);
|
ReturnValue_t result = gpioIF->pullHigh(gpioIds::ENABLE_RADFET);
|
||||||
|
if (result != HasReturnvaluesIF::RETURN_OK) {
|
||||||
|
#if OBSW_VERBOSE_LEVEL >= 1
|
||||||
|
sif::warning << "RadiationSensorHandler::buildCommandFromCommand; Pulling RADFET Enale pin "
|
||||||
|
"high failed"
|
||||||
|
<< std::endl;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
/* First the fifo will be reset here */
|
/* First the fifo will be reset here */
|
||||||
cmdBuffer[0] = RAD_SENSOR::RESET_DEFINITION;
|
cmdBuffer[0] = RAD_SENSOR::RESET_DEFINITION;
|
||||||
cmdBuffer[1] = RAD_SENSOR::CONVERSION_DEFINITION;
|
cmdBuffer[1] = RAD_SENSOR::CONVERSION_DEFINITION;
|
||||||
@ -106,7 +113,14 @@ ReturnValue_t RadiationSensorHandler::scanForReply(const uint8_t *start, size_t
|
|||||||
case RAD_SENSOR::WRITE_SETUP:
|
case RAD_SENSOR::WRITE_SETUP:
|
||||||
return IGNORE_REPLY_DATA;
|
return IGNORE_REPLY_DATA;
|
||||||
case RAD_SENSOR::READ_CONVERSIONS: {
|
case RAD_SENSOR::READ_CONVERSIONS: {
|
||||||
gpioIF->pullLow(gpioIds::ENABLE_RADFET);
|
ReturnValue_t result = gpioIF->pullLow(gpioIds::ENABLE_RADFET);
|
||||||
|
if (result != HasReturnvaluesIF::RETURN_OK) {
|
||||||
|
#if OBSW_VERBOSE_LEVEL >= 1
|
||||||
|
sif::warning << "RadiationSensorHandler::buildCommandFromCommand; Pulling RADFET Enale pin "
|
||||||
|
"low failed"
|
||||||
|
<< std::endl;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
|
Loading…
Reference in New Issue
Block a user