fix: B&W MPM protocol offset, subprotocol lists too long (#3112)

* fix: Off by one error for protocol list * fix: Incorrect range for some Frsky subprotocols
EdgeTX · Feb 3, 2023 · ea43d07 · ea43d07
1 parent 22ed36a
commit ea43d07
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/radio/src/gui/gui_common.cpp b/radio/src/gui/gui_common.cpp
@@ -1170,7 +1170,7 @@ const mm_protocol_definition multi_protocols[] = {
 // Protocol as defined in pulses\modules_constants.h, number of sub_protocols - 1, Failsafe supported, Disable channel mapping supported, Subtype string, Option type
   {MODULE_SUBTYPE_MULTI_FLYSKY,     4, false, true,   STR_SUBTYPE_FLYSKY,    nullptr},
   {MODULE_SUBTYPE_MULTI_HUBSAN,     2, false, false,  STR_SUBTYPE_HUBSAN,    STR_MULTI_VIDFREQ},
-  {MODULE_SUBTYPE_MULTI_FRSKYD,     2, false, false,  STR_SUBTYPE_FRSKYD,    STR_MULTI_RFTUNE},
+  {MODULE_SUBTYPE_MULTI_FRSKYD,     1, false, false,  STR_SUBTYPE_FRSKYD,    STR_MULTI_RFTUNE},
   {MODULE_SUBTYPE_MULTI_HISKY,      1, true,  true,   STR_SUBTYPE_HISKY,     nullptr},
   {MODULE_SUBTYPE_MULTI_V2X2,       2, false, false,  STR_SUBTYPE_V2X2,      nullptr},
   {MODULE_SUBTYPE_MULTI_DSM2,       5, false, true,   STR_SUBTYPE_DSM,       STR_MULTI_MAX_THROW},
@@ -1182,7 +1182,7 @@ const mm_protocol_definition multi_protocols[] = {
   {MODULE_SUBTYPE_MULTI_CX10,       6, false, false,  STR_SUBTYPE_CX10,      nullptr},
   {MODULE_SUBTYPE_MULTI_CG023,      1, false, false,  STR_SUBTYPE_CG023,     nullptr},
   {MODULE_SUBTYPE_MULTI_BAYANG,     5, false, false,  STR_SUBTYPE_BAYANG,    STR_MULTI_TELEMETRY},
-  {MODULE_SUBTYPE_MULTI_FRSKYX,     6, true,  false,  STR_SUBTYPE_FRSKYX,    STR_MULTI_RFTUNE},
+  {MODULE_SUBTYPE_MULTI_FRSKYX,     5, true,  false,  STR_SUBTYPE_FRSKYX,    STR_MULTI_RFTUNE},
   {MODULE_SUBTYPE_MULTI_ESky,       1, false, true,   STR_SUBTYPE_ESky,      nullptr},
   {MODULE_SUBTYPE_MULTI_MT99XX,     7, false, false,  STR_SUBTYPE_MT99,      nullptr},
   {MODULE_SUBTYPE_MULTI_MJXQ,       6, false, false,  STR_SUBTYPE_MJXQ,      nullptr},

diff --git a/radio/src/telemetry/multi.cpp b/radio/src/telemetry/multi.cpp
@@ -228,8 +228,8 @@ static void processMultiStatusPacket(const uint8_t * data, uint8_t module, uint8
   else {
     status.ch_order = data[5];
     if (len >= 24) {
-      status.protocolNext = data[6];
-      status.protocolPrev = data[7];
+      status.protocolNext = data[6] - 1;
+      status.protocolPrev = data[7] - 1;
       memcpy(status.protocolName, &data[8], 7);
       status.protocolName[7] = 0;
       status.protocolSubNbr = data[15] & 0x0F;