From bf2908faa699734a504fd49c8f7863cbbd9e4d6a Mon Sep 17 00:00:00 2001 From: Rob Loranger Date: Fri, 20 Jun 2025 16:46:16 -0700 Subject: [PATCH 1/3] update nano g2 to use radio.std_init --- variants/nano_g2_ultra/target.cpp | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/variants/nano_g2_ultra/target.cpp b/variants/nano_g2_ultra/target.cpp index 33824f62..9d645a09 100644 --- a/variants/nano_g2_ultra/target.cpp +++ b/variants/nano_g2_ultra/target.cpp @@ -18,43 +18,14 @@ NanoG2UltraSensorManager sensors = NanoG2UltraSensorManager(nmea); DISPLAY_CLASS display; #endif -#ifndef LORA_CR -#define LORA_CR 5 -#endif - bool radio_init() { rtc_clock.begin(Wire); -#ifdef SX126X_DIO3_TCXO_VOLTAGE - float tcxo = SX126X_DIO3_TCXO_VOLTAGE; -#else - float tcxo = 1.6f; -#endif - SPI.setPins(P_LORA_MISO, P_LORA_SCLK, P_LORA_MOSI); SPI.begin(); - 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 + return radio.std_init(&SPI); } uint32_t radio_get_rng_seed() From 0bf03f23091a95c7e4026a144a80f8b7904d63d3 Mon Sep 17 00:00:00 2001 From: Rob Loranger Date: Sat, 21 Jun 2025 11:22:14 -0700 Subject: [PATCH 2/3] remove SPI set pins --- variants/nano_g2_ultra/target.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/variants/nano_g2_ultra/target.cpp b/variants/nano_g2_ultra/target.cpp index 9d645a09..539d870f 100644 --- a/variants/nano_g2_ultra/target.cpp +++ b/variants/nano_g2_ultra/target.cpp @@ -21,10 +21,7 @@ DISPLAY_CLASS display; bool radio_init() { rtc_clock.begin(Wire); - - SPI.setPins(P_LORA_MISO, P_LORA_SCLK, P_LORA_MOSI); SPI.begin(); - return radio.std_init(&SPI); } From b99d29494ea4eb63f6fb18d9811c19e463e01855 Mon Sep 17 00:00:00 2001 From: Rob Loranger Date: Sun, 22 Jun 2025 09:10:49 -0700 Subject: [PATCH 3/3] remove begin() --- variants/nano_g2_ultra/target.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/variants/nano_g2_ultra/target.cpp b/variants/nano_g2_ultra/target.cpp index 539d870f..a67085ce 100644 --- a/variants/nano_g2_ultra/target.cpp +++ b/variants/nano_g2_ultra/target.cpp @@ -21,7 +21,6 @@ DISPLAY_CLASS display; bool radio_init() { rtc_clock.begin(Wire); - SPI.begin(); return radio.std_init(&SPI); }