From dbd47737cb3d1717a9eb294070dbe7fa3fdd10cd Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Tue, 13 Sep 2016 19:39:23 +0200 Subject: [PATCH] Compilation fix --- radio/src/gui/128x64/gui.h | 4 ++-- radio/src/gui/128x64/widgets.cpp | 4 +++- radio/src/opentx.cpp | 5 +---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/radio/src/gui/128x64/gui.h b/radio/src/gui/128x64/gui.h index 2074ba2ca..4db87ea1e 100644 --- a/radio/src/gui/128x64/gui.h +++ b/radio/src/gui/128x64/gui.h @@ -421,8 +421,8 @@ void drawStick(coord_t centrex, int16_t xval, int16_t yval); void drawPotsBars(); void doMainScreenGraphics(); -inline void drawProgressBar(const char * label); -inline void updateProgressBar(int num, int den); +void drawProgressBar(const char * label); +void updateProgressBar(int num, int den); void drawSleepBitmap(); #if !defined(CPUM64) diff --git a/radio/src/gui/128x64/widgets.cpp b/radio/src/gui/128x64/widgets.cpp index ab41b01ec..114d77d4e 100644 --- a/radio/src/gui/128x64/widgets.cpp +++ b/radio/src/gui/128x64/widgets.cpp @@ -256,8 +256,10 @@ void updateProgressBar(int num, int den) // TODO } +#if defined(CPUARM) || defined(CPU2560) void drawSleepBitmap() { lcdClear(); showMessageBox(STR_SHUTDOWN); -} \ No newline at end of file +} +#endif diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index 4aa9187cf..390c73654 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -2626,11 +2626,8 @@ int main() #if defined(CPUM2560) // Time to switch off - lcdClear(); - showMessageBox(STR_SHUTDOWN); + drawSleepBitmap(); opentxClose(); - lcdClear() ; - lcdRefresh() ; boardOff(); // Only turn power off if necessary wdt_disable(); while(1); // never return from main() - there is no code to return back, if any delays occurs in physical power it does dead loop.