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

renaming
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller 2022-11-10 11:20:27 +01:00
parent b88b4cc06d
commit 3be45b32ef
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/PlocSupvUartMan.cpp
View File

@ -109,7 +109,7 @@ ReturnValue_t PlocSupvHelper::performOperation(uint8_t operationCode) {
putTaskToSleep = true;
break;
}
case InternalState::LONGER_REQUEST: {
case InternalState::DEDICATED_REQUEST: {
if (handleRunningLongerRequest() == REQUEST_DONE) {
MutexGuard mg(lock);
state = InternalState::DEFAULT;
@ -219,7 +219,7 @@ ReturnValue_t PlocSupvHelper::performUpdate(const supv::UpdateParams& params) {
update.packetNum = 1;
update.deleteMemory = params.deleteMemory;
update.sequenceCount = params.seqCount;
state = InternalState::LONGER_REQUEST;
state = InternalState::DEDICATED_REQUEST;
request = Request::UPDATE;
}
return result;
@ -243,7 +243,7 @@ ReturnValue_t PlocSupvHelper::performMemCheck(std::string file, uint8_t memoryId
MutexGuard mg(lock);
update.file = file;
update.fullFileSize = getFileSize(file);
state = InternalState::LONGER_REQUEST;
state = InternalState::DEDICATED_REQUEST;
request = Request::CHECK_MEMORY;
update.memoryId = memoryId;
update.startAddress = startAddress;
@ -261,7 +261,7 @@ ReturnValue_t PlocSupvHelper::initiateUpdateContinuation() {
return HasActionsIF::IS_BUSY;
}
MutexGuard mg(lock);
state = InternalState::LONGER_REQUEST;
state = InternalState::DEDICATED_REQUEST;
request = Request::CONTINUE_UPDATE;
return returnvalue::OK;
}
@ -884,7 +884,7 @@ ReturnValue_t PlocSupvHelper::sendMessage(CookieIF* cookie, const uint8_t* sendD
return FAILED;
}
lock->lockMutex();
if (state == InternalState::SLEEPING or state == InternalState::LONGER_REQUEST) {
if (state == InternalState::SLEEPING or state == InternalState::DEDICATED_REQUEST) {
lock->unlockMutex();
return FAILED;
}
@ -979,7 +979,7 @@ ReturnValue_t PlocSupvHelper::tryHdlcParsing() {
ReturnValue_t result = parseRecRingBufForHdlc(bytesRead);
if (result == returnvalue::OK) {
// Packet found, advance read pointer.
if (state == InternalState::LONGER_REQUEST) {
if (state == InternalState::DEDICATED_REQUEST) {
decodedRingBuf.writeData(decodedBuf.data(), bytesRead);
decodedQueue.insert(bytesRead);
} else {

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

@ -214,7 +214,7 @@ class PlocSupvHelper : public DeviceCommunicationIF,
EventBufferRequest eventBufferReq;
enum class InternalState { SLEEPING, DEFAULT, LONGER_REQUEST, GO_TO_SLEEP };
enum class InternalState { SLEEPING, DEFAULT, DEDICATED_REQUEST, GO_TO_SLEEP };
enum class Request {
DEFAULT,