Cleanup & fixes

This commit is contained in:
Raphael Coeffic
2021-05-06 12:55:59 +02:00
committed by Raphael Coeffic
parent 1716e24260
commit 3a45cbe8e7
6 changed files with 6 additions and 8 deletions
+2 -1
View File
@@ -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)
@@ -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();
}
@@ -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