diff --git a/radio/releasenotes.txt b/radio/releasenotes.txt index 69603cb32..d3f5b0531 100644 --- a/radio/releasenotes.txt +++ b/radio/releasenotes.txt @@ -17,6 +17,7 @@
  • Fixed missing option in the sensor setup menu (#2533)
  • Fixed several VFAS issues when using D series sensors (#2518, #2531)
  • , #2530)
  • Fixed missing GPS altitude when using D series sensors (#2539)
  • +
  • Symbols for renamed physical inputs were not shown (#2581)
  • [Boards with narrow LCD (9X, 9XR, etc)] diff --git a/radio/src/gui/Taranis/lcd.cpp b/radio/src/gui/Taranis/lcd.cpp index bbd7e05c7..8d008d399 100755 --- a/radio/src/gui/Taranis/lcd.cpp +++ b/radio/src/gui/Taranis/lcd.cpp @@ -662,15 +662,24 @@ void putsMixerSource(coord_t x, coord_t y, uint32_t idx, LcdFlags att) else if (idx < MIXSRC_LAST_POT) { idx = idx-MIXSRC_Rud; - if (ZEXIST(g_eeGeneral.anaNames[idx])) - lcd_putsnAtt(x, y, g_eeGeneral.anaNames[idx], LEN_ANA_NAME, ZCHAR|att); + if (ZEXIST(g_eeGeneral.anaNames[idx])) { + if (idx < MIXSRC_FIRST_POT-MIXSRC_Rud ) + lcd_putcAtt(x, y, '\307', att); //stick symbol + else if (idx < MIXSRC_FIRST_SLIDER-MIXSRC_Rud ) + lcd_putcAtt(x, y, '\310', att); //pot symbol + else + lcd_putcAtt(x, y, '\311', att); //slider symbol + lcd_putsnAtt(lcdNextPos, y, g_eeGeneral.anaNames[idx], LEN_ANA_NAME, ZCHAR|att); + } else lcd_putsiAtt(x, y, STR_VSRCRAW, idx+1, att); } else if (idx >= MIXSRC_FIRST_SWITCH && idx < MIXSRC_FIRST_LOGICAL_SWITCH) { idx = idx-MIXSRC_FIRST_SWITCH; - if (ZEXIST(g_eeGeneral.switchNames[idx])) - lcd_putsnAtt(x, y, g_eeGeneral.switchNames[idx], LEN_SWITCH_NAME, ZCHAR|att); + if (ZEXIST(g_eeGeneral.switchNames[idx])) { + lcd_putcAtt(x, y, '\312', att); //switch symbol + lcd_putsnAtt(lcdNextPos, y, g_eeGeneral.switchNames[idx], LEN_SWITCH_NAME, ZCHAR|att); + } else lcd_putsiAtt(x, y, STR_VSRCRAW, idx+MIXSRC_FIRST_SWITCH-MIXSRC_Rud+1, att); } diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h index a1d5b5171..e09da2eb4 100644 --- a/radio/src/myeeprom.h +++ b/radio/src/myeeprom.h @@ -1792,24 +1792,25 @@ enum MixSources { #endif MIXSRC_FIRST_STICK, - MIXSRC_Rud = MIXSRC_FIRST_STICK, LUA_EXPORT("rud", "Rudder") - MIXSRC_Ele, LUA_EXPORT("ele", "Elevator") - MIXSRC_Thr, LUA_EXPORT("thr", "Throttle") - MIXSRC_Ail, LUA_EXPORT("ail", "Aileron") + MIXSRC_Rud = MIXSRC_FIRST_STICK, LUA_EXPORT("rud", "Rudder") + MIXSRC_Ele, LUA_EXPORT("ele", "Elevator") + MIXSRC_Thr, LUA_EXPORT("thr", "Throttle") + MIXSRC_Ail, LUA_EXPORT("ail", "Aileron") MIXSRC_FIRST_POT, #if defined(PCBTARANIS) - MIXSRC_POT1 = MIXSRC_FIRST_POT, LUA_EXPORT("s1", "Potentiometer 1") - MIXSRC_POT2, LUA_EXPORT("s2", "Potentiometer 2") - MIXSRC_POT3, LUA_EXPORT("s3", "Potentiometer 3") + MIXSRC_POT1 = MIXSRC_FIRST_POT, LUA_EXPORT("s1", "Potentiometer 1") + MIXSRC_POT2, LUA_EXPORT("s2", "Potentiometer 2") + MIXSRC_POT3, LUA_EXPORT("s3", "Potentiometer 3") #if defined(REV9E) - MIXSRC_POT4, LUA_EXPORT("s4", "Potentiometer 4") + MIXSRC_POT4, LUA_EXPORT("s4", "Potentiometer 4") #endif - MIXSRC_SLIDER1, LUA_EXPORT("ls", "Left slider") - MIXSRC_SLIDER2, LUA_EXPORT("rs", "Right slider") + MIXSRC_FIRST_SLIDER, + MIXSRC_SLIDER1 = MIXSRC_FIRST_SLIDER, LUA_EXPORT("ls", "Left slider") + MIXSRC_SLIDER2, LUA_EXPORT("rs", "Right slider") #if defined(REV9E) - MIXSRC_SLIDER3, LUA_EXPORT("ls2", "Left center slider") - MIXSRC_SLIDER4, LUA_EXPORT("rs2", "Right center slider") + MIXSRC_SLIDER3, LUA_EXPORT("ls2", "Left center slider") + MIXSRC_SLIDER4, LUA_EXPORT("rs2", "Right center slider") MIXSRC_LAST_POT = MIXSRC_SLIDER4, #else MIXSRC_LAST_POT = MIXSRC_SLIDER2,