diff --git a/src/shared/radio/SX1278/SX1278Common.cpp b/src/shared/radio/SX1278/SX1278Common.cpp index f779b37112587f8c968ac8695845337656da399b..6591fdefaa313084f21d49c515ebe0bf29abd8a9 100644 --- a/src/shared/radio/SX1278/SX1278Common.cpp +++ b/src/shared/radio/SX1278/SX1278Common.cpp @@ -117,8 +117,6 @@ SX1278Common::IrqFlags SX1278Common::waitForIrqBusy(LockMode &guard, int timeout) { long long start = miosix::getTick(); - IrqFlags ret_irq = 0; - while ((miosix::getTick() - start) < timeout) { // Delay between polls @@ -128,7 +126,8 @@ SX1278Common::IrqFlags SX1278Common::waitForIrqBusy(LockMode &guard, for (unsigned int i = 0; i < 1000 / DELAY; i++) { // Check if some of the interrupts triggered - if ((ret_irq = checkForIrqAndReset(guard, set_irq, reset_irq)) != 0) + IrqFlags ret_irq = checkForIrqAndReset(guard, set_irq, reset_irq); + if (ret_irq != 0) { return ret_irq; } diff --git a/src/shared/radio/SX1278/SX1278Fsk.cpp b/src/shared/radio/SX1278/SX1278Fsk.cpp index 43983114e1412fbec6f6f0f54383edfbd3b40265..4ca766477ea63afc78a6e9c730c3ca44f8d7217f 100644 --- a/src/shared/radio/SX1278/SX1278Fsk.cpp +++ b/src/shared/radio/SX1278/SX1278Fsk.cpp @@ -367,7 +367,7 @@ bool SX1278Fsk::send(uint8_t *pkt, size_t len) { // The device was invalidated, just do a quick return, nothing else // matters - return -1; + return false; } // Send first segment @@ -393,7 +393,7 @@ bool SX1278Fsk::send(uint8_t *pkt, size_t len) { // The device was invalidated, just do a quick return, nothing else // matters - return -1; + return false; } SPITransaction spi(getSpiSlave(guard_mode.parent())); @@ -413,7 +413,7 @@ bool SX1278Fsk::send(uint8_t *pkt, size_t len) { // The device was invalidated, just do a quick return, nothing else // matters - return -1; + return false; } last_tx = now(); diff --git a/src/shared/radio/SX1278/SX1278Lora.cpp b/src/shared/radio/SX1278/SX1278Lora.cpp index ab598fbf10f7475070bad0ea663f3b825fe61035..e9c4759aeaedd94ab7ea2278a8c85c4bc5e0497a 100644 --- a/src/shared/radio/SX1278/SX1278Lora.cpp +++ b/src/shared/radio/SX1278/SX1278Lora.cpp @@ -356,7 +356,7 @@ bool SX1278Lora::send(uint8_t *pkt, size_t len) { // The device was invalidated, just do a quick return, nothing else // matters - return -1; + return false; } }