Bug in channels order when displaying only one letter

src/general_menus.cpp

@@ -237,7 +237,7 @@ void menuProcSetup(uint8_t event)
       uint8_t attr = sub==subN?INVERS:0;
       lcd_puts_P(0, y,PSTR("Rx Channel Ord"));//   RAET->AETR
       for (uint8_t i=1; i<=4; i++)
-        putsChnLetter((16+i)*FW, y, i, attr);
+        putsChnLetter((16+i)*FW, y, CHANNEL_ORDER(i), attr);
       if(attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.templateSetup, 0, 23);
       if((y+=FH)>7*FH) return;
   }subN++;

src/lcd.cpp

@@ -430,7 +430,7 @@ void putsChn(uint8_t x, uint8_t y, uint8_t idx, uint8_t att)
 
 void putsChnLetter(uint8_t x, uint8_t y, uint8_t idx, uint8_t attr)
 {
-  lcd_putsnAtt(x, y, PSTR("RETA")+CHANNEL_ORDER(idx)-1, 1, attr);
+  lcd_putsnAtt(x, y, PSTR("RETA")+idx-1, 1, attr);
 }
 
 void putsModelName(uint8_t x, uint8_t y, char *name, uint8_t id, uint8_t att)