meshcore-dev/MeshCore
1
0
Fork 0
mirror of https://github.com/meshcore-dev/MeshCore.git synced 2026-04-20 22:13:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some fixes for range issue

Browse source
This commit is contained in:
Florent de Lamotte 2025-03-21 15:08:13 +01:00
parent 0163c4034b
commit 1ff3033372
3 changed files with 34 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/helpers/nrf52/T1000eBoard.cpp
View file

@ -9,6 +9,8 @@ void T1000eBoard::begin() {
startup_reason = BD_STARTUP_NORMAL; startup_reason = BD_STARTUP_NORMAL;
btn_prev_state = HIGH; btn_prev_state = HIGH;
sd_power_mode_set(NRF_POWER_MODE_LOWPWR);
#ifdef BUTTON_PIN #ifdef BUTTON_PIN
pinMode(BATTERY_PIN, INPUT); pinMode(BATTERY_PIN, INPUT);
pinMode(BUTTON_PIN, INPUT); pinMode(BUTTON_PIN, INPUT);

2
variants/t1000-e/platformio.ini
View file

@ -43,6 +43,8 @@ build_flags = ${t1000-e.build_flags}
-D BLE_DEBUG_LOGGING=1 -D BLE_DEBUG_LOGGING=1
-D MESH_PACKET_LOGGING=1 -D MESH_PACKET_LOGGING=1
-D MESH_DEBUG=1 -D MESH_DEBUG=1
-D RX_BOOSTED_GAIN=true
-D RF_SWITCH_TABLE
-D HAS_UI -D HAS_UI
build_src_filter = ${t1000-e.build_src_filter} build_src_filter = ${t1000-e.build_src_filter}
+<helpers/nrf52/SerialBLEInterface.cpp> +<helpers/nrf52/SerialBLEInterface.cpp>

41
variants/t1000-e/target.cpp
View file

@ -9,16 +9,38 @@ RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BU
#define LORA_CR 5 #define LORA_CR 5
#endif #endif
#ifdef RF_SWITCH_TABLE
static const uint32_t rfswitch_dios[Module::RFSWITCH_MAX_PINS] = {
RADIOLIB_LR11X0_DIO5,
RADIOLIB_LR11X0_DIO6,
RADIOLIB_LR11X0_DIO7,
RADIOLIB_LR11X0_DIO8,
RADIOLIB_NC
};
static const Module::RfSwitchMode_t rfswitch_table[] = {
// mode DIO5 DIO6 DIO7 DIO8
{ LR11x0::MODE_STBY, {LOW, LOW, LOW, LOW }},
{ LR11x0::MODE_RX, {HIGH, LOW, LOW, HIGH }},
{ LR11x0::MODE_TX, {HIGH, HIGH, LOW, HIGH }},
{ LR11x0::MODE_TX_HP, {LOW, HIGH, LOW, HIGH }},
{ LR11x0::MODE_TX_HF, {LOW, LOW, LOW, LOW }},
{ LR11x0::MODE_GNSS, {LOW, LOW, HIGH, LOW }},
{ LR11x0::MODE_WIFI, {LOW, LOW, LOW, LOW }},
END_OF_MODE_TABLE,
};
#endif
bool radio_init() { bool radio_init() {
#ifdef SX126X_DIO3_TCXO_VOLTAGE #ifdef LR11X0_DIO3_TCXO_VOLTAGE
float tcxo = SX126X_DIO3_TCXO_VOLTAGE; float tcxo = LR11X0_DIO3_TCXO_VOLTAGE;
#else #else
float tcxo = 1.6f; float tcxo = 1.6f;
#endif #endif
SPI.setPins(P_LORA_MISO, P_LORA_SCLK, P_LORA_MOSI); SPI.setPins(P_LORA_MISO, P_LORA_SCLK, P_LORA_MOSI);
SPI.begin(); SPI.begin();
int status = radio.begin(LORA_FREQ, LORA_BW, LORA_SF, LORA_CR, RADIOLIB_SX126X_SYNC_WORD_PRIVATE, LORA_TX_POWER, 8, tcxo); int status = radio.begin(LORA_FREQ, LORA_BW, LORA_SF, LORA_CR, RADIOLIB_LR11X0_LORA_SYNC_WORD_PRIVATE, LORA_TX_POWER, 8, tcxo);
if (status != RADIOLIB_ERR_NONE) { if (status != RADIOLIB_ERR_NONE) {
Serial.print("ERROR: radio init failed: "); Serial.print("ERROR: radio init failed: ");
Serial.println(status); Serial.println(status);
@ -26,15 +48,12 @@ bool radio_init() {
} }
radio.setCRC(1); radio.setCRC(1);
#ifdef SX126X_CURRENT_LIMIT #ifdef RF_SWITCH_TABLE
radio.setCurrentLimit(SX126X_CURRENT_LIMIT); radio.setRfSwitchTable(rfswitch_dios, rfswitch_table);
#endif #endif
#ifdef SX126X_DIO2_AS_RF_SWITCH #ifdef RX_BOOSTED_GAIN
radio.setDio2AsRfSwitch(SX126X_DIO2_AS_RF_SWITCH); radio.setRxBoostedGainMode(RX_BOOSTED_GAIN);
#endif
#ifdef SX126X_RX_BOOSTED_GAIN
radio.setRxBoostedGainMode(SX126X_RX_BOOSTED_GAIN);
#endif #endif
return true; // success return true; // success