pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-08-22 04:58:01 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

start to sort radiolib out. If we have macros, use them! :-)

Browse Source 
Also we need Godmode for the SX1280 for now, hopefully can revert to more sane operation.
This commit is contained in:
Thomas Göttgens 2022-11-14 09:49:50 +01:00
parent 6e856efd0e
commit 50a301899e
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/mesh/RF95Interface.cpp
View File

@ -129,6 +129,7 @@ bool RF95Interface::reconfigure()
if (power > MAX_POWER) // This chip has lower power limits than some if (power > MAX_POWER) // This chip has lower power limits than some
power = MAX_POWER; power = MAX_POWER;
err = lora->setOutputPower(power); err = lora->setOutputPower(power);
if (err != RADIOLIB_ERR_NONE) if (err != RADIOLIB_ERR_NONE)
RECORD_CRITICALERROR(CriticalErrorCode_INVALID_RADIO_SETTING); RECORD_CRITICALERROR(CriticalErrorCode_INVALID_RADIO_SETTING);

5
src/mesh/SX126xInterface.cpp
View File

@ -144,8 +144,9 @@ bool SX126xInterface<T>::reconfigure()
if (err != RADIOLIB_ERR_NONE) if (err != RADIOLIB_ERR_NONE)
RECORD_CRITICALERROR(CriticalErrorCode_INVALID_RADIO_SETTING); RECORD_CRITICALERROR(CriticalErrorCode_INVALID_RADIO_SETTING);
if (power > 22) // This chip has lower power limits than some if (power > SX126X_MAX_POWER) // This chip has lower power limits than some
power = 22; power = SX126X_MAX_POWER;
err = lora.setOutputPower(power); err = lora.setOutputPower(power);
assert(err == RADIOLIB_ERR_NONE); assert(err == RADIOLIB_ERR_NONE);

11
src/mesh/SX128xInterface.cpp
View File

@ -105,8 +105,9 @@ bool SX128xInterface<T>::reconfigure()
if (err != RADIOLIB_ERR_NONE) if (err != RADIOLIB_ERR_NONE)
RECORD_CRITICALERROR(CriticalErrorCode_INVALID_RADIO_SETTING); RECORD_CRITICALERROR(CriticalErrorCode_INVALID_RADIO_SETTING);
if (power > 22) // This chip has lower power limits than some if (power > SX128X_MAX_POWER) // This chip has lower power limits than some
power = 22; power = SX128X_MAX_POWER;
err = lora.setOutputPower(power); err = lora.setOutputPower(power);
assert(err == RADIOLIB_ERR_NONE); assert(err == RADIOLIB_ERR_NONE);
@ -218,7 +219,11 @@ bool SX128xInterface<T>::isChannelActive()
template<typename T> template<typename T>
bool SX128xInterface<T>::isActivelyReceiving() bool SX128xInterface<T>::isActivelyReceiving()
{ {
return isChannelActive(); // return isChannelActive();
uint16_t irq = lora.getIrqStatus();
bool hasPreamble = (irq & RADIOLIB_SX128X_IRQ_HEADER_VALID);
return hasPreamble;
} }
template<typename T> template<typename T>

2
variants/tlora_v2_1_18/platformio.ini
View File

@ -5,4 +5,4 @@ lib_deps =
${esp32_base.lib_deps} ${esp32_base.lib_deps}
caveman99/ESP32 Codec2@^1.0.1 caveman99/ESP32 Codec2@^1.0.1
build_flags = build_flags =
${esp32_base.build_flags} -D TLORA_V2_1_18 -I variants/tlora_v2_1_18 ${esp32_base.build_flags} -D TLORA_V2_1_18 -I variants/tlora_v2_1_18 -D RADIOLIB_GODMODE