diff --git a/radio/src/gui/colorlcd/bitmaps.h b/radio/src/gui/colorlcd/bitmaps.h index 60950a707..263138adc 100644 --- a/radio/src/gui/colorlcd/bitmaps.h +++ b/radio/src/gui/colorlcd/bitmaps.h @@ -102,8 +102,8 @@ extern BitmapBuffer * mixerSetupLabelIcon; extern BitmapBuffer * mixerSetupFlightmodeIcon; extern BitmapBuffer * mixerSetupCurveIcon; extern BitmapBuffer * mixerSetupSwitchIcon; -//extern BitmapBuffer * mixerSetupDelayIcon; -//extern BitmapBuffer * mixerSetupSlowIcon; -//extern BitmapBuffer * mixerSetupDelaySlowIcon; +extern BitmapBuffer * mixerSetupDelayIcon; +extern BitmapBuffer * mixerSetupSlowIcon; +extern BitmapBuffer * mixerSetupDelaySlowIcon; #endif // _BITMAPS_H_ diff --git a/radio/src/gui/colorlcd/model_mixes.cpp b/radio/src/gui/colorlcd/model_mixes.cpp index 1e67b5656..1434d1d19 100644 --- a/radio/src/gui/colorlcd/model_mixes.cpp +++ b/radio/src/gui/colorlcd/model_mixes.cpp @@ -286,6 +286,15 @@ class MixLineButton : public CommonInputOrMixButton if (line.flightModes) { drawFlightModes(dc, line.flightModes, textColor); } + + // Put this icon on the first line, since we jave more space there + uint8_t delayslow = 0; + if (line.speedDown || line.speedUp) delayslow = 1; + if (line.delayUp || line.delayDown) delayslow += 2; + if (delayslow) { + BitmapBuffer *delayslowbmp[] = {mixerSetupSlowIcon, mixerSetupDelayIcon, mixerSetupDelaySlowIcon}; + dc->drawMask(width() - 16, FIELD_PADDING_TOP, delayslowbmp[delayslow - 1], textColor); + } } }; diff --git a/radio/src/gui/colorlcd/themes/480_default.cpp b/radio/src/gui/colorlcd/themes/480_default.cpp index 386e3a97b..282e84a92 100644 --- a/radio/src/gui/colorlcd/themes/480_default.cpp +++ b/radio/src/gui/colorlcd/themes/480_default.cpp @@ -296,14 +296,14 @@ class Theme480: public OpenTxTheme delete mixerSetupFlightmodeIcon; mixerSetupFlightmodeIcon = BitmapBuffer::load8bitMask(mask_textline_fm); -// delete mixerSetupSlowIcon; -// mixerSetupSlowIcon = BitmapBuffer::loadMask(getFilePath("mask_textline_slow.png")); -// -// delete mixerSetupDelayIcon; -// mixerSetupDelayIcon = BitmapBuffer::loadMask(getFilePath("mask_textline_delay.png")); -// -// delete mixerSetupDelaySlowIcon; -// mixerSetupDelaySlowIcon = BitmapBuffer::loadMask(getFilePath("mask_textline_delayslow.png")); + delete mixerSetupSlowIcon; + mixerSetupSlowIcon = BitmapBuffer::load8bitMask(mask_textline_slow); + + delete mixerSetupDelayIcon; + mixerSetupDelayIcon = BitmapBuffer::load8bitMask(mask_textline_delay); + + delete mixerSetupDelaySlowIcon; + mixerSetupDelaySlowIcon = BitmapBuffer::load8bitMask(mask_textline_delayslow); } void load() const override