From 2fa6872e6be4c4122e6a54f3ade411ba24538270 Mon Sep 17 00:00:00 2001 From: richonguzman Date: Thu, 16 May 2024 11:23:23 -0400 Subject: [PATCH] radiolib in tbeam v1_2 --- platformio.ini | 4 ++-- src/LoRa_APRS_Tracker.cpp | 2 +- src/{pins_config.h => boards_pinout.h} | 10 ++++++++-- src/display.cpp | 2 +- src/gps_utils.cpp | 2 +- src/keyboard_utils.cpp | 2 +- src/lora_utils.cpp | 2 +- src/power_utils.cpp | 2 +- 8 files changed, 16 insertions(+), 10 deletions(-) rename src/{pins_config.h => boards_pinout.h} (95%) diff --git a/platformio.ini b/platformio.ini index 055ea6c..9a4e97d 100644 --- a/platformio.ini +++ b/platformio.ini @@ -48,13 +48,13 @@ board = ttgo-t-beam build_flags = -Werror -Wall -DTTGO_T_Beam_V1_2 - -DHAS_SX127X + -DHAS_SX1278 -DHAS_AXP2101 -DHAS_BT_CLASSIC lib_deps = ${common.lib_deps} lewisxhe/XPowersLib@^0.1.8 - sandeepmistry/LoRa @ 0.8.0 + jgromes/RadioLib @ 6.1.0 adafruit/Adafruit GFX Library @ 1.11.7 adafruit/Adafruit SSD1306 @ 2.5.7 adafruit/Adafruit SH110X@^2.1.8 diff --git a/src/LoRa_APRS_Tracker.cpp b/src/LoRa_APRS_Tracker.cpp index 79cec2b..06b263c 100644 --- a/src/LoRa_APRS_Tracker.cpp +++ b/src/LoRa_APRS_Tracker.cpp @@ -23,8 +23,8 @@ ________________________________________________________________________________ #include "keyboard_utils.h" #include "configuration.h" #include "station_utils.h" +#include "boards_pinout.h" #include "button_utils.h" -#include "pins_config.h" #include "power_utils.h" #include "menu_utils.h" #include "lora_utils.h" diff --git a/src/pins_config.h b/src/boards_pinout.h similarity index 95% rename from src/pins_config.h rename to src/boards_pinout.h index b5aa367..03a9877 100644 --- a/src/pins_config.h +++ b/src/boards_pinout.h @@ -1,5 +1,5 @@ -#ifndef PINS_CONFIG_H_ -#define PINS_CONFIG_H_ +#ifndef BOARDS_PINOUT_H_ +#define BOARDS_PINOUT_H_ #undef OLED_SDA #undef OLED_SCL @@ -13,6 +13,12 @@ #define GPS_RX 12 #define GPS_TX 34 #define BUTTON_PIN 38 // The middle button GPIO on the T-Beam + #define RADIO_SCLK_PIN 5 + #define RADIO_MISO_PIN 19 + #define RADIO_MOSI_PIN 27 + #define RADIO_CS_PIN 18 // CS --> NSS + #define RADIO_RST_PIN 23 + #define RADIO_BUSY_PIN 26 // IRQ --> DIO0 #endif diff --git a/src/display.cpp b/src/display.cpp index be5e7d0..ff41334 100644 --- a/src/display.cpp +++ b/src/display.cpp @@ -2,7 +2,7 @@ #include #include "custom_characters.h" #include "configuration.h" -#include "pins_config.h" +#include "boards_pinout.h" #include "display.h" #include "TimeLib.h" diff --git a/src/gps_utils.cpp b/src/gps_utils.cpp index 454ddb9..a83d9f8 100644 --- a/src/gps_utils.cpp +++ b/src/gps_utils.cpp @@ -2,7 +2,7 @@ #include "TimeLib.h" #include "configuration.h" #include "station_utils.h" -#include "pins_config.h" +#include "boards_pinout.h" #include "gps_utils.h" #include "display.h" #include "logger.h" diff --git a/src/keyboard_utils.cpp b/src/keyboard_utils.cpp index 5afad95..a25bf03 100644 --- a/src/keyboard_utils.cpp +++ b/src/keyboard_utils.cpp @@ -7,7 +7,7 @@ #include "station_utils.h" #include "configuration.h" #include "power_utils.h" -#include "pins_config.h" +#include "boards_pinout.h" #include "msg_utils.h" #include "display.h" diff --git a/src/lora_utils.cpp b/src/lora_utils.cpp index 5d0825e..8d6219d 100644 --- a/src/lora_utils.cpp +++ b/src/lora_utils.cpp @@ -2,7 +2,7 @@ #include #include "notification_utils.h" #include "configuration.h" -#include "pins_config.h" +#include "boards_pinout.h" #include "lora_utils.h" #include "display.h" #ifdef HAS_SX127X diff --git a/src/power_utils.cpp b/src/power_utils.cpp index 2f143dc..3ff5953 100644 --- a/src/power_utils.cpp +++ b/src/power_utils.cpp @@ -2,7 +2,7 @@ #include "configuration.h" #include "power_utils.h" #include "notification_utils.h" -#include "pins_config.h" +#include "boards_pinout.h" #include "ble_utils.h" #include "logger.h"