a split of sub-1GHz radio driver

lyusupov · May 7, 2024 · 2fbbada · 2fbbada
1 parent 68e2863
commit 2fbbada
Show file tree

Hide file tree

Showing 14 changed files with 773 additions and 759 deletions.
diff --git a/software/firmware/source/SoftRF/Makefile b/software/firmware/source/SoftRF/Makefile
@@ -143,16 +143,17 @@ PLAT_CPPS     := $(PLATFORM_PATH)/ESP8266.cpp  \
                  $(PLATFORM_PATH)/RA4M1.cpp    \
                  $(PLATFORM_PATH)/EFR32.cpp
 
-DRV_CPPS      := $(DRIVER_PATH)/RF.cpp        \
-                 $(DRIVER_PATH)/GNSS.cpp      \
-                 $(DRIVER_PATH)/Baro.cpp      \
-                 $(DRIVER_PATH)/LED.cpp       \
-                 $(DRIVER_PATH)/OLED.cpp      \
-                 $(DRIVER_PATH)/Battery.cpp   \
-                 $(DRIVER_PATH)/EEPROM.cpp    \
-                 $(DRIVER_PATH)/Bluetooth.cpp \
-                 $(DRIVER_PATH)/Sound.cpp     \
-                 $(DRIVER_PATH)/WiFi.cpp      \
+DRV_CPPS      := $(DRIVER_PATH)/RF.cpp             \
+                 $(DRIVER_PATH)/radio/radiolib.cpp \
+                 $(DRIVER_PATH)/GNSS.cpp           \
+                 $(DRIVER_PATH)/Baro.cpp           \
+                 $(DRIVER_PATH)/LED.cpp            \
+                 $(DRIVER_PATH)/OLED.cpp           \
+                 $(DRIVER_PATH)/Battery.cpp        \
+                 $(DRIVER_PATH)/EEPROM.cpp         \
+                 $(DRIVER_PATH)/Bluetooth.cpp      \
+                 $(DRIVER_PATH)/Sound.cpp          \
+                 $(DRIVER_PATH)/WiFi.cpp           \
                  $(DRIVER_PATH)/EPD.cpp
 
 UI_CPPS       := $(UI_PATH)/Web.cpp        \

diff --git a/software/firmware/source/SoftRF/src/driver/OLED.cpp b/software/firmware/source/SoftRF/src/driver/OLED.cpp
@@ -74,7 +74,6 @@ bool OLED_busy                      = false;
 
 static uint32_t prev_tx_packets_counter = (uint32_t) -1;
 static uint32_t prev_rx_packets_counter = (uint32_t) -1;
-extern uint32_t tx_packets_counter, rx_packets_counter;
 
 static uint32_t prev_acrfts_counter = (uint32_t) -1;
 static uint32_t prev_sats_counter   = (uint32_t) -1;