From 6304f0daf600e5e41ff28014048cc0cbedfc6985 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Fri, 4 Aug 2017 10:41:36 +0200
Subject: [PATCH] Sleep bitmap on X7 (#5125)

---
 radio/src/bitmaps/128x64/sleep.png      | Bin 0 -> 347 bytes
 radio/src/gui/128x64/lcd.cpp            |   2 +-
 radio/src/gui/128x64/lcd.h              |   2 +-
 radio/src/gui/128x64/popups.cpp         |   2 +-
 radio/src/gui/128x64/radio_diagkeys.cpp |   2 +-
 radio/src/gui/128x64/radio_setup.cpp    |   2 +-
 radio/src/gui/128x64/splash.cpp         |   4 ++--
 radio/src/gui/128x64/view_about.cpp     |   2 +-
 radio/src/gui/128x64/widgets.cpp        |  10 +++++++++-
 radio/src/gui/212x64/lcd.cpp            |   2 +-
 radio/src/gui/212x64/lcd.h              |   2 +-
 radio/src/gui/212x64/radio_diagkeys.cpp |   2 +-
 radio/src/gui/212x64/radio_setup.cpp    |   2 +-
 radio/src/gui/212x64/widgets.cpp        |   8 ++++----
 14 files changed, 25 insertions(+), 17 deletions(-)
 create mode 100755 radio/src/bitmaps/128x64/sleep.png

diff --git a/radio/src/bitmaps/128x64/sleep.png b/radio/src/bitmaps/128x64/sleep.png
new file mode 100755
index 0000000000000000000000000000000000000000..1b682d2e14583f390f5a2ce08f6bfb06c4ad5bc5
GIT binary patch
literal 347
zcmeAS@N?(olHy`uVBq!ia0vp^HXzK%3?vzhybXaQTYyi9E0F&G|NqjP^X~##j7i?^
zE({&4vK~MVXMsm#F#`j)FbFd;%$g$s6l5>)^mS!_$SyC+ZOUTPstXjl?djqeqH%uh
zMQg4@4gzcs1iRn*WGkLAee+FA?y!@`5v931gIqkU_BvgfamiyAZ;Nbtns7jX_V!;K
zhi(2bv|c~tu40gAmS}f%hM=94p^jqE4$}pT?ly`3;N2PV!0$>{VeNvbKq)KjzJ#Eo
zTs|rvtRogAbYyN|I?gMy*JnzbY~a^EH?u{YpPr_1N3%>}6hC7y_2@c5d)FpTt)kh{
zu19BUJqi1L>jS%0*ZXFl_cju)=U*KD#A$b|c!wWfib<7`P`_YGQg7=XUdO^BuJ+#(
ljLl`3*FRcs|4zPwDKD?TdV|v!2cS0@JYD@<);T3K0RW&gdA0xm

literal 0
HcmV?d00001

diff --git a/radio/src/gui/128x64/lcd.cpp b/radio/src/gui/128x64/lcd.cpp
index 7a3d4c21a..b32e9be41 100644
--- a/radio/src/gui/128x64/lcd.cpp
+++ b/radio/src/gui/128x64/lcd.cpp
@@ -1510,7 +1510,7 @@ void NAME(coord_t x, coord_t y, TYPE img, uint8_t idx, LcdFlags att)          \
 LCD_IMG_FUNCTION(lcd_imgfar, uint_farptr_t, pgm_read_byte_far)
 #endif
 
-LCD_IMG_FUNCTION(lcd_img, const pm_uchar *, pgm_read_byte)
+LCD_IMG_FUNCTION(lcdDraw1bitBitmap, const pm_uchar *, pgm_read_byte)
 
 #endif
 
diff --git a/radio/src/gui/128x64/lcd.h b/radio/src/gui/128x64/lcd.h
index 92d94b2f5..429543fb9 100644
--- a/radio/src/gui/128x64/lcd.h
+++ b/radio/src/gui/128x64/lcd.h
@@ -261,7 +261,7 @@ void lcd_imgfar(coord_t x, coord_t y, const uint_farptr_t img, uint8_t idx, LcdF
 #endif
 
 void lcdClear(void);
-void lcd_img(coord_t x, coord_t y, const pm_uchar * img, uint8_t idx, LcdFlags att=0);
+void lcdDraw1bitBitmap(coord_t x, coord_t y, const pm_uchar * img, uint8_t idx, LcdFlags att=0);
 
 #if defined(BOOT)
   #define BLINK_ON_PHASE               (0)
diff --git a/radio/src/gui/128x64/popups.cpp b/radio/src/gui/128x64/popups.cpp
index 5ff5d6455..69de13404 100644
--- a/radio/src/gui/128x64/popups.cpp
+++ b/radio/src/gui/128x64/popups.cpp
@@ -60,7 +60,7 @@ const pm_uchar ASTERISK_BITMAP[] PROGMEM = {
 void drawAlertBox(const pm_char * title, const pm_char * text, const char * action)
 {
   lcdClear();
-  lcd_img(2, 0, ASTERISK_BITMAP, 0, 0);
+  lcdDraw1bitBitmap(2, 0, ASTERISK_BITMAP, 0, 0);
 
 #define MESSAGE_LCD_OFFSET   6*FW
 
diff --git a/radio/src/gui/128x64/radio_diagkeys.cpp b/radio/src/gui/128x64/radio_diagkeys.cpp
index 25447c1ef..254da36c5 100644
--- a/radio/src/gui/128x64/radio_diagkeys.cpp
+++ b/radio/src/gui/128x64/radio_diagkeys.cpp
@@ -45,7 +45,7 @@ void menuRadioDiagKeys(event_t event)
 
     if (i < 8) {
       y = MENU_HEADER_HEIGHT + FH*3 + FH*(i/2);
-      if (i&1) lcd_img(14*FW, y, sticks, i/2, 0);
+      if (i&1) lcdDraw1bitBitmap(14*FW, y, sticks, i/2, 0);
       displayKeyState(i&1? 20*FW : 18*FW, y, TRM_BASE+i);
     }
 
diff --git a/radio/src/gui/128x64/radio_setup.cpp b/radio/src/gui/128x64/radio_setup.cpp
index bf2ab96b6..c7d37a32b 100644
--- a/radio/src/gui/128x64/radio_setup.cpp
+++ b/radio/src/gui/128x64/radio_setup.cpp
@@ -575,7 +575,7 @@ void menuRadioSetup(event_t event)
       case ITEM_SETUP_STICK_MODE_LABELS:
         lcdDrawTextAlignedLeft(y, NO_INDENT(STR_MODE));
         for (uint8_t i=0; i<4; i++) {
-          lcd_img(5*FW+i*(4*FW+2), y, sticks, i, 0);
+          lcdDraw1bitBitmap(5*FW+i*(4*FW+2), y, sticks, i, 0);
 #if defined(FRSKY_STICKS)
           if (g_eeGeneral.stickReverse & (1<<i)) {
             lcdDrawFilledRect(5*FW+i*(4*FW+2), y, 3*FW, FH-1);
diff --git a/radio/src/gui/128x64/splash.cpp b/radio/src/gui/128x64/splash.cpp
index 8cf1f02dc..f8d4fb4d4 100644
--- a/radio/src/gui/128x64/splash.cpp
+++ b/radio/src/gui/128x64/splash.cpp
@@ -54,7 +54,7 @@ void drawSplash()
 #if defined(PCBMEGA2560) && !defined(SIMU)
   lcd_imgfar(0, 0, (GET_FAR_ADDRESS(splashdata)+4), 0, 0); // use progmem "far" for splash working with all other options enabled
 #else
-  lcd_img(0, 0, splash_lbm, 0, 0);  
+  lcdDraw1bitBitmap(0, 0, splash_lbm, 0, 0);
 #endif
   
 #if MENUS_LOCK == 1
@@ -79,7 +79,7 @@ const pm_uchar * const splash2_lbm = splashdata2+4;
 void drawSecondSplash()
 {
   lcdClear();
-  lcd_img(0, 0, splash2_lbm, 0, 0);
+  lcdDraw1bitBitmap(0, 0, splash2_lbm, 0, 0);
   lcdRefresh();
 }
 #endif
diff --git a/radio/src/gui/128x64/view_about.cpp b/radio/src/gui/128x64/view_about.cpp
index 3bf1a563d..e5af021d4 100644
--- a/radio/src/gui/128x64/view_about.cpp
+++ b/radio/src/gui/128x64/view_about.cpp
@@ -79,7 +79,7 @@ void menuAboutView(event_t event)
 
   lcdDrawText(17, 0, STR_ABOUTUS, DBLSIZE|INVERS);
   lcdDrawSolidHorizontalLine(17, 16, LCD_W-17);
-  lcd_img(8, 0, about_bmp, 0);
+  lcdDraw1bitBitmap(8, 0, about_bmp, 0);
   LcdFlags att = 0;
 
   uint8_t screenDuration = 150;
diff --git a/radio/src/gui/128x64/widgets.cpp b/radio/src/gui/128x64/widgets.cpp
index 3d814f80a..e22e7f9da 100644
--- a/radio/src/gui/128x64/widgets.cpp
+++ b/radio/src/gui/128x64/widgets.cpp
@@ -258,9 +258,17 @@ void drawProgressBar(const char * label, int num, int den)
 }
 
 #if defined(CPUARM) || defined(CPUM2560)
+const pm_uchar SLEEP_BITMAP[] PROGMEM = {
+#include "sleep.lbm"
+};
+
+#define SLEEP_BITMAP_WIDTH             60
+#define SLEEP_BITMAP_HEIGHT            60
+
 void drawSleepBitmap()
 {
   lcdClear();
-  showMessageBox(STR_SHUTDOWN);
+  lcdDraw1bitBitmap((LCD_W-SLEEP_BITMAP_WIDTH)/2, (LCD_H-SLEEP_BITMAP_HEIGHT)/2, SLEEP_BITMAP, 0);
+  lcdRefresh();
 }
 #endif
diff --git a/radio/src/gui/212x64/lcd.cpp b/radio/src/gui/212x64/lcd.cpp
index f7ea793dd..2711ca934 100644
--- a/radio/src/gui/212x64/lcd.cpp
+++ b/radio/src/gui/212x64/lcd.cpp
@@ -881,7 +881,7 @@ void lcdInvertLine(int8_t line)
 }
 
 #if !defined(BOOT)
-void lcd_img(coord_t x, coord_t y, const pm_uchar * img, uint8_t idx, LcdFlags att)
+void lcdDraw1bitBitmap(coord_t x, coord_t y, const pm_uchar * img, uint8_t idx, LcdFlags att)
 {
   const pm_uchar *q = img;
   uint8_t w    = pgm_read_byte(q++);
diff --git a/radio/src/gui/212x64/lcd.h b/radio/src/gui/212x64/lcd.h
index ab78dc0b5..3f00d5eb0 100644
--- a/radio/src/gui/212x64/lcd.h
+++ b/radio/src/gui/212x64/lcd.h
@@ -180,7 +180,7 @@ void drawTelemetryTopBar();
   lcdDrawSolidVerticalLine(xx  ,yy-ll,ll);  \
   lcdDrawSolidVerticalLine(xx+1,yy-ll,ll)
 
-void lcd_img(coord_t x, coord_t y, const pm_uchar * img, uint8_t idx, LcdFlags att=0);
+void lcdDraw1bitBitmap(coord_t x, coord_t y, const pm_uchar * img, uint8_t idx, LcdFlags att=0);
 
 void lcdDrawBitmap(coord_t x, coord_t y, const uint8_t * img, coord_t offset=0, coord_t width=0);
 #define LCD_ICON(x, y, icon) lcdDrawBitmap(x, y, icons, icon)
diff --git a/radio/src/gui/212x64/radio_diagkeys.cpp b/radio/src/gui/212x64/radio_diagkeys.cpp
index 4ba5130ed..7525e0d1c 100644
--- a/radio/src/gui/212x64/radio_diagkeys.cpp
+++ b/radio/src/gui/212x64/radio_diagkeys.cpp
@@ -37,7 +37,7 @@ void menuRadioDiagKeys(event_t event)
 
     if (i<8) {
       y = MENU_HEADER_HEIGHT + FH*3 + FH*(i/2);
-      if (i&1) lcd_img(14*FW, y, sticks, i/2, 0);
+      if (i&1) lcdDraw1bitBitmap(14*FW, y, sticks, i/2, 0);
       displayKeyState(i&1? 20*FW : 18*FW, y, TRM_BASE+i);
     }
 
diff --git a/radio/src/gui/212x64/radio_setup.cpp b/radio/src/gui/212x64/radio_setup.cpp
index 41ecd343d..01d9a7661 100644
--- a/radio/src/gui/212x64/radio_setup.cpp
+++ b/radio/src/gui/212x64/radio_setup.cpp
@@ -488,7 +488,7 @@ void menuRadioSetup(event_t event)
       case ITEM_SETUP_STICK_MODE_LABELS:
         lcdDrawTextAlignedLeft(y, NO_INDENT(STR_MODE));
         for (uint8_t i=0; i<4; i++) {
-          lcd_img((6+4*i)*FW, y, sticks, i, 0);
+          lcdDraw1bitBitmap((6+4*i)*FW, y, sticks, i, 0);
         }
         break;
 
diff --git a/radio/src/gui/212x64/widgets.cpp b/radio/src/gui/212x64/widgets.cpp
index 9134a1e67..27eaacac8 100644
--- a/radio/src/gui/212x64/widgets.cpp
+++ b/radio/src/gui/212x64/widgets.cpp
@@ -20,7 +20,7 @@
 
 #include "opentx.h"
 
-const pm_uchar bmp_sleep[] PROGMEM = {
+const pm_uchar SLEEP_BITMAP[] PROGMEM = {
   #include "../../bitmaps/212x64/sleep.lbm"
 };
 
@@ -29,12 +29,12 @@ const pm_uchar bmp_sleep[] PROGMEM = {
 void drawSleepBitmap()
 {
   lcdClear();
-  lcdDrawBitmap((LCD_W-SLEEP_BITMAP_WIDTH)/2, (LCD_H-SLEEP_BITMAP_HEIGHT)/2, bmp_sleep, 0, SLEEP_BITMAP_WIDTH);
+  lcdDrawBitmap((LCD_W-SLEEP_BITMAP_WIDTH)/2, (LCD_H-SLEEP_BITMAP_HEIGHT)/2, SLEEP_BITMAP, 0, SLEEP_BITMAP_WIDTH);
   lcdRefresh();
 }
 
 #if defined(PWR_BUTTON_PRESS)
-const pm_uchar bmp_shutdown[] PROGMEM = {
+const pm_uchar SHUTDOWN_BITMAP[] PROGMEM = {
   #include "../../bitmaps/212x64/shutdown.lbm"
 };
 
@@ -45,7 +45,7 @@ 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, bmp_shutdown, (3 - index) * SHUTDOWN_BITMAP_WIDTH, SHUTDOWN_BITMAP_WIDTH);
+  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);
   }