Mirrors/MeshCore-Solo
1
0
Fork 0
mirror of https://github.com/MarekZegare4/MeshCore-Solo.git synced 2026-09-29 14:16:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3203 from meshcore-dev/companion-fem-pref-fix

Browse Source 
commenting out the load/save of the fem_ properties
This commit is contained in:
Huw Duddy
2026-08-14 16:44:59 +10:00
committed by GitHub
parent b09cb27a1f e78bff0041
commit 50a51a6479
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/companion_radio/NodePrefs.h
+4
View File
@@ -53,8 +53,12 @@ private:
//def("cad", _parent->cad_enabled); //def("cad", _parent->cad_enabled);
//def("int_thr", _parent->interference_threshold); //def("int_thr", _parent->interference_threshold);
def("rxgain", _parent->rx_boosted_gain); def("rxgain", _parent->rx_boosted_gain);
#if 0
// NOTE: these cannot be set (yet) so don't load/save until we can.
// also, fem_rxgain WAS mapped to wrong JSON property previously
def("fem_rxgain", _parent->radio_fem_rxgain); def("fem_rxgain", _parent->radio_fem_rxgain);
def("fem_txgain", _parent->radio_fem_txgain); def("fem_txgain", _parent->radio_fem_txgain);
#endif
def("tx", _parent->tx_power_dbm); def("tx", _parent->tx_power_dbm);
def("af", _parent->airtime_factor); def("af", _parent->airtime_factor);
def("rxdelay", _parent->rx_delay_base); def("rxdelay", _parent->rx_delay_base);
test/test_companion_node_prefs/test_companion_node_prefs.cpp
+3
View File
@@ -50,6 +50,8 @@ public:
const std::string& text() const { return _text; } const std::string& text() const { return _text; }
}; };
#if 0
// Re-enable test once we can SET fem_ values in companion
TEST(CompanionNodePrefs, RxGainSettingsRoundTripIndependently) { TEST(CompanionNodePrefs, RxGainSettingsRoundTripIndependently) {
NodePrefs saved; NodePrefs saved;
saved.rx_boosted_gain = 0; saved.rx_boosted_gain = 0;
@@ -73,6 +75,7 @@ TEST(CompanionNodePrefs, RxGainSettingsRoundTripIndependently) {
EXPECT_EQ(0, loaded.radio_fem_rxgain); EXPECT_EQ(0, loaded.radio_fem_rxgain);
EXPECT_EQ(1, loaded.radio_fem_txgain); EXPECT_EQ(1, loaded.radio_fem_txgain);
} }
#endif
int main(int argc, char** argv) { int main(int argc, char** argv) {
::testing::InitGoogleTest(&argc, argv); ::testing::InitGoogleTest(&argc, argv);