3djc/2.4 add 2.3 pr (#8099)

2020-11-19 16:32:50 +01:00
parent 87cd9047b1
commit 24f93a7cbe
94 changed files with 22779 additions and 205 deletions
@@ -313,7 +313,7 @@ char * getSwitchName(char * dest, swsrc_t idx)
  }
  else {
    *dest++ = 'S';
-#if defined(PCBX7)
+#if defined(PCBX7) && !defined(RADIO_TX12)
    if (swinfo.quot >= 5)
        *dest++ = 'H' + swinfo.quot - 5;
      else if (swinfo.quot == 4)