eive/eive-obsw
eive/eive-obsw
12
3
Fork 0
Code Issues 3 Pull Requests Releases 118 Wiki Activity

now compiling

Browse Source
This commit is contained in:
Jakob Meier 2020-12-27 17:31:38 +01:00
commit 6bca9af809
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mission/devices/GomspaceDeviceHandler.cpp
View File

@ -332,3 +332,7 @@ ReturnValue_t GomspaceDeviceHandler::generateResetWatchdogCmd(){
rememberCommandId = GNDWDT_RESET;
return HasReturnvaluesIF::RETURN_OK;
}
uint32_t GomspaceDeviceHandler::getTransitionDelayMs(Mode_t modeFrom, Mode_t modeTo){
return 0;
}

1
mission/devices/GomspaceDeviceHandler.h
View File

@ -47,6 +47,7 @@ protected:
ReturnValue_t interpretDeviceReply(DeviceCommandId_t id,
const uint8_t *packet) override;
void setNormalDatapoolEntriesInvalid() override;
uint32_t getTransitionDelayMs(Mode_t modeFrom, Mode_t modeTo) override;
private:

4
mission/devices/MGMHandlerLIS3MDL.cpp
View File

@ -154,7 +154,7 @@ ReturnValue_t MGMHandlerLIS3MDL::buildCommandFromCommand(
return setOperatingMode(commandData, commandDataLen);
}
default:
lastSentCommand = DeviceHandlerIF::NO_COMMAND;
lastSentCommand = DeviceHandlerIF::NO_COMMAND_ID;
return DeviceHandlerIF::COMMAND_NOT_IMPLEMENTED;
}
return HasReturnvaluesIF::RETURN_FAILED;
@ -283,7 +283,7 @@ ReturnValue_t MGMHandlerLIS3MDL::interpretDeviceReply(DeviceCommandId_t id,
}
default: {
return DeviceHandlerIF::UNKNOW_DEVICE_REPLY;
return DeviceHandlerIF::UNKNOWN_DEVICE_REPLY;
}
}

2
mission/devices/MGMHandlerLIS3MDL.h
View File

@ -144,7 +144,7 @@ private:
* As this is a SPI Device, we get the Answer of the last sent command in
* the next read cycle, so we could check the command for identification.
*/
DeviceCommandId_t lastSentCommand = DeviceHandlerIF::NO_COMMAND;
DeviceCommandId_t lastSentCommand = DeviceHandlerIF::NO_COMMAND_ID;
/**
* We always update all registers together, so this method updates