diff --git a/radio/src/gui/128x64/lcd.cpp b/radio/src/gui/128x64/lcd.cpp index 0c74782dd..8f69dd31a 100644 --- a/radio/src/gui/128x64/lcd.cpp +++ b/radio/src/gui/128x64/lcd.cpp @@ -662,6 +662,11 @@ void putsVBat(coord_t x, coord_t y, LcdFlags att) putsVolts(x, y, g_vbat100mV, att); } +void putsChn(coord_t x, coord_t y, uint8_t idx, LcdFlags att) +{ + drawStringWithIndex(x, y, STR_CH, idx, att); +} + void putsChnLetter(coord_t x, coord_t y, uint8_t idx, LcdFlags att) { lcdDrawText(x, y, getAnalogShortLabel(idx), att); diff --git a/radio/src/gui/128x64/lcd.h b/radio/src/gui/128x64/lcd.h index 5d76e274d..0a721f45c 100644 --- a/radio/src/gui/128x64/lcd.h +++ b/radio/src/gui/128x64/lcd.h @@ -122,7 +122,7 @@ void drawTimerMode(coord_t x, coord_t y, swsrc_t mode, LcdFlags att=0); void drawShortTrimMode(coord_t x, coord_t y, uint8_t mode, uint8_t idx, LcdFlags att); -#define putsChn(x, y, idx, att) drawSource(x, y, MIXSRC_FIRST_CH + idx - 1, att) +void putsChn(coord_t x, coord_t y, uint8_t idx, LcdFlags attr); void putsChnLetter(coord_t x, coord_t y, uint8_t idx, LcdFlags attr); void putsVolts(coord_t x, coord_t y, uint16_t volts, LcdFlags att); diff --git a/radio/src/gui/212x64/lcd.cpp b/radio/src/gui/212x64/lcd.cpp index 12f2e1a80..eef2e9cb3 100644 --- a/radio/src/gui/212x64/lcd.cpp +++ b/radio/src/gui/212x64/lcd.cpp @@ -632,6 +632,11 @@ void drawMainControlLabel(coord_t x, coord_t y, uint8_t idx, LcdFlags att) lcdDrawSizedText(x, y, getMainControlLabel(idx), UINT8_MAX, att); } +void putsChn(coord_t x, coord_t y, uint8_t idx, LcdFlags att) +{ + drawStringWithIndex(x, y, STR_CH, idx, att); +} + void putsChnLetter(coord_t x, coord_t y, uint8_t idx, LcdFlags att) { lcdDrawText(x, y, getAnalogShortLabel(idx), att); diff --git a/radio/src/gui/212x64/lcd.h b/radio/src/gui/212x64/lcd.h index 35d613c10..f5ab483e2 100644 --- a/radio/src/gui/212x64/lcd.h +++ b/radio/src/gui/212x64/lcd.h @@ -117,7 +117,7 @@ void drawMainControlLabel(coord_t x, coord_t y, uint8_t idx, LcdFlags att=0); void drawCurveName(coord_t x, coord_t y, int8_t idx, LcdFlags att=0); void drawTimerMode(coord_t x, coord_t y, swsrc_t mode, LcdFlags att=0); -#define putsChn(x, y, idx, att) drawSource(x, y, MIXSRC_FIRST_CH+idx-1, att) +void putsChn(coord_t x, coord_t y, uint8_t idx, LcdFlags attr); void putsChnLetter(coord_t x, coord_t y, uint8_t idx, LcdFlags attr); void putsVolts(coord_t x, coord_t y, uint16_t volts, LcdFlags att);