lastchanges

Author: Lang, Samuel

examples/LoRaSenderNonBlocking/LoRaSenderNonBlocking.ino

@@ -21,20 +21,22 @@ void setup()
 
 void loop()
 {
-  if (LoRa.isTransmitting())
+  while (LoRa.beginPacket() == 0)
   {
     delay(100);
     Serial.print('w');
-    return;
   }
+
   Serial.print("\nSending packet: ");
   Serial.println(counter);
 
   // send packet
   LoRa.beginPacket();
   LoRa.print("hello ");
   LoRa.print(counter);
-  LoRa.endPacketasync();
+  
+  // send using async API
+  LoRa.endPacket(true);
 
   counter++;
 }

src/LoRa.cpp

@@ -122,6 +122,9 @@ void LoRaClass::end()
 
 int LoRaClass::beginPacket(int implicitHeader)
 {
+  if (isTransmitting)
+    return 0;
+
   // put in standby mode
   idle();
 
@@ -138,26 +141,25 @@ int LoRaClass::beginPacket(int implicitHeader)
   return 1;
 }
 
-int LoRaClass::endPacket()
+int LoRaClass::endPacket(bool async)
 {
   // put in TX mode
   writeRegister(REG_OP_MODE, MODE_LONG_RANGE_MODE | MODE_TX);
 
-  // wait for TX done
-  while((readRegister(REG_IRQ_FLAGS) & IRQ_TX_DONE_MASK) == 0);
-
-  // clear IRQ's
-  writeRegister(REG_IRQ_FLAGS, IRQ_TX_DONE_MASK);
-
-  return 1;
-}
-
-void LoRaClass::endPacketasync()
-{
-  // put in TX mode
-  writeRegister(REG_OP_MODE, MODE_LONG_RANGE_MODE | MODE_TX);
-  // apparently this grace time is required for the radio
-  delayMicroseconds(150);
+  if (async)
+  {
+    // grace time is required for the radio
+    delayMicroseconds(150);
+    return 0;
+  } else {
+    // wait for TX done
+    while ((readRegister(REG_IRQ_FLAGS) & IRQ_TX_DONE_MASK) == 0) {
+      yield();
+    }
+    // clear IRQ's
+    writeRegister(REG_IRQ_FLAGS, IRQ_TX_DONE_MASK);
+    return 1;
+  }
 }
 
 bool LoRaClass::isTransmitting()

src/LoRa.h

@@ -22,8 +22,7 @@ class LoRaClass : public Stream {
   void end();
 
   int beginPacket(int implicitHeader = false);
-  int endPacket();
-  void endPacketasync();
+  int endPacket(bool async = false);
   bool isTransmitting();
 
   int parsePacket(int size = 0);