From f83de20232926a3928b9fb98c49ef14368fc5501 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Fri, 31 May 2019 11:27:27 +0200
Subject: [PATCH] Same shutdown animation on all boards

---
 radio/src/bitmaps/212x64/shutdown.png   | Bin 3320 -> 0 bytes
 radio/src/gui/128x64/lcd.cpp            |  17 -----------------
 radio/src/gui/212x64/widgets.cpp        |  20 --------------------
 radio/src/gui/common/stdlcd/widgets.cpp |  17 +++++++++++++++++
 4 files changed, 17 insertions(+), 37 deletions(-)
 delete mode 100644 radio/src/bitmaps/212x64/shutdown.png

diff --git a/radio/src/bitmaps/212x64/shutdown.png b/radio/src/bitmaps/212x64/shutdown.png
deleted file mode 100644
index 8f3307020596d9d0825cca242c7fd61327722662..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3320
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

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