Просмотр исходного кода

fix: enable radio.rxgain CLI command for LR1110 (T1000-E)

USE_LR1110 was missing from the preprocessor guard in CommonCLI.cpp,
causing both get and set to fail silently on T1000-E:

- get radio.rxgain returned the full radio config string (fell through
  to the memcmp("radio", 5) branch)
- set radio.rxgain returned "unknown config" (no branch matched)

Fix: add -D USE_LR1110 to variants/t1000-e/platformio.ini and include
USE_LR1110 in the #if guard on both get and set branches.

CustomLR1110Wrapper already implements setRxBoostedGainMode() and
getRxBoostedGainMode() via the RadioLibWrapper virtual interface,
so no radio-layer changes are required.

Tested on T1000-E: get/set/persist all confirmed working.
jirogit 4 месяцев назад
Родитель
Сommit
f224a325e6
2 измененных файлов с 3 добавлено и 2 удалено
  1. 2 2
      src/helpers/CommonCLI.cpp
  2. 1 0
      variants/t1000-e/platformio.ini

+ 2 - 2
src/helpers/CommonCLI.cpp

@@ -547,7 +547,7 @@ void CommonCLI::handleSetCmd(uint32_t sender_timestamp, char* command, char* rep
     _prefs->disable_fwd = memcmp(&config[7], "off", 3) == 0;
     _prefs->disable_fwd = memcmp(&config[7], "off", 3) == 0;
     savePrefs();
     savePrefs();
     strcpy(reply, _prefs->disable_fwd ? "OK - repeat is now OFF" : "OK - repeat is now ON");
     strcpy(reply, _prefs->disable_fwd ? "OK - repeat is now OFF" : "OK - repeat is now ON");
-#if defined(USE_SX1262) || defined(USE_SX1268)
+#if defined(USE_SX1262) || defined(USE_SX1268) || defined(USE_LR1110)
   } else if (memcmp(config, "radio.rxgain ", 13) == 0) {
   } else if (memcmp(config, "radio.rxgain ", 13) == 0) {
     _prefs->rx_boosted_gain = memcmp(&config[13], "on", 2) == 0;
     _prefs->rx_boosted_gain = memcmp(&config[13], "on", 2) == 0;
     strcpy(reply, "OK");
     strcpy(reply, "OK");
@@ -769,7 +769,7 @@ void CommonCLI::handleGetCmd(uint32_t sender_timestamp, char* command, char* rep
     sprintf(reply, "> %s", StrHelper::ftoa(_prefs->node_lat));
     sprintf(reply, "> %s", StrHelper::ftoa(_prefs->node_lat));
   } else if (memcmp(config, "lon", 3) == 0) {
   } else if (memcmp(config, "lon", 3) == 0) {
     sprintf(reply, "> %s", StrHelper::ftoa(_prefs->node_lon));
     sprintf(reply, "> %s", StrHelper::ftoa(_prefs->node_lon));
-#if defined(USE_SX1262) || defined(USE_SX1268)
+#if defined(USE_SX1262) || defined(USE_SX1268) || defined(USE_LR1110)
   } else if (memcmp(config, "radio.rxgain", 12) == 0) {
   } else if (memcmp(config, "radio.rxgain", 12) == 0) {
     sprintf(reply, "> %s", _prefs->rx_boosted_gain ? "on" : "off");
     sprintf(reply, "> %s", _prefs->rx_boosted_gain ? "on" : "off");
 #endif
 #endif

+ 1 - 0
variants/t1000-e/platformio.ini

@@ -13,6 +13,7 @@ build_flags = ${nrf52_base.build_flags}
   -D USER_BTN_PRESSED=HIGH
   -D USER_BTN_PRESSED=HIGH
   -D PIN_STATUS_LED=24
   -D PIN_STATUS_LED=24
   -D RADIO_CLASS=CustomLR1110
   -D RADIO_CLASS=CustomLR1110
+  -D USE_LR1110
   -D WRAPPER_CLASS=CustomLR1110Wrapper
   -D WRAPPER_CLASS=CustomLR1110Wrapper
   -D LORA_TX_POWER=22
   -D LORA_TX_POWER=22
   -D RF_SWITCH_TABLE
   -D RF_SWITCH_TABLE