eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

Update v1.1.0 - MGT - RTD - PUSC #28

Merged
meierj merged 88 commits from mueller/mgt-rtd-pusc into develop 2021-04-25 12:40:38 +02:00
Conversation 0 Commits 88 Files Changed 71 +6 -3
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b062be78db - Show all commits

2
bsp_q7s/ObjectFactory.cpp
View File

@ -319,7 +319,7 @@ void ObjectFactory::produce(){
Max31865PT1000Handler* rtdIc16 = new Max31865PT1000Handler(objects::RTD_IC16, objects::SPI_COM_IF, spiRtdIc16, 0); Max31865PT1000Handler* rtdIc16 = new Max31865PT1000Handler(objects::RTD_IC16, objects::SPI_COM_IF, spiRtdIc16, 0);
Max31865PT1000Handler* rtdIc17 = new Max31865PT1000Handler(objects::RTD_IC17, objects::SPI_COM_IF, spiRtdIc17, 0); Max31865PT1000Handler* rtdIc17 = new Max31865PT1000Handler(objects::RTD_IC17, objects::SPI_COM_IF, spiRtdIc17, 0);
Max31865PT1000Handler* rtdIc18 = new Max31865PT1000Handler(objects::RTD_IC18, objects::SPI_COM_IF, spiRtdIc18, 0); Max31865PT1000Handler* rtdIc18 = new Max31865PT1000Handler(objects::RTD_IC18, objects::SPI_COM_IF, spiRtdIc18, 0);
rtdIc10->setStartUpImmediately(); // rtdIc10->setStartUpImmediately();
// rtdIc4->setStartUpImmediately(); // rtdIc4->setStartUpImmediately();
I2cCookie* imtqI2cCookie = new I2cCookie(addresses::IMTQ, IMTQ::MAX_REPLY_SIZE, I2cCookie* imtqI2cCookie = new I2cCookie(addresses::IMTQ, IMTQ::MAX_REPLY_SIZE,

5
mission/devices/IMTQHandler.cpp
View File

@ -18,7 +18,8 @@ IMTQHandler::~IMTQHandler() {
void IMTQHandler::doStartUp(){ void IMTQHandler::doStartUp(){
if(mode == _MODE_START_UP){ if(mode == _MODE_START_UP){
setMode(MODE_ON); //TODO: Set to MODE_ON again
setMode(MODE_NORMAL);
} }
} }
@ -44,6 +45,7 @@ ReturnValue_t IMTQHandler::buildCommandFromCommand(
case(IMTQ::GET_ENG_HK_DATA): { case(IMTQ::GET_ENG_HK_DATA): {
commandBuffer[0] = IMTQ::CC::GET_ENG_HK_DATA; commandBuffer[0] = IMTQ::CC::GET_ENG_HK_DATA;
rawPacket = commandBuffer; rawPacket = commandBuffer;
rawPacketLen = 1;
return RETURN_OK; return RETURN_OK;
} }
case(IMTQ::START_ACTUATION_DIPOLE): { case(IMTQ::START_ACTUATION_DIPOLE): {
@ -58,6 +60,7 @@ ReturnValue_t IMTQHandler::buildCommandFromCommand(
commandBuffer[7] = *(commandData + 7); commandBuffer[7] = *(commandData + 7);
commandBuffer[8] = *(commandData + 6); commandBuffer[8] = *(commandData + 6);
rawPacket = commandBuffer; rawPacket = commandBuffer;
rawPacketLen = 9;
return RETURN_OK; return RETURN_OK;
} }
default: default:

2
mission/devices/devicedefinitions/IMTQHandlerDefinitions.h
View File

@ -18,7 +18,7 @@ namespace IMTQ {
static const uint8_t MAX_REPLY_SIZE = SIZE_ENG_HK_DATA_REPLY; static const uint8_t MAX_REPLY_SIZE = SIZE_ENG_HK_DATA_REPLY;
static const uint8_t MAX_COMMAND_SIZE = 9; static const uint8_t MAX_COMMAND_SIZE = 9;
static const uint8_t POOL_ENTRIES = 8; static const uint8_t POOL_ENTRIES = 11;
/** /**
* Command code definitions. Each command or reply of an IMTQ request will begin with one of * Command code definitions. Each command or reply of an IMTQ request will begin with one of