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

v6.0.0 #724

Merged
muellerr merged 26 commits from main-v6 into main 2023-07-02 14:43:25 +02:00
Conversation 0 Commits 26 Files Changed 11 +58 -202
16 changed files with 58 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9dfdf38822 - Show all commits

1
linux/ipcore/PapbVcInterface.cpp
View File

@@ -34,7 +34,6 @@ ReturnValue_t PapbVcInterface::write(const uint8_t* data, size_t size) {
return DirectTmSinkIF::IS_BUSY; return DirectTmSinkIF::IS_BUSY;
} }
for (size_t idx = 0; idx < size; idx++) { for (size_t idx = 0; idx < size; idx++) {
// if (pollInterfaceReadiness(2, false) == returnvalue::OK) {
*(vcBaseReg + DATA_REG_OFFSET) = static_cast<uint32_t>(data[idx]); *(vcBaseReg + DATA_REG_OFFSET) = static_cast<uint32_t>(data[idx]);
} }
completePacketTransfer(); completePacketTransfer();

2
mission/com/LiveTmTask.cpp
View File

@@ -20,7 +20,7 @@ ReturnValue_t LiveTmTask::performOperation(uint8_t opCode) {
readCommandQueue(); readCommandQueue();
while (true) { while (true) {
bool performWriteOp = true; bool performWriteOp = true;
if (mode == MODE_OFF or ptmeLocked) { if (ptmeLocked) {
performWriteOp = false; performWriteOp = false;
} }