Merge remote-tracking branch 'origin/dev' into jbrazio/2025_3f11ad35

This commit is contained in:
João Brázio
2025-08-22 23:00:35 +01:00
162 changed files with 4124 additions and 417 deletions

View File

@@ -77,7 +77,7 @@ build_flags = ${waveshare_rp2040_lora.build_flags}
; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1
; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1
build_src_filter = ${waveshare_rp2040_lora.build_src_filter}
+<../examples/companion_radio>
+<../examples/companion_radio/*.cpp>
lib_deps = ${waveshare_rp2040_lora.lib_deps}
densaugeo/base64 @ ~1.4.0
@@ -91,7 +91,7 @@ lib_deps = ${waveshare_rp2040_lora.lib_deps}
; ; -D MESH_PACKET_LOGGING=1
; ; -D MESH_DEBUG=1
; build_src_filter = ${waveshare_rp2040_lora.build_src_filter}
; +<../examples/companion_radio>
; +<../examples/companion_radio/*.cpp>
; lib_deps = ${waveshare_rp2040_lora.lib_deps}
; densaugeo/base64 @ ~1.4.0
@@ -106,7 +106,7 @@ lib_deps = ${waveshare_rp2040_lora.lib_deps}
; ; -D MESH_PACKET_LOGGING=1
; ; -D MESH_DEBUG=1
; build_src_filter = ${waveshare_rp2040_lora.build_src_filter}
; +<../examples/companion_radio>
; +<../examples/companion_radio/*.cpp>
; lib_deps = ${waveshare_rp2040_lora.lib_deps}
; densaugeo/base64 @ ~1.4.0

View File

@@ -12,19 +12,9 @@ VolatileRTCClock fallback_clock;
AutoDiscoverRTCClock rtc_clock(fallback_clock);
SensorManager sensors;
#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
SPI1.setSCK(P_LORA_SCLK);
SPI1.setTX(P_LORA_MOSI);
SPI1.setRX(P_LORA_MISO);
@@ -34,30 +24,8 @@ bool radio_init() {
SPI1.begin(false);
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
//passing NULL skips init of SPI
return radio.std_init(NULL);
}
uint32_t radio_get_rng_seed() {