chonky #670

Merged
muellerr merged 278 commits from v3.0.0-dev into main 2023-06-11 14:25:21 +02:00
Showing only changes of commit a110bf32aa - Show all commits

View File

@ -410,7 +410,7 @@ ReturnValue_t AcsBoardPolling::writeAdisReg(SpiCookie& cookie) {
spi_ioc_transfer* transferStruct = cookie.getTransferStructHandle(); spi_ioc_transfer* transferStruct = cookie.getTransferStructHandle();
uint64_t origTx = transferStruct->tx_buf; uint64_t origTx = transferStruct->tx_buf;
uint64_t origRx = transferStruct->rx_buf; uint64_t origRx = transferStruct->rx_buf;
for (idx = 0; idx < 4; idx++) { for (idx = 0; idx < 4; idx += 2) {
result = mutex->lockMutex(timeoutType, timeoutMs); result = mutex->lockMutex(timeoutType, timeoutMs);
if (result != returnvalue::OK) { if (result != returnvalue::OK) {
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
@ -439,7 +439,6 @@ ReturnValue_t AcsBoardPolling::writeAdisReg(SpiCookie& cookie) {
} }
mutex->unlockMutex(); mutex->unlockMutex();
idx += 2;
transferStruct->tx_buf += 2; transferStruct->tx_buf += 2;
transferStruct->rx_buf += 2; transferStruct->rx_buf += 2;
if (idx < 4) { if (idx < 4) {