ua1zbe
/
LoRa_APRS_Tracker111
mirror of https://github.com/richonguzman/LoRa_APRS_Tracker.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sx126x to 2 and 8

This commit is contained in:
richonguzman 2024-05-16 01:04:38 -04:00
parent f04eb7c9d6
commit 1a8e9004fd
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
platformio.ini
View File

@ -132,7 +132,7 @@ board = esp32dev
build_flags = build_flags =
-Werror -Wall -Werror -Wall
-DESP32_DIY_1W_LoRa_GPS -DESP32_DIY_1W_LoRa_GPS
-DHAS_SX126X -DHAS_SX1268
-DHAS_BT_CLASSIC -DHAS_BT_CLASSIC
lib_deps = lib_deps =
${common.lib_deps} ${common.lib_deps}
@ -148,7 +148,7 @@ board = ttgo-t-beam
build_flags = build_flags =
-Werror -Wall -Werror -Wall
-DTTGO_T_Beam_V1_0_SX1268 -DTTGO_T_Beam_V1_0_SX1268
-DHAS_SX126X -DHAS_SX1268
-DHAS_AXP192 -DHAS_AXP192
-DHAS_BT_CLASSIC -DHAS_BT_CLASSIC
lib_deps = lib_deps =
@ -166,7 +166,7 @@ board = ttgo-t-beam
build_flags = build_flags =
-Werror -Wall -Werror -Wall
-DTTGO_T_Beam_V1_2_SX1262 -DTTGO_T_Beam_V1_2_SX1262
-DHAS_SX126X -DHAS_SX1262
-DHAS_AXP2101 -DHAS_AXP2101
-DHAS_BT_CLASSIC -DHAS_BT_CLASSIC
lib_deps = lib_deps =
@ -201,7 +201,7 @@ board_build.mcu = esp32s3
build_flags = build_flags =
-DTTGO_T_Beam_S3_SUPREME_V3 -DTTGO_T_Beam_S3_SUPREME_V3
-DBOARD_HAS_PSRAM -DBOARD_HAS_PSRAM
-DHAS_SX126X -DHAS_SX1262
-DHAS_AXP2101 -DHAS_AXP2101
-DARDUINO_USB_MODE=1 -DARDUINO_USB_MODE=1
-DARDUINO_USB_CDC_ON_BOOT=1 -DARDUINO_USB_CDC_ON_BOOT=1
@ -220,7 +220,7 @@ board = heltec_wifi_lora_32_V3
board_build.mcu = esp32s3 board_build.mcu = esp32s3
build_flags = build_flags =
-DHELTEC_V3_GPS -DHELTEC_V3_GPS
-DHAS_SX126X -DHAS_SX1262
-DARDUINO_USB_MODE=1 -DARDUINO_USB_MODE=1
-DARDUINO_USB_CDC_ON_BOOT=1 -DARDUINO_USB_CDC_ON_BOOT=1
lib_deps = lib_deps =
@ -237,7 +237,7 @@ board = esp32dev
build_flags = build_flags =
-Werror -Wall -Werror -Wall
-DOE5HWN_MeshCom -DOE5HWN_MeshCom
-DHAS_SX126X -DHAS_SX1268
-DHAS_BT_CLASSIC -DHAS_BT_CLASSIC
lib_deps = lib_deps =
${common.lib_deps} ${common.lib_deps}
@ -271,7 +271,7 @@ board = esp32-s3-devkitc-1
board_build.mcu = esp32s3 board_build.mcu = esp32s3
build_flags = build_flags =
-DHELTEC_WIRELESS_TRACKER -DHELTEC_WIRELESS_TRACKER
-DHAS_SX126X -DHAS_SX1262
-DHIGH_GPS_BAUDRATE -DHIGH_GPS_BAUDRATE
-DHAS_TFT -DHAS_TFT
-D USER_SETUP_LOADED -D USER_SETUP_LOADED
@ -310,7 +310,7 @@ board = esp32-s3-devkitc-1
board_build.mcu = esp32s3 board_build.mcu = esp32s3
build_flags = build_flags =
-DTTGO_T_DECK_GPS -DTTGO_T_DECK_GPS
-DHAS_SX126X -DHAS_SX1262
-DHAS_TFT -DHAS_TFT
-DBOARD_HAS_PSRAM -DBOARD_HAS_PSRAM
-DUSER_SETUP_LOADED -DUSER_SETUP_LOADED

16
src/lora_utils.cpp
View File

@ -8,7 +8,7 @@
#ifdef HAS_SX127X #ifdef HAS_SX127X
#include <LoRa.h> #include <LoRa.h>
#endif #endif
#ifdef HAS_SX126X #if defined(HAS_SX1262) || defined(HAS_SX1268)
#include <RadioLib.h> #include <RadioLib.h>
#endif #endif
@ -20,12 +20,12 @@ extern uint8_t loraIndex;
extern int loraIndexSize; extern int loraIndexSize;
#if defined(TTGO_T_Beam_V1_0_SX1268) || defined(ESP32_DIY_1W_LoRa_GPS) || defined(OE5HWN_MeshCom) #if defined(HAS_SX1268)
SX1268 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN); SX1268 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN);
bool transmissionFlag = true; bool transmissionFlag = true;
bool enableInterrupt = true; bool enableInterrupt = true;
#endif #endif
#if defined(TTGO_T_Beam_V1_2_SX1262) || defined(TTGO_T_Beam_S3_SUPREME_V3) || defined(HELTEC_V3_GPS) || defined(HELTEC_WIRELESS_TRACKER) || defined(TTGO_T_DECK_GPS) #if defined(HAS_SX1262)
SX1262 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN); SX1262 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN);
bool transmissionFlag = true; bool transmissionFlag = true;
bool enableInterrupt = true; bool enableInterrupt = true;
@ -34,7 +34,7 @@ extern int loraIndexSize;
namespace LoRa_Utils { namespace LoRa_Utils {
void setFlag(void) { void setFlag(void) {
#ifdef HAS_SX126X #if defined(HAS_SX1262) || defined(HAS_SX1268)
if(!enableInterrupt) { if(!enableInterrupt) {
return; return;
} }
@ -49,7 +49,7 @@ namespace LoRa_Utils {
loraIndex++; loraIndex++;
} }
currentLoRaType = &Config.loraTypes[loraIndex]; currentLoRaType = &Config.loraTypes[loraIndex];
#ifdef HAS_SX126X #if defined(HAS_SX1262) || defined(HAS_SX1268)
float freq = (float)currentLoRaType->frequency/1000000; float freq = (float)currentLoRaType->frequency/1000000;
radio.setFrequency(freq); radio.setFrequency(freq);
radio.setSpreadingFactor(currentLoRaType->spreadingFactor); radio.setSpreadingFactor(currentLoRaType->spreadingFactor);
@ -85,7 +85,7 @@ namespace LoRa_Utils {
} }
void setup() { void setup() {
#ifdef HAS_SX126X #if defined(HAS_SX1262) || defined(HAS_SX1268)
logger.log(logging::LoggerLevel::LOGGER_LEVEL_DEBUG, "LoRa", "Set SPI pins!"); logger.log(logging::LoggerLevel::LOGGER_LEVEL_DEBUG, "LoRa", "Set SPI pins!");
SPI.begin(RADIO_SCLK_PIN, RADIO_MISO_PIN, RADIO_MOSI_PIN); SPI.begin(RADIO_SCLK_PIN, RADIO_MISO_PIN, RADIO_MOSI_PIN);
float freq = (float)currentLoRaType->frequency/1000000; float freq = (float)currentLoRaType->frequency/1000000;
@ -155,7 +155,7 @@ namespace LoRa_Utils {
} }
if (Config.notification.ledTx) digitalWrite(Config.notification.ledTxPin, HIGH); if (Config.notification.ledTx) digitalWrite(Config.notification.ledTxPin, HIGH);
if (Config.notification.buzzerActive && Config.notification.txBeep) NOTIFICATION_Utils::beaconTxBeep(); if (Config.notification.buzzerActive && Config.notification.txBeep) NOTIFICATION_Utils::beaconTxBeep();
#ifdef HAS_SX126X #if defined(HAS_SX1262) || defined(HAS_SX1268)
enableInterrupt = false; enableInterrupt = false;
int state = radio.transmit("\x3c\xff\x01" + newPacket); int state = radio.transmit("\x3c\xff\x01" + newPacket);
if (state == RADIOLIB_ERR_NONE) { if (state == RADIOLIB_ERR_NONE) {
@ -202,7 +202,7 @@ namespace LoRa_Utils {
logger.log(logging::LoggerLevel::LOGGER_LEVEL_INFO, "LoRa Rx", "---> %s", packet.substring(3).c_str()); logger.log(logging::LoggerLevel::LOGGER_LEVEL_INFO, "LoRa Rx", "---> %s", packet.substring(3).c_str());
} }
#endif #endif
#ifdef HAS_SX126X #if defined(HAS_SX1262) || defined(HAS_SX1268)
if (transmissionFlag) { if (transmissionFlag) {
transmissionFlag = false; transmissionFlag = false;
int state = radio.readData(packet); int state = radio.readData(packet);

3
src/power_utils.cpp
View File

@ -444,6 +444,7 @@ namespace POWER_Utils {
} }
void lowerCpuFrequency() { void lowerCpuFrequency() {
// later for all boards!
#if defined(HAS_AXP192) || defined(HAS_AXP2101) || defined(ESP32_DIY_LoRa_GPS) || defined(TTGO_T_LORA32_V2_1_GPS) || defined(TTGO_T_LORA32_V2_1_TNC) || defined(ESP32_DIY_1W_LoRa_GPS) || defined(HELTEC_V3_GPS) || defined(OE5HWN_MeshCom) || defined(ESP32_C3_DIY_LoRa_GPS) || defined(HELTEC_WIRELESS_TRACKER) || defined(TTGO_T_DECK_GPS) #if defined(HAS_AXP192) || defined(HAS_AXP2101) || defined(ESP32_DIY_LoRa_GPS) || defined(TTGO_T_LORA32_V2_1_GPS) || defined(TTGO_T_LORA32_V2_1_TNC) || defined(ESP32_DIY_1W_LoRa_GPS) || defined(HELTEC_V3_GPS) || defined(OE5HWN_MeshCom) || defined(ESP32_C3_DIY_LoRa_GPS) || defined(HELTEC_WIRELESS_TRACKER) || defined(TTGO_T_DECK_GPS)
if (setCpuFrequencyMhz(80)) { if (setCpuFrequencyMhz(80)) {
logger.log(logging::LoggerLevel::LOGGER_LEVEL_DEBUG, "Main", "CPU frequency set to 80MHz"); logger.log(logging::LoggerLevel::LOGGER_LEVEL_DEBUG, "Main", "CPU frequency set to 80MHz");
@ -460,7 +461,7 @@ namespace POWER_Utils {
PMU.shutdown(); PMU.shutdown();
#else #else
if (Config.bluetoothType==0) { if (Config.bluetoothType == 0) {
BLE_Utils::stop(); BLE_Utils::stop();
} else { } else {
// turn off BT classic ??? // turn off BT classic ???