merge: upstream/dev into observer-firmware-dev
Brings in the external FEM gain preferences (fem_txgain, PR #3137 plus the companion-side port), the AGC reset rxgain fix, the LR2021 preamble/IRQ timeout logic, and assorted variant fixes (T096, T-Echo Card TCXO, promicro pinmap, minewsemi, R1 Neo). Conflict resolutions: - SH1106Display: both sides fixed T-Beam Supreme startup independently. Kept our _initialized guard and DISPLAY_ADDRESS_ALT override, took upstream's SA0-pair fallback and its unconditional display.begin() so the frame buffer is allocated even when no panel answers. - MyMesh/SensorMesh/CommonCLI: took upstream's fem_txgain default and wiring, kept our comments and the observer-side prefs layout. Also fixes CustomLLCC68Wrapper, which upstream missed when sx126xResetAGC gained its rx_boost_gain parameter. No variant builds that wrapper today, so neither tree failed to compile.
This commit is contained in:
commit
7e1a94358b
41 files changed
+521
-153
No files matched your search
@@ -889,6 +889,7 @@ MyMesh::MyMesh(mesh::MainBoard &board, mesh::Radio &radio, mesh::MillisecondCloc
|
||||
#endif
|
||||
#endif
|
||||
_prefs.radio_fem_rxgain = 1;
|
||||
_prefs.radio_fem_txgain = 0;
|
||||
|
||||
// Observer defaults (alert.*, etc.) moved to applyMQTTDefaults() — they live
|
||||
// in /mqtt_prefs now, not NodePrefs.
|
||||
@@ -965,6 +966,7 @@ void MyMesh::begin(FILESYSTEM *fs) {
|
||||
radio_driver.setTxPower(_prefs.tx_power_dbm);
|
||||
radio_driver.setRxBoostedGainMode(_prefs.rx_boosted_gain);
|
||||
board.setLoRaFemLnaEnabled(_prefs.radio_fem_rxgain); // LoRa FEM LNA (FEM boards only)
|
||||
board.setLoRaFemPaGainEnabled(_prefs.radio_fem_txgain);
|
||||
|
||||
updateAdvertTimer();
|
||||
updateFloodAdvertTimer();
|
||||
|
||||
Reference in new issue
Block a user