From 3a45cbe8e7f8ee142217a9c6d4f3188fe0628c07 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Sat, 24 Apr 2021 00:11:30 +0200
Subject: [PATCH] Cleanup & fixes

---
 radio/src/gui/colorlcd/colors.h                              | 3 ++-
 radio/src/gui/colorlcd/standalone_lua.cpp                    | 3 ---
 radio/src/gui/colorlcd/themes/480_default.cpp                | 2 --
 radio/src/lua/api_general.cpp                                | 2 +-
 radio/src/lua/interface.cpp                                  | 3 ++-
 radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt | 1 +
 6 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/radio/src/gui/colorlcd/colors.h b/radio/src/gui/colorlcd/colors.h
index d0d7f9511..fa0090139 100644
--- a/radio/src/gui/colorlcd/colors.h
+++ b/radio/src/gui/colorlcd/colors.h
@@ -65,6 +65,7 @@ enum LcdColorIndex
   SCROLLBOX_COLOR_INDEX,
   TABLE_HEADER_BGCOLOR_INDEX,
   TABLE_BGCOLOR_INDEX,
+  BATTERY_CHARGE_COLOR_INDEX,
 
   // this one MUST be last
   LCD_COLOR_COUNT,
@@ -106,7 +107,7 @@ inline void lcdSetColor(uint16_t color)
 #define BARGRAPH1_COLOR                COLOR(BARGRAPH1_COLOR_INDEX)
 #define BARGRAPH2_COLOR                COLOR(BARGRAPH2_COLOR_INDEX)
 #define BARGRAPH_BGCOLOR               COLOR(BARGRAPH_BGCOLOR_INDEX)
-//#define BATTERY_CHARGE_COLOR           COLOR(BATTERY_CHARGE_COLOR_INDEX)
+#define BATTERY_CHARGE_COLOR           COLOR(BATTERY_CHARGE_COLOR_INDEX)
 #define CHECKBOX_COLOR                 COLOR(CHECKBOX_COLOR_INDEX)
 #define CURVE_AXIS_COLOR               COLOR(CURVE_AXIS_COLOR_INDEX)
 #define CURVE_COLOR                    COLOR(CURVE_COLOR_INDEX)
diff --git a/radio/src/gui/colorlcd/standalone_lua.cpp b/radio/src/gui/colorlcd/standalone_lua.cpp
index ca7ffa1ca..bcdee8a8e 100644
--- a/radio/src/gui/colorlcd/standalone_lua.cpp
+++ b/radio/src/gui/colorlcd/standalone_lua.cpp
@@ -30,9 +30,6 @@ StandaloneLuaWindow::StandaloneLuaWindow(Window* parent) :
     Window(parent->getFullScreenWindow(), {0, 0, LCD_W, LCD_H}, OPAQUE),
     lcdBuffer(BMP_RGB565, LCD_W, LCD_H, lcdGetBackupBuffer())
 {
-  TRACE("backup frame buffer = %p", lcdGetBackupBuffer());
-  TRACE("lcdBuffer.getData() = %p", lcdBuffer.getData());
-  assert(lcdBuffer.getData());
   Layer::push(this);
   setFocus();
 }
diff --git a/radio/src/gui/colorlcd/themes/480_default.cpp b/radio/src/gui/colorlcd/themes/480_default.cpp
index 3e0947282..3441163b0 100644
--- a/radio/src/gui/colorlcd/themes/480_default.cpp
+++ b/radio/src/gui/colorlcd/themes/480_default.cpp
@@ -69,9 +69,7 @@ class Theme480: public OpenTxTheme
       lcdColorTable[BARGRAPH1_COLOR_INDEX] = RED;
       lcdColorTable[BARGRAPH2_COLOR_INDEX] = RGB(167, 167, 167);
       lcdColorTable[BARGRAPH_BGCOLOR_INDEX] = RGB(222, 222, 222);
-#if defined(BATTERY_CHARGE)
       lcdColorTable[BATTERY_CHARGE_COLOR_INDEX] = GREEN;
-#endif
     }
 
     void loadMenuIcon(uint8_t index, const char * filename, uint32_t color=MENU_COLOR) const
diff --git a/radio/src/lua/api_general.cpp b/radio/src/lua/api_general.cpp
index 711e20fdb..a7c8f0e0a 100644
--- a/radio/src/lua/api_general.cpp
+++ b/radio/src/lua/api_general.cpp
@@ -1852,7 +1852,7 @@ const luaR_value_entry opentxConstants[] = {
   { "BARGRAPH1_COLOR", COLOR2FLAGS(BARGRAPH1_COLOR_INDEX) },
   { "BARGRAPH2_COLOR", COLOR2FLAGS(BARGRAPH2_COLOR_INDEX) },
   { "BARGRAPH_BGCOLOR", COLOR2FLAGS(BARGRAPH_BGCOLOR_INDEX) },
-  //{ "BATTERY_CHARGE_COLOR", COLOR2FLAGS(BATTERY_CHARGE_COLOR_INDEX) },
+  { "BATTERY_CHARGE_COLOR", COLOR2FLAGS(BATTERY_CHARGE_COLOR_INDEX) },
   { "CHECKBOX_COLOR", COLOR2FLAGS(CHECKBOX_COLOR_INDEX) },
   { "CURVE_AXIS_COLOR", COLOR2FLAGS(CURVE_AXIS_COLOR_INDEX) },
   { "CURVE_COLOR", COLOR2FLAGS(CURVE_COLOR_INDEX) },
diff --git a/radio/src/lua/interface.cpp b/radio/src/lua/interface.cpp
index c20e4a10a..42fbfd849 100644
--- a/radio/src/lua/interface.cpp
+++ b/radio/src/lua/interface.cpp
@@ -984,7 +984,8 @@ bool luaDoOneRunPermanentScript(event_t evt, int i, uint32_t scriptType)
     else {
       return false;
     }
-#else
+#else // !PCBTARANIS
+    // COLORLCD
     return false;
 #endif
   }
diff --git a/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt b/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt
index c36501c3b..9c3285150 100644
--- a/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt
+++ b/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt
@@ -113,6 +113,7 @@ if(PCB STREQUAL X10 OR PCB STREQUAL X12S OR PCB STREQUAL NV14)
   set(BOOTLOADER_SRC
     ${BOOTLOADER_SRC}
     ../../../../../gui/colorlcd/fonts.cpp
+    ../../../../../gui/colorlcd/colors.cpp
     ../../../../../thirdparty/libopenui/src/bitmapbuffer.cpp
     ../../../../../thirdparty/libopenui/src/libopenui_globals.cpp
     ../../../../../targets/${TARGET_DIR}/sdram_driver.c