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

rename helper
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit Details

This commit is contained in:
Robin Müller 2022-11-15 17:41:15 +01:00
parent 2b4ec6d274
commit c436a2abda
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
linux/devices/ploc/PlocSupervisorHandler.cpp
View File

@ -29,7 +29,7 @@ PlocSupervisorHandler::PlocSupervisorHandler(object_id_t objectId, object_id_t u
loggingReport(this),
adcReport(this),
powerSwitch(powerSwitch),
supvHelper(supvHelper) {
uartManager(supvHelper) {
if (comCookie == nullptr) {
sif::error << "PlocSupervisorHandler: Invalid com cookie" << std::endl;
}
@ -103,7 +103,7 @@ ReturnValue_t PlocSupervisorHandler::executeAction(ActionId_t actionId,
if (result != returnvalue::OK) {
return result;
}
result = supvHelper.performUpdate(params);
result = uartManager.performUpdate(params);
if (result != returnvalue::OK) {
return result;
}
@ -111,7 +111,7 @@ ReturnValue_t PlocSupervisorHandler::executeAction(ActionId_t actionId,
return EXECUTION_FINISHED;
}
case CONTINUE_UPDATE: {
supvHelper.initiateUpdateContinuation();
uartManager.initiateUpdateContinuation();
plocSupvHelperExecuting = true;
return EXECUTION_FINISHED;
}
@ -124,7 +124,7 @@ ReturnValue_t PlocSupervisorHandler::executeAction(ActionId_t actionId,
if (not std::filesystem::exists(params.file)) {
return HasFileSystemIF::FILE_DOES_NOT_EXIST;
}
supvHelper.performMemCheck(params.file, params.memId, params.startAddr);
uartManager.performMemCheck(params.file, params.memId, params.startAddr);
plocSupvHelperExecuting = true;
return EXECUTION_FINISHED;
}
@ -139,7 +139,7 @@ void PlocSupervisorHandler::doStartUp() {
switch (startupState) {
case StartupState::OFF: {
bootTimeout.resetTimer();
supvHelper.start();
uartManager.start();
startupState = StartupState::BOOTING;
break;
}
@ -167,7 +167,7 @@ void PlocSupervisorHandler::doStartUp() {
void PlocSupervisorHandler::doShutDown() {
setMode(_MODE_POWER_DOWN);
supvHelper.stop();
uartManager.stop();
uartIsolatorSwitch.pullLow();
startupState = StartupState::OFF;
}

2
linux/devices/ploc/PlocSupervisorHandler.h
View File

@ -130,7 +130,7 @@ class PlocSupervisorHandler : public DeviceHandlerBase {
const power::Switch_t powerSwitch = power::NO_SWITCH;
supv::TmBase tmReader;
PlocSupvUartManager& supvHelper;
PlocSupvUartManager& uartManager;
MessageQueueIF* eventQueue = nullptr;
/** Number of expected replies following the MRAM dump command */