diff --git a/radio/src/bitmaps/212x64/shutdown.png b/radio/src/bitmaps/212x64/shutdown.png deleted file mode 100644 index 8f3307020..000000000 Binary files a/radio/src/bitmaps/212x64/shutdown.png and /dev/null differ diff --git a/radio/src/gui/128x64/lcd.cpp b/radio/src/gui/128x64/lcd.cpp index 88303595f..7627c4504 100644 --- a/radio/src/gui/128x64/lcd.cpp +++ b/radio/src/gui/128x64/lcd.cpp @@ -1011,20 +1011,3 @@ void lcdDrawHorizontalLine(coord_t x, coord_t y, coord_t w, uint8_t pat, LcdFlag p++; } } - -#if defined(PWR_BUTTON_PRESS) -void drawShutdownAnimation(uint32_t index, const char * message) -{ - lcdClear(); - int quarter = index / (PWR_PRESS_SHUTDOWN_DELAY / 5); - for (int i=1; i<=4; i++) { - if (4 - quarter >= i) { - lcdDrawFilledRect(LCD_W / 2 - 28 + 10 * i, LCD_H / 2 - 3, 6, 6, SOLID, 0); - } - } - if (message) { - lcdDrawText((LCD_W - getTextWidth(message)) / 2, LCD_H-2*FH, message); - } - lcdRefresh(); -} -#endif diff --git a/radio/src/gui/212x64/widgets.cpp b/radio/src/gui/212x64/widgets.cpp index 2cfd11b0b..7251f201d 100644 --- a/radio/src/gui/212x64/widgets.cpp +++ b/radio/src/gui/212x64/widgets.cpp @@ -33,26 +33,6 @@ void drawSleepBitmap() lcdRefresh(); } -#if defined(PWR_BUTTON_PRESS) -const unsigned char SHUTDOWN_BITMAP[] = { - #include "../../bitmaps/212x64/shutdown.lbm" -}; - -#define SHUTDOWN_BITMAP_WIDTH 60 -#define SHUTDOWN_BITMAP_HEIGHT 60 -void drawShutdownAnimation(uint32_t index, const char * message) -{ - index /= (PWR_PRESS_SHUTDOWN_DELAY / 4); - lcdRefreshWait(); - lcdClear(); - lcdDrawBitmap((LCD_W-SHUTDOWN_BITMAP_WIDTH)/2, (LCD_H-SHUTDOWN_BITMAP_HEIGHT)/2, SHUTDOWN_BITMAP, (3 - index) * SHUTDOWN_BITMAP_WIDTH, SHUTDOWN_BITMAP_WIDTH); - if (message) { - lcdDrawText((LCD_W - getTextWidth(message)) / 2, LCD_H-2*FH, message); - } - lcdRefresh(); -} -#endif - void drawStick(coord_t centrex, int16_t xval, int16_t yval) { #define BOX_CENTERY (LCD_H-BOX_WIDTH/2-10) diff --git a/radio/src/gui/common/stdlcd/widgets.cpp b/radio/src/gui/common/stdlcd/widgets.cpp index c05fa5114..1f8178e07 100644 --- a/radio/src/gui/common/stdlcd/widgets.cpp +++ b/radio/src/gui/common/stdlcd/widgets.cpp @@ -233,3 +233,20 @@ void drawReceiverName(coord_t x, coord_t y, uint8_t moduleIdx, uint8_t receiverI lcdDrawText(x, y, "External", flags); } } + +#if defined(PWR_BUTTON_PRESS) +void drawShutdownAnimation(uint32_t index, const char * message) +{ + lcdClear(); + int quarter = index / (PWR_PRESS_SHUTDOWN_DELAY / 5); + for (int i=1; i<=4; i++) { + if (4 - quarter >= i) { + lcdDrawFilledRect(LCD_W / 2 - 28 + 10 * i, LCD_H / 2 - 3, 6, 6, SOLID, 0); + } + } + if (message) { + lcdDrawText((LCD_W - getTextWidth(message)) / 2, LCD_H-2*FH, message); + } + lcdRefresh(); +} +#endif