Radio modes

gs_setup.py

@@ -5,41 +5,19 @@
 import board
 import busio
 import digitalio
-from lib import pycubed_rfm9x_fsk
+from lib import radiohead
 from lib.configuration import radio_configuration as rf_config
-from shell_utils import bold, normal
 
 
-def initialize_rfm9x(spi, cs, reset):
-    """
-    Initialize the radio - uses lib/configuration/radio_configuration to configure with defaults
-    """
-
-    rfm_device = pycubed_rfm9x_fsk.RFM9x(
-        spi,
-        cs,
-        reset,
-        rf_config.FREQUENCY,
-    )
-
-    # configure to match satellite
-    rfm_device.tx_power = rf_config.TX_POWER
-    rfm_device.bitrate = rf_config.BITRATE
-    rfm_device.frequency_deviation = rf_config.FREQUENCY_DEVIATION
-    rfm_device.rx_bandwidth = rf_config.RX_BANDWIDTH
-    rfm_device.preamble_length = rf_config.PREAMBLE_LENGTH
-
-    return rfm_device
-
-
-def initialize_radiohead(tx_device, rx_device=None, rxtx_switch=None):
-
-    rh = pycubed_rfm9x_fsk.Radiohead(
-        tx_device,
-        rx_device=rx_device,
-        rxtx_switch=rxtx_switch,
-        checksum=rf_config.CHECKSUM
-    )
+def initialize_radio(tx_spi, tx_cs, tx_reset, rx_spi=None, rx_cs=None, rx_reset=None, rxtx_switch=None):
+    rh = radiohead.Radiohead(rf_config.PROTOCOL,
+                             tx_spi,
+                             tx_cs,
+                             tx_reset,
+                             rx_spi,
+                             rx_cs,
+                             rx_reset,
+                             rxtx_switch)
 
     rh.ack_delay = rf_config.ACK_DELAY
     rh.ack_wait = rf_config.ACK_WAIT
@@ -49,16 +27,6 @@ def initialize_radiohead(tx_device, rx_device=None, rxtx_switch=None):
 
     return rh
 
-
-def initialize_radio(tx_spi, tx_cs, tx_reset, rx_spi=None, rx_cs=None, rx_reset=None, rxtx_switch=None):
-    tx_device = initialize_rfm9x(tx_spi, tx_cs, tx_reset)
-    rx_device = None
-    if rx_spi and rx_cs and rx_reset:
-        rx_device = initialize_rfm9x(rx_spi, rx_cs, rx_reset)
-
-    return initialize_radiohead(tx_device, rx_device=rx_device, rxtx_switch=rxtx_switch)
-
-
 def satellite_spi_config():
     # pocketqube
     spi = busio.SPI(board.SCK, MOSI=board.MOSI, MISO=board.MISO)
@@ -100,7 +68,7 @@ def pi_spi_config():
 def rpigs_tx_spi_config():
     spi = busio.SPI(board.SCK, MOSI=board.MOSI, MISO=board.MISO)
 
-    cs = digitalio.DigitalInOut(board.D7)
+    cs = digitalio.DigitalInOut(board.D8)
     reset = digitalio.DigitalInOut(board.D25)
 
     return spi, cs, reset

lib/configuration/radio_configuration.py

@@ -2,16 +2,28 @@
 Defines the default settings used to configure the RFM9x satellite
 """
 
-CHECKSUM = True
-TX_POWER = 23  # dB
+# either "lora" or "fsk"
+PROTOCOL = "lora"
+
+# FSK specific
 BITRATE = 1200  # bits per second
-FREQUENCY = 433.0  # MHz
 FREQUENCY_DEVIATION = 10000  # Hz
 RX_BANDWIDTH = 25.0  # KHz
+
+# LoRa specific
+SPREADING_FACTOR = 7
+SIGNAL_BANDWIDTH = 125000
+CODING_RATE = 5
+
+# shared between lora/fsk
+CHECKSUM = True
+TX_POWER = 23  # dB
+FREQUENCY = 433.0  # MHz
 PREAMBLE_LENGTH = 16  # bytes
 ACK_DELAY = 0.1  # seconds
 ACK_WAIT = 1  # seconds
-RECEIVE_TIMEOUT = 0.5  # seconds
+RECEIVE_TIMEOUT = 2.0  # seconds
+ACK_RETRIES = 2  # lower b/c TX queue retries as well
 
 SATELLITE_ID = 0xAB
 GROUNDSTATION_ID = 0xBA