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

PLOC SUPV Update to newer firmware #316

Merged
muellerr merged 99 commits from mueller/tas_ploc_supv_update into develop 2022-11-18 14:27:13 +01:00
Conversation 0 Commits 99 Files Changed 58 +8 -7
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7c821e33f0 - Show all commits

15
linux/devices/ploc/PlocSupvUartMan.cpp
View File

@ -907,12 +907,12 @@ ReturnValue_t PlocSupvUartManager::sendMessage(CookieIF* cookie, const uint8_t*
if (sendData == nullptr or sendLen == 0) { if (sendData == nullptr or sendLen == 0) {
return FAILED; return FAILED;
} }
lock->lockMutex(); {
if (state == InternalState::SLEEPING or state == InternalState::DEDICATED_REQUEST) { MutexGuard mg(lock);
lock->unlockMutex(); if (state == InternalState::SLEEPING or state == InternalState::DEDICATED_REQUEST) {
return FAILED; return FAILED;
}
} }
lock->unlockMutex();
return encodeAndSendPacket(sendData, sendLen); return encodeAndSendPacket(sendData, sendLen);
} }
@ -977,8 +977,9 @@ ReturnValue_t PlocSupvUartManager::encodeAndSendPacket(const uint8_t* sendData,
arrayprinter::print(encodedSendBuf.data(), encodedLen); arrayprinter::print(encodedSendBuf.data(), encodedLen);
size_t bytesWritten = write(serialPort, encodedSendBuf.data(), encodedLen); size_t bytesWritten = write(serialPort, encodedSendBuf.data(), encodedLen);
if (bytesWritten != encodedLen) { if (bytesWritten != encodedLen) {
sif::warning << "ScexUartReader::sendMessage: Sending ping command to solar experiment failed" sif::warning
<< std::endl; << "PlocSupvUartManager::sendMessage: Sending ping command to solar experiment failed"
<< std::endl;
return FAILED; return FAILED;
} }
return returnvalue::OK; return returnvalue::OK;