From 7bcfbd3243a4887ae2b7a8849d2a2a9f8d38791d Mon Sep 17 00:00:00 2001 From: cod3doomy Date: Fri, 20 Jun 2025 15:06:01 -0700 Subject: [PATCH 1/2] T-Beam refactor for radio.std_init Changed radio init for both T-beam (SX1262) and Supreme (SX1262) to include radio.std_init() --- variants/lilygo_tbeam_SX1262/target.cpp | 23 +++------------- .../lilygo_tbeam_supreme_SX1262/target.cpp | 27 +++---------------- 2 files changed, 6 insertions(+), 44 deletions(-) diff --git a/variants/lilygo_tbeam_SX1262/target.cpp b/variants/lilygo_tbeam_SX1262/target.cpp index 2f6666c5..ee24e5fc 100644 --- a/variants/lilygo_tbeam_SX1262/target.cpp +++ b/variants/lilygo_tbeam_SX1262/target.cpp @@ -20,33 +20,16 @@ SensorManager sensors; DISPLAY_CLASS display; #endif -#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); + return radio.std_init(&spi); +#else + return radio.std_init(); #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); - - return true; // success } uint32_t radio_get_rng_seed() { diff --git a/variants/lilygo_tbeam_supreme_SX1262/target.cpp b/variants/lilygo_tbeam_supreme_SX1262/target.cpp index 47a68948..47b82df8 100644 --- a/variants/lilygo_tbeam_supreme_SX1262/target.cpp +++ b/variants/lilygo_tbeam_supreme_SX1262/target.cpp @@ -10,10 +10,6 @@ TBeamS3SupremeBoard board; bool pmuIntFlag; -#ifndef LORA_CR - #define LORA_CR 5 -#endif - #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); @@ -264,29 +260,12 @@ bool radio_init() { rtc_clock.begin(Wire1); - // #ifdef MESH_DEBUG - // printBMEValues(); - // #endif - -#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); + return radio.std_init(&spi); +#else + return radio.std_init(); #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); - - return true; // success } uint32_t radio_get_rng_seed() { From ff10f37e7cabf5e654fdc7654d113cf6cf567d61 Mon Sep 17 00:00:00 2001 From: cod3doomy Date: Sat, 21 Jun 2025 14:18:38 -0700 Subject: [PATCH 2/2] T-Beam removed redundancy Removed redundant SPI begin calls --- variants/lilygo_tbeam_SX1262/target.cpp | 6 ------ variants/lilygo_tbeam_supreme_SX1262/target.cpp | 6 ------ 2 files changed, 12 deletions(-) diff --git a/variants/lilygo_tbeam_SX1262/target.cpp b/variants/lilygo_tbeam_SX1262/target.cpp index ee24e5fc..26ba27b5 100644 --- a/variants/lilygo_tbeam_SX1262/target.cpp +++ b/variants/lilygo_tbeam_SX1262/target.cpp @@ -23,13 +23,7 @@ SensorManager sensors; bool radio_init() { fallback_clock.begin(); rtc_clock.begin(Wire); - -#if defined(P_LORA_SCLK) - spi.begin(P_LORA_SCLK, P_LORA_MISO, P_LORA_MOSI); return radio.std_init(&spi); -#else - return radio.std_init(); -#endif } uint32_t radio_get_rng_seed() { diff --git a/variants/lilygo_tbeam_supreme_SX1262/target.cpp b/variants/lilygo_tbeam_supreme_SX1262/target.cpp index 47b82df8..74639b4e 100644 --- a/variants/lilygo_tbeam_supreme_SX1262/target.cpp +++ b/variants/lilygo_tbeam_supreme_SX1262/target.cpp @@ -257,14 +257,8 @@ static bool readStringUntil(Stream& s, char dest[], size_t max_len, char term, u bool radio_init() { fallback_clock.begin(); - rtc_clock.begin(Wire1); - -#if defined(P_LORA_SCLK) - spi.begin(P_LORA_SCLK, P_LORA_MISO, P_LORA_MOSI); return radio.std_init(&spi); -#else - return radio.std_init(); #endif }