From 98f178510480a40a98f544348633ba429b06c483 Mon Sep 17 00:00:00 2001 From: Scott Powell Date: Thu, 8 May 2025 13:23:53 +1000 Subject: [PATCH] * refactor: LocationProvider classes moved to src/helpers/sensors * refactor: Heltec_Wireless_Tracker* env moved to new variants/heltec_tracker dir --- .../helpers/sensors}/LocationProvider.h | 0 .../sensors}/MicroNMEALocationProvider.h | 0 variants/heltec_tracker/platformio.ini | 58 ++++++++++++++ variants/heltec_tracker/target.cpp | 76 +++++++++++++++++++ variants/heltec_tracker/target.h | 20 +++++ variants/heltec_v3/platformio.ini | 45 +---------- variants/t1000-e/target.cpp | 1 + variants/t1000-e/target.h | 3 +- 8 files changed, 159 insertions(+), 44 deletions(-) rename {variants/t1000-e => src/helpers/sensors}/LocationProvider.h (100%) rename {variants/t1000-e => src/helpers/sensors}/MicroNMEALocationProvider.h (100%) create mode 100644 variants/heltec_tracker/platformio.ini create mode 100644 variants/heltec_tracker/target.cpp create mode 100644 variants/heltec_tracker/target.h diff --git a/variants/t1000-e/LocationProvider.h b/src/helpers/sensors/LocationProvider.h similarity index 100% rename from variants/t1000-e/LocationProvider.h rename to src/helpers/sensors/LocationProvider.h diff --git a/variants/t1000-e/MicroNMEALocationProvider.h b/src/helpers/sensors/MicroNMEALocationProvider.h similarity index 100% rename from variants/t1000-e/MicroNMEALocationProvider.h rename to src/helpers/sensors/MicroNMEALocationProvider.h diff --git a/variants/heltec_tracker/platformio.ini b/variants/heltec_tracker/platformio.ini new file mode 100644 index 00000000..7b37b810 --- /dev/null +++ b/variants/heltec_tracker/platformio.ini @@ -0,0 +1,58 @@ +[Heltec_tracker_base] +extends = esp32_base +board = esp32-s3-devkitc-1 +build_flags = + ${esp32_base.build_flags} + -I variants/heltec_tracker + -D HELTEC_LORA_V3 + -D RADIO_CLASS=CustomSX1262 + -D WRAPPER_CLASS=CustomSX1262Wrapper + -D LORA_TX_POWER=22 + -D P_LORA_TX_LED=18 + -D PIN_BOARD_SDA=45 + -D PIN_BOARD_SCL=46 + -D PIN_USER_BTN=0 + -D PIN_ADC_CTRL=2 + -D PIN_TFT_SDA=42 ; SDIN + -D PIN_TFT_SCL=41 ; SCLK + -D PIN_TFT_DC=40 ; RS (register select) + -D PIN_TFT_RST=39 ; RES + -D PIN_TFT_CS=38 + -D USE_PIN_TFT=1 + -D PIN_TFT_VDD_CTL=3 ; Vext is connected to VDD which is also connected to LEDA + -D PIN_TFT_LEDA_CTL=21 ; LEDK (switches on/off via mosfet to create the ground) + -D SX126X_DIO2_AS_RF_SWITCH=true + -D SX126X_DIO3_TCXO_VOLTAGE=1.8 + -D SX126X_CURRENT_LIMIT=130.0f ; for best TX power! + -D SX126X_RX_BOOSTED_GAIN=1 +build_src_filter = ${esp32_base.build_src_filter} + +<../variants/heltec_tracker> +lib_deps = + ${esp32_base.lib_deps} + +[env:Heltec_Wireless_Tracker_companion_radio_ble] +extends = Heltec_tracker_base +build_flags = + ${Heltec_tracker_base.build_flags} + -I src/helpers/ui + ; -D ARDUINO_USB_CDC_ON_BOOT=1 ; need for debugging + -D ST7735 + -D DISPLAY_ROTATION=1 + -D DISPLAY_CLASS=ST7735Display + -D MAX_CONTACTS=100 + -D MAX_GROUP_CHANNELS=8 + -D BLE_PIN_CODE=123456 ; HWT will use display for pin +; -D BLE_DEBUG_LOGGING=1 +; -D ENABLE_PRIVATE_KEY_IMPORT=1 +; -D ENABLE_PRIVATE_KEY_EXPORT=1 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 +build_src_filter = ${Heltec_tracker_base.build_src_filter} + + + +<../examples/companion_radio> + + +lib_deps = + ${Heltec_tracker_base.lib_deps} + densaugeo/base64 @ ~1.4.0 + adafruit/Adafruit ST7735 and ST7789 Library @ ^1.11.0 + \ No newline at end of file diff --git a/variants/heltec_tracker/target.cpp b/variants/heltec_tracker/target.cpp new file mode 100644 index 00000000..27e0ebf9 --- /dev/null +++ b/variants/heltec_tracker/target.cpp @@ -0,0 +1,76 @@ +#include +#include "target.h" + +HeltecV3Board board; + +#if defined(P_LORA_SCLK) + static SPIClass spi; + RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY, spi); +#else + RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY); +#endif + +WRAPPER_CLASS radio_driver(radio, board); + +ESP32RTCClock fallback_clock; +AutoDiscoverRTCClock rtc_clock(fallback_clock); +SensorManager sensors; + +#ifndef LORA_CR + #define LORA_CR 5 +#endif + +bool radio_init() { + fallback_clock.begin(); + rtc_clock.begin(Wire); + +#ifdef SX126X_DIO3_TCXO_VOLTAGE + float tcxo = SX126X_DIO3_TCXO_VOLTAGE; +#else + float tcxo = 1.6f; +#endif + +#if defined(P_LORA_SCLK) + spi.begin(P_LORA_SCLK, P_LORA_MISO, P_LORA_MOSI); +#endif + int status = radio.begin(LORA_FREQ, LORA_BW, LORA_SF, LORA_CR, RADIOLIB_SX126X_SYNC_WORD_PRIVATE, LORA_TX_POWER, 8, tcxo); + if (status != RADIOLIB_ERR_NONE) { + Serial.print("ERROR: radio init failed: "); + Serial.println(status); + return false; // fail + } + + radio.setCRC(1); + +#ifdef SX126X_CURRENT_LIMIT + radio.setCurrentLimit(SX126X_CURRENT_LIMIT); +#endif +#ifdef SX126X_DIO2_AS_RF_SWITCH + radio.setDio2AsRfSwitch(SX126X_DIO2_AS_RF_SWITCH); +#endif +#ifdef SX126X_RX_BOOSTED_GAIN + radio.setRxBoostedGainMode(SX126X_RX_BOOSTED_GAIN); +#endif + + return true; // success +} + +uint32_t radio_get_rng_seed() { + return radio.random(0x7FFFFFFF); +} + +void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) { + radio.setFrequency(freq); + radio.setSpreadingFactor(sf); + radio.setBandwidth(bw); + radio.setCodingRate(cr); +} + +void radio_set_tx_power(uint8_t dbm) { + radio.setOutputPower(dbm); +} + +mesh::LocalIdentity radio_new_identity() { + RadioNoiseListener rng(radio); + return mesh::LocalIdentity(&rng); // create new random identity +} diff --git a/variants/heltec_tracker/target.h b/variants/heltec_tracker/target.h new file mode 100644 index 00000000..b6ab2577 --- /dev/null +++ b/variants/heltec_tracker/target.h @@ -0,0 +1,20 @@ +#pragma once + +#define RADIOLIB_STATIC_ONLY 1 +#include +#include +#include +#include +#include +#include + +extern HeltecV3Board board; +extern WRAPPER_CLASS radio_driver; +extern AutoDiscoverRTCClock rtc_clock; +extern SensorManager sensors; + +bool radio_init(); +uint32_t radio_get_rng_seed(); +void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr); +void radio_set_tx_power(uint8_t dbm); +mesh::LocalIdentity radio_new_identity(); diff --git a/variants/heltec_v3/platformio.ini b/variants/heltec_v3/platformio.ini index 47a23754..8452fbf5 100644 --- a/variants/heltec_v3/platformio.ini +++ b/variants/heltec_v3/platformio.ini @@ -8,9 +8,9 @@ build_flags = -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper -D LORA_TX_POWER=22 - -D P_LORA_TX_LED=35 ; Heltec WT redefines this - -D PIN_BOARD_SDA=17 ; Heltec WT redefines this - -D PIN_BOARD_SCL=18 ; Heltec WT redefines this + -D P_LORA_TX_LED=35 + -D PIN_BOARD_SDA=17 + -D PIN_BOARD_SCL=18 -D PIN_USER_BTN=0 -D SX126X_DIO2_AS_RF_SWITCH=true -D SX126X_DIO3_TCXO_VOLTAGE=1.8 @@ -187,42 +187,3 @@ build_src_filter = ${Heltec_lora32_v3.build_src_filter} lib_deps = ${Heltec_lora32_v3.lib_deps} densaugeo/base64 @ ~1.4.0 - -[env:Heltec_Wireless_Tracker_companion_radio_ble] -extends = Heltec_lora32_v3 -build_flags = - ${Heltec_lora32_v3.build_flags} - -I src/helpers/ui - ; -D ARDUINO_USB_CDC_ON_BOOT=1 ; need for debugging - -D ST7735 - -D PIN_ADC_CTRL=2 ; redefines the V3 pin - -D PIN_BOARD_SDA=45 - -D PIN_BOARD_SCL=46 - -D DISPLAY_ROTATION=1 - -D DISPLAY_CLASS=ST7735Display - -D USE_PIN_TFT=1 - -D MAX_CONTACTS=100 - -D MAX_GROUP_CHANNELS=8 - -D BLE_PIN_CODE=123456 ; HWT will use display for pin -; -D BLE_DEBUG_LOGGING=1 - -D P_LORA_TX_LED=18 - -D PIN_TFT_SDA=42 ; SDIN - -D PIN_TFT_SCL=41 ; SCLK - -D PIN_TFT_DC=40 ; RS (register select) - -D PIN_TFT_RST=39 ; RES - -D PIN_TFT_CS=38 - -D PIN_TFT_VDD_CTL=3 ; Vext is connected to VDD which is also connected to LEDA - -D PIN_TFT_LEDA_CTL=21 ; LEDK (switches on/off via mosfet to create the ground) -; -D ENABLE_PRIVATE_KEY_IMPORT=1 -; -D ENABLE_PRIVATE_KEY_EXPORT=1 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 -build_src_filter = ${Heltec_lora32_v3.build_src_filter} - + - +<../examples/companion_radio> - + -lib_deps = - ${Heltec_lora32_v3.lib_deps} - densaugeo/base64 @ ~1.4.0 - adafruit/Adafruit ST7735 and ST7789 Library @ ^1.11.0 - \ No newline at end of file diff --git a/variants/t1000-e/target.cpp b/variants/t1000-e/target.cpp index 67c571fe..f4bb75f6 100644 --- a/variants/t1000-e/target.cpp +++ b/variants/t1000-e/target.cpp @@ -1,5 +1,6 @@ #include #include "target.h" +#include T1000eBoard board; diff --git a/variants/t1000-e/target.h b/variants/t1000-e/target.h index 4fc4c94e..8e9fd9c7 100644 --- a/variants/t1000-e/target.h +++ b/variants/t1000-e/target.h @@ -1,7 +1,5 @@ #pragma once -#include "MicroNMEALocationProvider.h" - #define RADIOLIB_STATIC_ONLY 1 #include #include @@ -9,6 +7,7 @@ #include #include #include +#include class T1000SensorManager: public SensorManager { bool gps_active = false;