Update SX126x examples

Author: chandrawi

examples/SX126x/driver_rx.py

@@ -1,15 +1,19 @@
 import os, sys
 currentdir = os.path.dirname(os.path.realpath(__file__))
 sys.path.append(os.path.dirname(os.path.dirname(currentdir)))
-from LoRaRF import SX126x
-import RPi.GPIO
+from LoRaRF import SX126x, LoRaSpi, LoRaGpio
 import time
-
-busId = 1; csId = 0
-resetPin = 22; busyPin = 23; irqPin = 26; txenPin = 5; rxenPin = 25
-
-LoRa = SX126x()
-GPIO = RPi.GPIO
+from threading import Thread
+
+# Begin LoRa radio with connected SPI bus and IO pins (cs, reset and busy) on GPIO
+spi = LoRaSpi(0, 0)
+cs = LoRaGpio(0, 8)
+reset = LoRaGpio(0, 24)
+busy = LoRaGpio(0, 23)
+irq = LoRaGpio(0, 17)
+txen = LoRaGpio(0, 5)
+rxen = LoRaGpio(0, 25)
+LoRa = SX126x(spi, cs, reset, busy)
 
 # TCXO control setting
 dio3Voltage = LoRa.DIO3_OUTPUT_1_8
@@ -41,21 +45,15 @@
 
 # Receive flag
 received = False
-intSet = False
 
-def checkReceiveDone(channel) :
+def checkReceiveDone() :
     global received
     received = True
 
 def settingFunction() :
 
     print("-- SETTING FUNCTION --")
 
-    # SPI and GPIO Pins setting
-    print("Setting pins")
-    LoRa.setSpi(busId, csId)
-    LoRa.setPins(resetPin, busyPin, irqPin, txenPin, rxenPin)
-
     # Reset RF module by setting resetPin to LOW and begin SPI communication
     print("Resetting RF module")
     LoRa.reset()
@@ -112,16 +110,13 @@ def receiveFunction(message: list, timeout: int) -> int :
     LoRa.setDioIrqParams(mask, mask, LoRa.IRQ_NONE, LoRa.IRQ_NONE)
     # Attach irqPin to DIO1
     print(f"Attach interrupt on IRQ pin")
-    global intSet
-    if not intSet :
-        GPIO.setup(irqPin, GPIO.IN)
-        GPIO.add_event_detect(irqPin, GPIO.RISING, callback=checkReceiveDone, bouncetime=100)
-        intSet = True
+    monitoring = Thread(target=irq.monitor, args=(checkReceiveDone, 0.1))
+    monitoring.start()
 
     # Set rxen and txen pin state for receiving packet
-    if txenPin != -1 and rxenPin != -1 :
-        GPIO.output(txenPin, GPIO.LOW)
-        GPIO.output(rxenPin, GPIO.HIGH)
+    if txen != None and rxen != None :
+        txen.output(LoRaGpio.LOW)
+        rxen.output(LoRaGpio.HIGH)
 
     # Calculate timeout (timeout duration = timeout * 15.625 us)
     tOut = timeout * 64
@@ -133,15 +128,16 @@ def receiveFunction(message: list, timeout: int) -> int :
     print("Wait for RX done interrupt")
     global received
     while not received : pass
+    monitoring.join()
     # Clear transmit interrupt flag
     received = False
 
     # Clear the interrupt status
     irqStat = LoRa.getIrqStatus()
     print("Clear IRQ status")
     LoRa.clearIrqStatus(irqStat)
-    if rxenPin != -1 :
-        GPIO.output(rxenPin, GPIO.LOW)
+    if rxen != None :
+        rxen.output(LoRaGpio.LOW)
 
     # Exit function if timeout reached
     if irqStat & LoRa.IRQ_TIMEOUT :

examples/SX126x/driver_tx.py

@@ -1,15 +1,19 @@
 import os, sys
 currentdir = os.path.dirname(os.path.realpath(__file__))
 sys.path.append(os.path.dirname(os.path.dirname(currentdir)))
-from LoRaRF import SX126x
-import RPi.GPIO
+from LoRaRF import SX126x, LoRaSpi, LoRaGpio
 import time
-
-busId = 1; csId = 0
-resetPin = 22; busyPin = 23; irqPin = 26; txenPin = 5; rxenPin = 25
-
-LoRa = SX126x()
-GPIO = RPi.GPIO
+from threading import Thread
+
+# Begin LoRa radio with connected SPI bus and IO pins (cs, reset and busy) on GPIO
+spi = LoRaSpi(0, 0)
+cs = LoRaGpio(0, 8)
+reset = LoRaGpio(0, 24)
+busy = LoRaGpio(0, 23)
+irq = LoRaGpio(0, 17)
+txen = LoRaGpio(0, 5)
+rxen = LoRaGpio(0, 25)
+LoRa = SX126x(spi, cs, reset, busy)
 
 # TCXO control setting
 dio3Voltage = LoRa.DIO3_OUTPUT_1_8
@@ -44,21 +48,15 @@
 
 # Transmit flag
 transmitted = False
-intSet = False
 
-def checkTransmitDone(channel) :
+def checkTransmitDone() :
     global transmitted
     transmitted = True
 
 def settingFunction() :
 
     print("-- SETTING FUNCTION --")
 
-    # SPI and GPIO Pins setting
-    print("Setting pins")
-    LoRa.setSpi(busId, csId)
-    LoRa.setPins(resetPin, busyPin, irqPin, txenPin, rxenPin)
-
     # Reset RF module by setting resetPin to LOW and begin SPI communication
     print("Resetting RF module")
     LoRa.reset()
@@ -131,15 +129,12 @@ def transmitFunction(message: list, timeout: int) -> int :
 
     # Attach irqPin to DIO1
     print(f"Attach interrupt on IRQ pin")
-    global intSet
-    if not intSet :
-        GPIO.setup(irqPin, GPIO.IN)
-        GPIO.add_event_detect(irqPin, GPIO.RISING, callback=checkTransmitDone, bouncetime=100)
-        intSet = True
+    monitoring = Thread(target=irq.monitor, args=(checkTransmitDone, 0.1))
+    monitoring.start()
     # Set rxen and txen pin state for transmitting packet
-    if txenPin != -1 and rxenPin != -1 :
-        GPIO.output(txenPin, GPIO.HIGH)
-        GPIO.output(rxenPin, GPIO.LOW)
+    if txen != None and rxen != None :
+        txen.output(LoRaGpio.HIGH)
+        rxen.output(LoRaGpio.LOW)
 
     # Calculate timeout (timeout duration = timeout * 15.625 us)
     tOut = timeout * 64
@@ -153,6 +148,7 @@ def transmitFunction(message: list, timeout: int) -> int :
     print("Wait for TX done interrupt")
     global transmitted
     while not transmitted : pass
+    monitoring.join()
     tTrans = time.time() - tStart
     # Clear transmit interrupt flag
     transmitted = False
@@ -165,8 +161,8 @@ def transmitFunction(message: list, timeout: int) -> int :
     irqStat = LoRa.getIrqStatus()
     print("Clear IRQ status")
     LoRa.clearIrqStatus(irqStat)
-    if txenPin != -1 :
-        GPIO.output(txenPin, GPIO.LOW)
+    if txen != None :
+        txen.output(LoRaGpio.LOW)
 
     # Return interrupt status
     return irqStat

examples/SX126x/receiver.py

@@ -1,16 +1,18 @@
 import os, sys
 currentdir = os.path.dirname(os.path.realpath(__file__))
 sys.path.append(os.path.dirname(os.path.dirname(currentdir)))
-from LoRaRF import SX126x
+from LoRaRF import SX126x, LoRaSpi, LoRaGpio
 import time
 
-# Begin LoRa radio and set NSS, reset, busy, IRQ, txen, and rxen pin with connected Raspberry Pi gpio pins
-# IRQ pin not used in this example (set to -1). Set txen and rxen pin to -1 if RF module doesn't have one
-busId = 1; csId = 0
-resetPin = 22; busyPin = 23; irqPin = -1; txenPin = 5; rxenPin = 25
-LoRa = SX126x()
+# Begin LoRa radio with connected SPI bus and IO pins (cs and reset) on GPIO
+# SPI is defined by bus ID and cs ID and IO pins defined by chip and offset number
+spi = LoRaSpi(0, 0)
+cs = LoRaGpio(0, 8)
+reset = LoRaGpio(0, 24)
+busy = LoRaGpio(0, 23)
+LoRa = SX126x(spi, cs, reset, busy)
 print("Begin LoRa radio")
-if not LoRa.begin(busId, csId, resetPin, busyPin, irqPin, txenPin, rxenPin) :
+if not LoRa.begin() :
     raise Exception("Something wrong, can't begin LoRa radio")
 
 # Configure LoRa to use TCXO with DIO3 as control

examples/SX126x/receiver_continuous.py

@@ -1,15 +1,19 @@
 import os, sys
 currentdir = os.path.dirname(os.path.realpath(__file__))
 sys.path.append(os.path.dirname(os.path.dirname(currentdir)))
-from LoRaRF import SX126x
+from LoRaRF import SX126x, LoRaSpi, LoRaGpio
 import time
 
-# Begin LoRa radio and set NSS, reset, busy, IRQ, txen, and rxen pin with connected Raspberry Pi gpio pins
-busId = 1; csId = 0
-resetPin = 22; busyPin = 23; irqPin = 26; txenPin = 5; rxenPin = 25
-LoRa = SX126x()
+# Begin LoRa radio with connected SPI bus and IO pins (cs and reset) on GPIO
+# SPI is defined by bus ID and cs ID and IO pins defined by chip and offset number
+spi = LoRaSpi(0, 0)
+cs = LoRaGpio(0, 8)
+reset = LoRaGpio(0, 24)
+busy = LoRaGpio(0, 23)
+irq = LoRaGpio(0, 17)
+LoRa = SX126x(spi, cs, reset, busy, irq)
 print("Begin LoRa radio")
-if not LoRa.begin(busId, csId, resetPin, busyPin, irqPin, txenPin, rxenPin) :
+if not LoRa.begin() :
     raise Exception("Something wrong, can't begin LoRa radio")
 
 # Configure LoRa to use TCXO with DIO3 as control

examples/SX126x/receiver_listen.py

@@ -1,15 +1,18 @@
 import os, sys
 currentdir = os.path.dirname(os.path.realpath(__file__))
 sys.path.append(os.path.dirname(os.path.dirname(currentdir)))
-from LoRaRF import SX126x
+from LoRaRF import SX126x, LoRaSpi, LoRaGpio
 import time
 
-# Begin LoRa radio and set NSS, reset, busy, IRQ, txen, and rxen pin with connected Raspberry Pi gpio pins
-busId = 1; csId = 0
-resetPin = 22; busyPin = 23; irqPin = 26; txenPin = 5; rxenPin = 25
-LoRa = SX126x()
+# Begin LoRa radio with connected SPI bus and IO pins (cs and reset) on GPIO
+# SPI is defined by bus ID and cs ID and IO pins defined by chip and offset number
+spi = LoRaSpi(0, 0)
+cs = LoRaGpio(0, 8)
+reset = LoRaGpio(0, 24)
+busy = LoRaGpio(0, 23)
+LoRa = SX126x(spi, cs, reset, busy)
 print("Begin LoRa radio")
-if not LoRa.begin(busId, csId, resetPin, busyPin, irqPin, txenPin, rxenPin) :
+if not LoRa.begin() :
     raise Exception("Something wrong, can't begin LoRa radio")
 
 # Configure LoRa to use TCXO with DIO3 as control

examples/SX126x/transmitter.py

@@ -1,16 +1,18 @@
 import os, sys
 currentdir = os.path.dirname(os.path.realpath(__file__))
 sys.path.append(os.path.dirname(os.path.dirname(currentdir)))
-from LoRaRF import SX126x
+from LoRaRF import SX126x, LoRaSpi, LoRaGpio
 import time
 
-# Begin LoRa radio and set NSS, reset, busy, IRQ, txen, and rxen pin with connected Raspberry Pi gpio pins
-# IRQ pin not used in this example (set to -1). Set txen and rxen pin to -1 if RF module doesn't have one
-busId = 1; csId = 0
-resetPin = 22; busyPin = 23; irqPin = -1; txenPin = 5; rxenPin = 25
-LoRa = SX126x()
+# Begin LoRa radio with connected SPI bus and IO pins (cs and reset) on GPIO
+# SPI is defined by bus ID and cs ID and IO pins defined by chip and offset number
+spi = LoRaSpi(0, 0)
+cs = LoRaGpio(0, 8)
+reset = LoRaGpio(0, 24)
+busy = LoRaGpio(0, 23)
+LoRa = SX126x(spi, cs, reset, busy)
 print("Begin LoRa radio")
-if not LoRa.begin(busId, csId, resetPin, busyPin, irqPin, txenPin, rxenPin) :
+if not LoRa.begin() :
     raise Exception("Something wrong, can't begin LoRa radio")
 
 # Configure LoRa to use TCXO with DIO3 as control