Fix #87: clean up tx completion

mcci-catena · Apr 2, 2019 · 1040a38 · 1040a38
1 parent 6eca474
commit 1040a38
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/src/lib/SendBuffer.cpp b/src/lib/SendBuffer.cpp
@@ -65,7 +65,7 @@ bool Arduino_LoRaWAN::SendBuffer(
 	uint8_t port
         )
         {
-        if (this->m_fTxPending || LMIC.opmode & OP_TXRXPEND)
+        if (! this->GetTxReady())
                 {
                 if (pDoneFn)
                         (*pDoneFn)(pDoneCtx, false);

diff --git a/src/lib/arduino_lorawan_begin.cpp b/src/lib/arduino_lorawan_begin.cpp
@@ -172,11 +172,7 @@ void Arduino_LoRaWAN::StandardEventProcessor(
             // we need to just reset.
             if (! this->GetOtaaProvisioningInfo(nullptr))
                 {
-                bool txPending = this->m_fTxPending;
-                this->m_fTxPending = false;
-                // notify client that TX is complete
-                if (txPending && this->m_pSendBufferDoneFn)
-                        this->m_pSendBufferDoneFn(this->m_pSendBufferDoneCtx, false);
+                this->completeTx(false);
                 }
             break;
 
@@ -217,7 +213,6 @@ void Arduino_LoRaWAN::StandardEventProcessor(
             break;
 
         case EV_TXCOMPLETE:
-            this->m_fTxPending = false;
 
 	    // notify framework that RX may be available (because this happens
 	    // after every transmit).