diff --git a/variants/waveshare_rp2040_lora/platformio.ini b/variants/waveshare_rp2040_lora/platformio.ini index 1f7fb02f1b..54b0d865fc 100644 --- a/variants/waveshare_rp2040_lora/platformio.ini +++ b/variants/waveshare_rp2040_lora/platformio.ini @@ -20,6 +20,7 @@ build_flags = ${rp2040_base.build_flags} -D P_LORA_MOSI=15 -D P_LORA_TX_LED=25 -D SX126X_DIO2_AS_RF_SWITCH=true + -D SX126X_RXEN=17 -D SX126X_DIO3_TCXO_VOLTAGE=0 -D SX126X_RX_BOOSTED_GAIN=1 -D LORA_TX_POWER=22 @@ -33,6 +34,7 @@ build_src_filter = ${rp2040_base.build_src_filter} + +<../variants/waveshare_rp2040_lora> lib_deps = ${rp2040_base.lib_deps} +lib_ignore = BLE [env:waveshare_rp2040_lora_repeater] extends = waveshare_rp2040_lora diff --git a/variants/waveshare_rp2040_lora/target.cpp b/variants/waveshare_rp2040_lora/target.cpp index 459bf82c35..5d1ee33882 100644 --- a/variants/waveshare_rp2040_lora/target.cpp +++ b/variants/waveshare_rp2040_lora/target.cpp @@ -15,17 +15,7 @@ SensorManager sensors; bool radio_init() { rtc_clock.begin(Wire); - SPI1.setSCK(P_LORA_SCLK); - SPI1.setTX(P_LORA_MOSI); - SPI1.setRX(P_LORA_MISO); - - pinMode(P_LORA_NSS, OUTPUT); - digitalWrite(P_LORA_NSS, HIGH); - - SPI1.begin(false); - - //passing NULL skips init of SPI - return radio.std_init(NULL); + return radio.std_init(&SPI1); } uint32_t radio_get_rng_seed() {