This commit is contained in:
Bertrand Songis
2019-10-04 18:59:38 +02:00
parent 7ab886064b
commit d31f566965
56 changed files with 341 additions and 364 deletions
@@ -80,7 +80,7 @@ local function init()
pageOffset = 0
end
NoCross = { 110, LCD_H - 28, "Waiting for Crossfire devices...", TEXT_COLOR + INVERS + BLINK }
NoCross = { 110, LCD_H - 28, "Waiting for Crossfire devices...", DEFAULT_COLOR + INVERS + BLINK }
-- Main
local function run(event)
@@ -71,7 +71,7 @@ local function redrawFieldsPage(event)
end
local attr = current == (index) and ((edit == true and BLINK or 0) + INVERS) or 0
attr = attr + TEXT_COLOR
attr = attr + DEFAULT_COLOR
if field[4] == 1 then
if field[3] == VALUE then
@@ -130,7 +130,7 @@ end
-- draws one letter mark
local function drawMark(x, y, name)
lcd.drawBitmap(ImgMarkBg, x, y)
lcd.drawText(x+8, y+3, name, TEXT_COLOR)
lcd.drawText(x+8, y+3, name, DEFAULT_COLOR)
end
@@ -151,11 +151,11 @@ local function runMotorConfig(event)
lcd.drawBitmap(ImgEngine, 310, 50)
lcd.setColor(CUSTOM_COLOR, lcd.RGB(255, 255, 255))
fields = MotorFields
lcd.drawText(40, 20, "Does your model have a motor ?", TEXT_COLOR)
lcd.drawText(40, 20, "Does your model have a motor ?", DEFAULT_COLOR)
lcd.drawFilledRectangle(40, 45, 200, 30, CUSTOM_COLOR)
fields[2][4]=0
if fields[1][5] == 1 then
lcd.drawText(40, 100, "What channel is it on ?", TEXT_COLOR)
lcd.drawText(40, 100, "What channel is it on ?", DEFAULT_COLOR)
lcd.drawFilledRectangle(40, 122, 100, 30, CUSTOM_COLOR)
fields[2][4]=1
end
@@ -206,7 +206,7 @@ local function runAilConfig(event)
else
setFieldsVisible(0, 0)
end
lcd.drawText(40, 20, "Number of ailerons on your model ?", TEXT_COLOR)
lcd.drawText(40, 20, "Number of ailerons on your model ?", DEFAULT_COLOR)
lcd.drawFilledRectangle(40, 45, 400, 30, CUSTOM_COLOR)
local result = runFieldsPage(event)
return result
@@ -251,7 +251,7 @@ local function runFlapsConfig(event)
else
setFieldsVisible(0, 0)
end
lcd.drawText(40, 20, "Does your model have flaps ?", TEXT_COLOR)
lcd.drawText(40, 20, "Does your model have flaps ?", DEFAULT_COLOR)
lcd.drawFilledRectangle(40, 45, 400, 30, CUSTOM_COLOR)
local result = runFieldsPage(event)
return result
@@ -323,7 +323,7 @@ local function runTailConfig(event)
drawMark(152, 164, "B")
setFieldsVisible(1, 1, 0)
end
lcd.drawText(40, 20, "Pick the tail config of your model", TEXT_COLOR)
lcd.drawText(40, 20, "Pick the tail config of your model", DEFAULT_COLOR)
lcd.drawFilledRectangle(40, 45, 400, 30, CUSTOM_COLOR)
local result = runFieldsPage(event)
return result
@@ -331,8 +331,8 @@ end
local lineIndex
local function drawNextLine(text, text2)
lcd.drawText(40, lineIndex, text, TEXT_COLOR)
lcd.drawText(242, lineIndex, ": CH" .. text2 + 1, TEXT_COLOR)
lcd.drawText(40, lineIndex, text, DEFAULT_COLOR)
lcd.drawText(242, lineIndex, ": CH" .. text2 + 1, DEFAULT_COLOR)
lineIndex = lineIndex + 20
end
@@ -442,8 +442,8 @@ local function createModel(event)
addMix(TailFields[3][5], MIXSRC_FIRST_INPUT+defaultChannel(1), "V-EleL", 50)
addMix(TailFields[3][5], MIXSRC_FIRST_INPUT+defaultChannel(0), "V-RudL", -50, 1)
end
lcd.drawText(70, 90, "Model successfully created !", TEXT_COLOR)
lcd.drawText(100, 130, "Press RTN to exit", TEXT_COLOR)
lcd.drawText(70, 90, "Model successfully created !", DEFAULT_COLOR)
lcd.drawText(100, 130, "Press RTN to exit", DEFAULT_COLOR)
return 2
end
@@ -71,7 +71,7 @@ local function redrawFieldsPage(event)
end
local attr = current == (index) and ((edit == true and BLINK or 0) + INVERS) or 0
attr = attr + TEXT_COLOR
attr = attr + DEFAULT_COLOR
if field[4] == 1 then
if field[3] == VALUE then
@@ -130,7 +130,7 @@ end
-- draws one letter mark
local function drawMark(x, y, name)
lcd.drawBitmap(ImgMarkBg, x, y)
lcd.drawText(x+8, y+3, name, TEXT_COLOR)
lcd.drawText(x+8, y+3, name, DEFAULT_COLOR)
end
@@ -151,11 +151,11 @@ local function runMotorConfig(event)
lcd.drawBitmap(ImgEngine, 310, 50)
lcd.setColor(CUSTOM_COLOR, lcd.RGB(255, 255, 255))
fields = MotorFields
lcd.drawText(40, 20, "Does your model have a motor ?", TEXT_COLOR)
lcd.drawText(40, 20, "Does your model have a motor ?", DEFAULT_COLOR)
lcd.drawFilledRectangle(40, 45, 200, 30, CUSTOM_COLOR)
fields[2][4]=0
if fields[1][5] == 1 then
lcd.drawText(40, 100, "What channel is it on ?", TEXT_COLOR)
lcd.drawText(40, 100, "What channel is it on ?", DEFAULT_COLOR)
lcd.drawFilledRectangle(40, 122, 100, 30, CUSTOM_COLOR)
fields[2][4]=1
end
@@ -206,7 +206,7 @@ local function runAilConfig(event)
else
setFieldsVisible(0, 0)
end
lcd.drawText(40, 20, "Number of ailerons on your model ?", TEXT_COLOR)
lcd.drawText(40, 20, "Number of ailerons on your model ?", DEFAULT_COLOR)
lcd.drawFilledRectangle(40, 45, 400, 30, CUSTOM_COLOR)
local result = runFieldsPage(event)
return result
@@ -251,7 +251,7 @@ local function runFlapsConfig(event)
else
setFieldsVisible(0, 0)
end
lcd.drawText(40, 20, "Does your model have flaps ?", TEXT_COLOR)
lcd.drawText(40, 20, "Does your model have flaps ?", DEFAULT_COLOR)
lcd.drawFilledRectangle(40, 45, 400, 30, CUSTOM_COLOR)
local result = runFieldsPage(event)
return result
@@ -323,7 +323,7 @@ local function runTailConfig(event)
drawMark(152, 164, "B")
setFieldsVisible(1, 1, 0)
end
lcd.drawText(40, 20, "Pick the tail config of your model", TEXT_COLOR)
lcd.drawText(40, 20, "Pick the tail config of your model", DEFAULT_COLOR)
lcd.drawFilledRectangle(40, 45, 400, 30, CUSTOM_COLOR)
local result = runFieldsPage(event)
return result
@@ -331,8 +331,8 @@ end
local lineIndex
local function drawNextLine(text, text2)
lcd.drawText(40, lineIndex, text, TEXT_COLOR)
lcd.drawText(242, lineIndex, ": CH" .. text2 + 1, TEXT_COLOR)
lcd.drawText(40, lineIndex, text, DEFAULT_COLOR)
lcd.drawText(242, lineIndex, ": CH" .. text2 + 1, DEFAULT_COLOR)
lineIndex = lineIndex + 20
end
@@ -442,8 +442,8 @@ local function createModel(event)
addMix(TailFields[3][5], MIXSRC_FIRST_INPUT+defaultChannel(1), "V-EleL", 50)
addMix(TailFields[3][5], MIXSRC_FIRST_INPUT+defaultChannel(0), "V-RudL", -50, 1)
end
lcd.drawText(70, 90, "Model successfully created !", TEXT_COLOR)
lcd.drawText(100, 130, "Press RTN to exit", TEXT_COLOR)
lcd.drawText(70, 90, "Model successfully created !", DEFAULT_COLOR)
lcd.drawText(100, 130, "Press RTN to exit", DEFAULT_COLOR)
return 2
end
@@ -137,9 +137,9 @@ local function redrawFieldsPage(event)
end
local attr = current == (pageOffset+index) and ((edit == true and BLINK or 0) + INVERS) or 0
attr = attr + TEXT_COLOR
attr = attr + DEFAULT_COLOR
lcd.drawText(1, 30+20*index, field[1], TEXT_COLOR)
lcd.drawText(1, 30+20*index, field[1], DEFAULT_COLOR)
if field[4] == nil then
lcd.drawText(COLUMN_2, 30+20*index, "---", attr)
@@ -295,14 +295,14 @@ local function runCalibrationPage(event)
drawScreenTitle("SxR", page, #pages)
if(calibrationStep < 6) then
local position = calibrationPositions[1 + calibrationStep]
lcd.drawText(100, 50, "Place the SxR in the following position", TEXT_COLOR)
lcd.drawText(100, 50, "Place the SxR in the following position", DEFAULT_COLOR)
if calibBitmaps[calibrationStep + 1] == nil then
calibBitmaps[calibrationStep + 1] = Bitmap.open(calibBitmapsFile[calibrationStep + 1])
end
lcd.drawBitmap(calibBitmaps[calibrationStep + 1], 200, 70)
for index = 1, 3, 1 do
local field = fields[index]
lcd.drawText(70, 80+20*index, field[1]..":", TEXT_COLOR)
lcd.drawText(70, 80+20*index, field[1]..":", DEFAULT_COLOR)
lcd.drawNumber(90, 80+20*index, field[4]/10, LEFT+PREC2)
end
+2 -2
View File
@@ -38,9 +38,9 @@ end
function refresh(pie)
pie.counter = pie.counter + 1
if pie.options.Shadow == 1 then
lcd.drawNumber(pie.zone.x, pie.zone.y, pie.counter, LEFT + DBLSIZE + TEXT_COLOR);
lcd.drawNumber(pie.zone.x, pie.zone.y, pie.counter, LEFT + DBLSIZE + DEFAULT_COLOR);
else
lcd.drawNumber(pie.zone.x, pie.zone.y, pie.counter, LEFT + DBLSIZE + TEXT_COLOR + SHADOWED);
lcd.drawNumber(pie.zone.x, pie.zone.y, pie.counter, LEFT + DBLSIZE + DEFAULT_COLOR + SHADOWED);
end
end
+1 -1
View File
@@ -80,7 +80,7 @@ local function init()
pageOffset = 0
end
NoCross = { 110, LCD_H - 28, "Waiting for Crossfire devices...", TEXT_COLOR + INVERS + BLINK }
NoCross = { 110, LCD_H - 28, "Waiting for Crossfire devices...", DEFAULT_COLOR + INVERS + BLINK }
-- Main
local function run(event)
@@ -71,7 +71,7 @@ local function redrawFieldsPage(event)
end
local attr = current == (index) and ((edit == true and BLINK or 0) + INVERS) or 0
attr = attr + TEXT_COLOR
attr = attr + DEFAULT_COLOR
if field[4] == 1 then
if field[3] == VALUE then
@@ -130,7 +130,7 @@ end
-- draws one letter mark
local function drawMark(x, y, name)
lcd.drawBitmap(ImgMarkBg, x, y)
lcd.drawText(x+8, y+3, name, TEXT_COLOR)
lcd.drawText(x+8, y+3, name, DEFAULT_COLOR)
end
@@ -151,11 +151,11 @@ local function runMotorConfig(event)
lcd.drawBitmap(ImgEngine, 310, 50)
lcd.setColor(CUSTOM_COLOR, lcd.RGB(255, 255, 255))
fields = MotorFields
lcd.drawText(40, 20, "Does your model have a motor ?", TEXT_COLOR)
lcd.drawText(40, 20, "Does your model have a motor ?", DEFAULT_COLOR)
lcd.drawFilledRectangle(40, 45, 200, 30, CUSTOM_COLOR)
fields[2][4]=0
if fields[1][5] == 1 then
lcd.drawText(40, 100, "What channel is it on ?", TEXT_COLOR)
lcd.drawText(40, 100, "What channel is it on ?", DEFAULT_COLOR)
lcd.drawFilledRectangle(40, 122, 100, 30, CUSTOM_COLOR)
fields[2][4]=1
end
@@ -206,7 +206,7 @@ local function runAilConfig(event)
else
setFieldsVisible(0, 0)
end
lcd.drawText(40, 20, "Number of ailerons on your model ?", TEXT_COLOR)
lcd.drawText(40, 20, "Number of ailerons on your model ?", DEFAULT_COLOR)
lcd.drawFilledRectangle(40, 45, 400, 30, CUSTOM_COLOR)
local result = runFieldsPage(event)
return result
@@ -251,7 +251,7 @@ local function runFlapsConfig(event)
else
setFieldsVisible(0, 0)
end
lcd.drawText(40, 20, "Does your model have flaps ?", TEXT_COLOR)
lcd.drawText(40, 20, "Does your model have flaps ?", DEFAULT_COLOR)
lcd.drawFilledRectangle(40, 45, 400, 30, CUSTOM_COLOR)
local result = runFieldsPage(event)
return result
@@ -323,7 +323,7 @@ local function runTailConfig(event)
drawMark(152, 164, "B")
setFieldsVisible(1, 1, 0)
end
lcd.drawText(40, 20, "Pick the tail config of your model", TEXT_COLOR)
lcd.drawText(40, 20, "Pick the tail config of your model", DEFAULT_COLOR)
lcd.drawFilledRectangle(40, 45, 400, 30, CUSTOM_COLOR)
local result = runFieldsPage(event)
return result
@@ -331,8 +331,8 @@ end
local lineIndex
local function drawNextLine(text, text2)
lcd.drawText(40, lineIndex, text, TEXT_COLOR)
lcd.drawText(250, lineIndex, text2 + 1, TEXT_COLOR)
lcd.drawText(40, lineIndex, text, DEFAULT_COLOR)
lcd.drawText(250, lineIndex, text2 + 1, DEFAULT_COLOR)
lineIndex = lineIndex + 20
end
@@ -448,8 +448,8 @@ local function createModel(event)
addMix(TailFields[3][5], MIXSRC_FIRST_INPUT+defaultChannel(1), "V-EleR", 50)
addMix(TailFields[3][5], MIXSRC_FIRST_INPUT+defaultChannel(0), "V-RudR", -50, 1)
end
lcd.drawText(70, 90, "Model successfully created !", TEXT_COLOR)
lcd.drawText(100, 130, "Press RTN to exit", TEXT_COLOR)
lcd.drawText(70, 90, "Model successfully created !", DEFAULT_COLOR)
lcd.drawText(100, 130, "Press RTN to exit", DEFAULT_COLOR)
return 2
end
@@ -71,7 +71,7 @@ local function redrawFieldsPage(event)
end
local attr = current == (index) and ((edit == true and BLINK or 0) + INVERS) or 0
attr = attr + TEXT_COLOR
attr = attr + DEFAULT_COLOR
if field[4] == 1 then
if field[3] == VALUE then
@@ -130,7 +130,7 @@ end
-- draws one letter mark
local function drawMark(x, y, name)
lcd.drawBitmap(ImgMarkBg, x, y)
lcd.drawText(x+8, y+3, name, TEXT_COLOR)
lcd.drawText(x+8, y+3, name, DEFAULT_COLOR)
end
@@ -151,11 +151,11 @@ local function runMotorConfig(event)
lcd.drawBitmap(ImgEngine, 310, 50)
lcd.setColor(CUSTOM_COLOR, lcd.RGB(255, 255, 255))
fields = MotorFields
lcd.drawText(40, 20, "Does your model have a motor ?", TEXT_COLOR)
lcd.drawText(40, 20, "Does your model have a motor ?", DEFAULT_COLOR)
lcd.drawFilledRectangle(40, 45, 200, 30, CUSTOM_COLOR)
fields[2][4]=0
if fields[1][5] == 1 then
lcd.drawText(40, 100, "What channel is it on ?", TEXT_COLOR)
lcd.drawText(40, 100, "What channel is it on ?", DEFAULT_COLOR)
lcd.drawFilledRectangle(40, 122, 100, 30, CUSTOM_COLOR)
fields[2][4]=1
end
@@ -206,7 +206,7 @@ local function runAilConfig(event)
else
setFieldsVisible(0, 0)
end
lcd.drawText(40, 20, "Number of ailerons on your model ?", TEXT_COLOR)
lcd.drawText(40, 20, "Number of ailerons on your model ?", DEFAULT_COLOR)
lcd.drawFilledRectangle(40, 45, 400, 30, CUSTOM_COLOR)
local result = runFieldsPage(event)
return result
@@ -251,7 +251,7 @@ local function runFlapsConfig(event)
else
setFieldsVisible(0, 0)
end
lcd.drawText(40, 20, "Does your model have flaps ?", TEXT_COLOR)
lcd.drawText(40, 20, "Does your model have flaps ?", DEFAULT_COLOR)
lcd.drawFilledRectangle(40, 45, 400, 30, CUSTOM_COLOR)
local result = runFieldsPage(event)
return result
@@ -323,7 +323,7 @@ local function runTailConfig(event)
drawMark(152, 164, "B")
setFieldsVisible(1, 1, 0)
end
lcd.drawText(40, 20, "Pick the tail config of your model", TEXT_COLOR)
lcd.drawText(40, 20, "Pick the tail config of your model", DEFAULT_COLOR)
lcd.drawFilledRectangle(40, 45, 400, 30, CUSTOM_COLOR)
local result = runFieldsPage(event)
return result
@@ -331,8 +331,8 @@ end
local lineIndex
local function drawNextLine(text, text2)
lcd.drawText(40, lineIndex, text, TEXT_COLOR)
lcd.drawText(250, lineIndex, text2 + 1, TEXT_COLOR)
lcd.drawText(40, lineIndex, text, DEFAULT_COLOR)
lcd.drawText(250, lineIndex, text2 + 1, DEFAULT_COLOR)
lineIndex = lineIndex + 20
end
@@ -448,8 +448,8 @@ local function createModel(event)
addMix(TailFields[3][5], MIXSRC_FIRST_INPUT+defaultChannel(1), "V-EleR", 50)
addMix(TailFields[3][5], MIXSRC_FIRST_INPUT+defaultChannel(0), "V-RudR", -50, 1)
end
lcd.drawText(70, 90, "Model successfully created !", TEXT_COLOR)
lcd.drawText(100, 130, "Press RTN to exit", TEXT_COLOR)
lcd.drawText(70, 90, "Model successfully created !", DEFAULT_COLOR)
lcd.drawText(100, 130, "Press RTN to exit", DEFAULT_COLOR)
return 2
end
+2 -2
View File
@@ -135,9 +135,9 @@ local function redrawFieldsPage(event)
end
local attr = current == (pageOffset+index) and ((edit == true and BLINK or 0) + INVERS) or 0
attr = attr + TEXT_COLOR
attr = attr + DEFAULT_COLOR
lcd.drawText(1, 30+20*index, field[1], TEXT_COLOR)
lcd.drawText(1, 30+20*index, field[1], DEFAULT_COLOR)
if field[4] == nil then
lcd.drawText(COLUMN_2, 30+20*index, "---", attr)
+4 -4
View File
@@ -137,9 +137,9 @@ local function redrawFieldsPage(event)
end
local attr = current == (pageOffset+index) and ((edit == true and BLINK or 0) + INVERS) or 0
attr = attr + TEXT_COLOR
attr = attr + DEFAULT_COLOR
lcd.drawText(1, 30+20*index, field[1], TEXT_COLOR)
lcd.drawText(1, 30+20*index, field[1], DEFAULT_COLOR)
if field[4] == nil then
lcd.drawText(COLUMN_2, 30+20*index, "---", attr)
@@ -295,14 +295,14 @@ local function runCalibrationPage(event)
drawScreenTitle("SxR", page, #pages)
if(calibrationStep < 6) then
local position = calibrationPositions[1 + calibrationStep]
lcd.drawText(100, 50, "Place the SxR in the following position", TEXT_COLOR)
lcd.drawText(100, 50, "Place the SxR in the following position", DEFAULT_COLOR)
if calibBitmaps[calibrationStep + 1] == nil then
calibBitmaps[calibrationStep + 1] = Bitmap.open(calibBitmapsFile[calibrationStep + 1])
end
lcd.drawBitmap(calibBitmaps[calibrationStep + 1], 200, 70)
for index = 1, 3, 1 do
local field = fields[index]
lcd.drawText(70, 80+20*index, field[1]..":", TEXT_COLOR)
lcd.drawText(70, 80+20*index, field[1]..":", DEFAULT_COLOR)
lcd.drawNumber(90, 80+20*index, field[4]/10, LEFT+PREC2)
end
+2 -2
View File
@@ -38,9 +38,9 @@ end
function refresh(pie)
pie.counter = pie.counter + 1
if pie.options.Shadow == 1 then
lcd.drawNumber(pie.zone.x, pie.zone.y, pie.counter, LEFT + DBLSIZE + TEXT_COLOR);
lcd.drawNumber(pie.zone.x, pie.zone.y, pie.counter, LEFT + DBLSIZE + DEFAULT_COLOR);
else
lcd.drawNumber(pie.zone.x, pie.zone.y, pie.counter, LEFT + DBLSIZE + TEXT_COLOR + SHADOWED);
lcd.drawNumber(pie.zone.x, pie.zone.y, pie.counter, LEFT + DBLSIZE + DEFAULT_COLOR + SHADOWED);
end
end
+4 -4
View File
@@ -394,7 +394,7 @@ void testDrawSolidVerticalLine2()
void testDrawDiagonalLine()
{
lcdDrawLine(0,0, LCD_W, LCD_H, SOLID, TEXT_COLOR);
lcdDrawLine(0,0, LCD_W, LCD_H, SOLID, DEFAULT_COLOR);
}
void testEmpty()
@@ -403,17 +403,17 @@ void testEmpty()
void testDrawRect()
{
lcdDrawRect(0, 0, LCD_W, LCD_H, 2, SOLID, TEXT_COLOR);
lcdDrawRect(0, 0, LCD_W, LCD_H, 2, SOLID, DEFAULT_COLOR);
}
void testDrawText()
{
lcdDrawText(0, LCD_H/2, "The quick brown fox jumps over the lazy dog", TEXT_COLOR);
lcdDrawText(0, LCD_H/2, "The quick brown fox jumps over the lazy dog", DEFAULT_COLOR);
}
void testDrawTextVertical()
{
lcdDrawText(30, LCD_H, "The quick brown fox ", TEXT_COLOR|VERTICAL);
lcdDrawText(30, LCD_H, "The quick brown fox ", DEFAULT_COLOR|VERTICAL);
}
void testClear()
+4 -4
View File
@@ -35,10 +35,10 @@
#define DARKRED RGB(160, 0, 6)
#define GREEN RGB(25, 150, 50)
#define TEXT_COLOR COLOR(TEXT_COLOR_INDEX)
#define DEFAULT_COLOR COLOR(DEFAULT_COLOR_INDEX)
#define TEXT_BGCOLOR COLOR(TEXT_BGCOLOR_INDEX)
#define TEXT_INVERTED_COLOR COLOR(TEXT_INVERTED_COLOR_INDEX)
#define TEXT_INVERTED_BGCOLOR COLOR(TEXT_INVERTED_BGCOLOR_INDEX)
#define FOCUS_COLOR COLOR(FOCUS_COLOR_INDEX)
#define FOCUS_BGCOLOR COLOR(FOCUS_BGCOLOR_INDEX)
#define TEXT_STATUSBAR_COLOR COLOR(TEXT_STATUSBAR_COLOR_INDEX)
#define LINE_COLOR COLOR(LINE_COLOR_INDEX)
#define SCROLLBOX_COLOR COLOR(SCROLLBOX_COLOR_INDEX)
@@ -50,7 +50,7 @@
#define ALARM_COLOR COLOR(ALARM_COLOR_INDEX)
#define WARNING_COLOR COLOR(WARNING_COLOR_INDEX)
#define TEXT_DISABLE_COLOR COLOR(TEXT_DISABLE_COLOR_INDEX)
#define CURVE_AXIS_COLOR COLOR(CURVE_AXIS_COLOR_INDEX)
#define DISABLE_COLOR COLOR(DISABLE_COLOR_INDEX)
#define CURVE_COLOR COLOR(CURVE_COLOR_INDEX)
#define CURVE_CURSOR_COLOR COLOR(CURVE_CURSOR_COLOR_INDEX)
#define TITLE_BGCOLOR COLOR(TITLE_BGCOLOR_INDEX)
+9 -9
View File
@@ -31,17 +31,17 @@ void Curve::drawBackground(BitmapBuffer * dc)
dc->clear(CUSTOM_COLOR);
// Axis
dc->drawSolidHorizontalLine(0, height()/2, width(), CURVE_AXIS_COLOR);
dc->drawSolidVerticalLine(width()/2, 0, height(), CURVE_AXIS_COLOR);
dc->drawSolidHorizontalLine(0, height()/2, width(), DISABLE_COLOR);
dc->drawSolidVerticalLine(width()/2, 0, height(), DISABLE_COLOR);
// Extra lines
dc->drawVerticalLine(width()/4, 0, height(), STASHED, CURVE_AXIS_COLOR);
dc->drawVerticalLine(width()*3/4, 0, height(), STASHED, CURVE_AXIS_COLOR);
dc->drawHorizontalLine(0, height()/4, width(), STASHED, CURVE_AXIS_COLOR);
dc->drawHorizontalLine(0, height()*3/4, width(), STASHED, CURVE_AXIS_COLOR);
dc->drawVerticalLine(width()/4, 0, height(), STASHED, DISABLE_COLOR);
dc->drawVerticalLine(width()*3/4, 0, height(), STASHED, DISABLE_COLOR);
dc->drawHorizontalLine(0, height()/4, width(), STASHED, DISABLE_COLOR);
dc->drawHorizontalLine(0, height()*3/4, width(), STASHED, DISABLE_COLOR);
// Outside border
// dc->drawSolidRect(0, 0, width(), height(), 1, TEXT_COLOR);
// dc->drawSolidRect(0, 0, width(), height(), 1, DEFAULT_COLOR);
}
coord_t Curve::getPointX(int x)
@@ -67,12 +67,12 @@ void Curve::drawCurve(BitmapBuffer * dc)
if (prev >= 0) {
if (prev < y) {
for (int tmp = prev; tmp <= y; tmp++) {
dc->drawBitmapPattern(x - 2, tmp - 2, LBM_POINT, TEXT_COLOR);
dc->drawBitmapPattern(x - 2, tmp - 2, LBM_POINT, DEFAULT_COLOR);
}
}
else {
for (int tmp = y; tmp <= prev; tmp++) {
dc->drawBitmapPattern(x - 2, tmp - 2, LBM_POINT, TEXT_COLOR);
dc->drawBitmapPattern(x - 2, tmp - 2, LBM_POINT, DEFAULT_COLOR);
}
}
}
+1 -1
View File
@@ -43,7 +43,7 @@ void CurveEdit::update()
};
}
else {
addPoint(getPoint(index, i), TEXT_COLOR);
addPoint(getPoint(index, i), DEFAULT_COLOR);
}
}
invalidate();
+15 -15
View File
@@ -32,20 +32,20 @@ void drawFunction(BitmapBuffer * dc, FnFuncP fn, int x, int y, int width)
int right = x + width;
// Axis
dc->drawSolidHorizontalLine(left, y, width*2+1, CURVE_AXIS_COLOR);
dc->drawSolidVerticalLine(x, y-width, width*2, CURVE_AXIS_COLOR);
dc->drawSolidHorizontalLine(left, y, width*2+1, DISABLE_COLOR);
dc->drawSolidVerticalLine(x, y-width, width*2, DISABLE_COLOR);
// Extra lines
dc->drawVerticalLine(left+width/2, y-width, width*2, STASHED, CURVE_AXIS_COLOR);
dc->drawVerticalLine(right-width/2, y-width, width*2, STASHED, CURVE_AXIS_COLOR);
dc->drawHorizontalLine(left, y-width/2, width*2+1, STASHED, CURVE_AXIS_COLOR);
dc->drawHorizontalLine(left, y+width/2, width*2+1, STASHED, CURVE_AXIS_COLOR);
dc->drawVerticalLine(left+width/2, y-width, width*2, STASHED, DISABLE_COLOR);
dc->drawVerticalLine(right-width/2, y-width, width*2, STASHED, DISABLE_COLOR);
dc->drawHorizontalLine(left, y-width/2, width*2+1, STASHED, DISABLE_COLOR);
dc->drawHorizontalLine(left, y+width/2, width*2+1, STASHED, DISABLE_COLOR);
// Outside border
dc->drawSolidVerticalLine(left, y-width, width*2, TEXT_COLOR);
dc->drawSolidVerticalLine(right, y-width, width*2, TEXT_COLOR);
dc->drawSolidHorizontalLine(left, y-width, width*2+1, TEXT_COLOR);
dc->drawSolidHorizontalLine(left, y+width, width*2+1, TEXT_COLOR);
dc->drawSolidVerticalLine(left, y-width, width*2, DEFAULT_COLOR);
dc->drawSolidVerticalLine(right, y-width, width*2, DEFAULT_COLOR);
dc->drawSolidHorizontalLine(left, y-width, width*2+1, DEFAULT_COLOR);
dc->drawSolidHorizontalLine(left, y+width, width*2+1, DEFAULT_COLOR);
coord_t prev_yv = (coord_t)-1;
@@ -54,12 +54,12 @@ void drawFunction(BitmapBuffer * dc, FnFuncP fn, int x, int y, int width)
if (prev_yv != (coord_t)-1) {
if (prev_yv < yv) {
for (int y=prev_yv; y<=yv; y+=1) {
dc->drawBitmapPattern(x+xv-2, y-2, LBM_POINT, TEXT_COLOR);
dc->drawBitmapPattern(x+xv-2, y-2, LBM_POINT, DEFAULT_COLOR);
}
}
else {
for (int y=yv; y<=prev_yv; y+=1) {
dc->drawBitmapPattern(x+xv-2, y-2, LBM_POINT, TEXT_COLOR);
dc->drawBitmapPattern(x+xv-2, y-2, LBM_POINT, DEFAULT_COLOR);
}
}
}
@@ -70,14 +70,14 @@ void drawFunction(BitmapBuffer * dc, FnFuncP fn, int x, int y, int width)
void drawCurveVerticalScale(BitmapBuffer * dc, int x)
{
for (int i=0; i<=20; i++) {
dc->drawSolidHorizontalLine(x, CURVE_CENTER_Y-CURVE_SIDE_WIDTH+i*CURVE_SIDE_WIDTH/10, 10, TEXT_COLOR);
dc->drawSolidHorizontalLine(x, CURVE_CENTER_Y-CURVE_SIDE_WIDTH+i*CURVE_SIDE_WIDTH/10, 10, DEFAULT_COLOR);
}
}
void drawCurveHorizontalScale(BitmapBuffer * dc)
{
for (int i=0; i<=20; i++) {
dc->drawSolidVerticalLine(CURVE_CENTER_X-CURVE_SIDE_WIDTH+i*CURVE_SIDE_WIDTH/10, CURVE_CENTER_Y+CURVE_SIDE_WIDTH+5, 10, TEXT_COLOR);
dc->drawSolidVerticalLine(CURVE_CENTER_X-CURVE_SIDE_WIDTH+i*CURVE_SIDE_WIDTH/10, CURVE_CENTER_Y+CURVE_SIDE_WIDTH+5, 10, DEFAULT_COLOR);
}
}
@@ -86,7 +86,7 @@ void drawCurveCoord(BitmapBuffer * dc, int x, int y, const char * text, bool act
dc->drawSolidFilledRect(x, y, CURVE_COORD_WIDTH, CURVE_COORD_HEIGHT, CURVE_CURSOR_COLOR);
dc->drawText(x+3+(CURVE_COORD_WIDTH-1-getTextWidth(text, SMLSIZE))/2, y+1, text, LEFT|SMLSIZE|TEXT_BGCOLOR);
if (active) {
dc->drawBitmapPattern(x, y, LBM_CURVE_COORD_SHADOW, TEXT_COLOR);
dc->drawBitmapPattern(x, y, LBM_CURVE_COORD_SHADOW, DEFAULT_COLOR);
}
}
@@ -43,10 +43,10 @@ void CustomCurveChoice::paint(BitmapBuffer * dc)
char s[8];
int16_t value = getValue();
LcdFlags textColor = 0;
LcdFlags lineColor = CURVE_AXIS_COLOR;
LcdFlags lineColor = DISABLE_COLOR;
if (hasFocus) {
textColor = TEXT_INVERTED_BGCOLOR;
lineColor = TEXT_INVERTED_BGCOLOR;
textColor = FOCUS_BGCOLOR;
lineColor = FOCUS_BGCOLOR;
}
dc->drawText(3, 2, getCurveString(s, value), flags | textColor);
dc->drawSolidRect(0, 0, rect.w, rect.h, 1, lineColor);
+23 -43
View File
@@ -33,26 +33,6 @@ void drawColumnHeader(BitmapBuffer * dc, const char * const * headers, const cha
}
}
void drawCheckBox(BitmapBuffer * dc, coord_t x, coord_t y, uint8_t value, LcdFlags attr)
{
if (attr) {
dc->drawSolidFilledRect(x-1, y+3, 14, 14, TEXT_INVERTED_BGCOLOR);
dc->drawSolidFilledRect(x+1, y+5, 10, 10, TEXT_BGCOLOR);
if (value) {
dc->drawSolidFilledRect(x+2, y+6, 8, 8, TEXT_INVERTED_BGCOLOR);
}
}
else {
if (value) {
dc->drawSolidFilledRect(x+2, y+6, 8, 8, SCROLLBOX_COLOR);
dc->drawSolidRect(x, y+4, 12, 12, 1, LINE_COLOR);
}
else {
dc->drawSolidRect(x, y+4, 12, 12, 1, LINE_COLOR);
}
}
}
void drawVerticalScrollbar(BitmapBuffer * dc, coord_t x, coord_t y, coord_t h, uint16_t offset, uint16_t count, uint8_t visible)
{
if (visible < count) {
@@ -75,13 +55,13 @@ void drawHorizontalTrimPosition(BitmapBuffer * dc, coord_t x, coord_t y, int16_t
{
drawTrimSquare(dc, x, y);
if (dir >= 0) {
dc->drawSolidVerticalLine(x+8, y+3, 9, TEXT_INVERTED_COLOR);
dc->drawSolidVerticalLine(x+8, y+3, 9, FOCUS_COLOR);
}
if (dir <= 0) {
dc->drawSolidVerticalLine(x+2, y+3, 9, TEXT_INVERTED_COLOR);
dc->drawSolidVerticalLine(x+2, y+3, 9, FOCUS_COLOR);
}
// if (exttrim) {
// lcdDrawSolidVerticalLine(xm, ym, 9, TEXT_INVERTED_COLOR);
// lcdDrawSolidVerticalLine(xm, ym, 9, FOCUS_COLOR);
// }
}
@@ -89,13 +69,13 @@ void drawVerticalTrimPosition(BitmapBuffer * dc, coord_t x, coord_t y, int16_t d
{
drawTrimSquare(dc, x, y);
if (dir >= 0) {
dc->drawSolidHorizontalLine(x+1, y+4, 9, TEXT_INVERTED_COLOR);
dc->drawSolidHorizontalLine(x+1, y+4, 9, FOCUS_COLOR);
}
if (dir <= 0) {
dc->drawSolidHorizontalLine(x+1, y+10, 9, TEXT_INVERTED_COLOR);
dc->drawSolidHorizontalLine(x+1, y+10, 9, FOCUS_COLOR);
}
// if (exttrim) {
// lcdDrawSolidHorizontalLine(xm-1, ym, 3, TEXT_INVERTED_COLOR);
// lcdDrawSolidHorizontalLine(xm-1, ym, 3, FOCUS_COLOR);
// }
}
@@ -106,13 +86,13 @@ void drawVerticalSlider(BitmapBuffer * dc, coord_t x, coord_t y, int len, int va
int delta = len / steps;
for (int i = 0; i <= len; i += delta) {
if ((options & OPTION_SLIDER_BIG_TICKS) && (i == 0 || i == len / 2 || i == len))
dc->drawSolidHorizontalLine(x, y + i, 13, TEXT_COLOR);
dc->drawSolidHorizontalLine(x, y + i, 13, DEFAULT_COLOR);
else
dc->drawSolidHorizontalLine(x + 2, y + i, 9, TEXT_COLOR);
dc->drawSolidHorizontalLine(x + 2, y + i, 9, DEFAULT_COLOR);
}
}
else {
dc->drawBitmapPattern(x + 1, y, LBM_VTRIM_FRAME, TEXT_COLOR);
dc->drawBitmapPattern(x + 1, y, LBM_VTRIM_FRAME, DEFAULT_COLOR);
/* if (g_model.displayTrims != DISPLAY_TRIMS_NEVER && trim != 0) {
if (g_model.displayTrims == DISPLAY_TRIMS_ALWAYS || (trimsDisplayTimer > 0 && (trimsDisplayMask & (1<<i)))) {
lcdDrawNumber((stickIndex==0 ? TRIM_LH_X : TRIM_RH_X)+(trim>0 ? -20 : 50), ym+1, trim, TINSIZE);
@@ -125,7 +105,7 @@ void drawVerticalSlider(BitmapBuffer * dc, coord_t x, coord_t y, int len, int va
}
else if (options & OPTION_SLIDER_NUMBER_BUTTON) {
drawTrimSquare(dc, x, y - 2);
// TODO lcdDrawChar(x + 2, y - 1, '0' + val, SMLSIZE | TEXT_INVERTED_COLOR);
// TODO lcdDrawChar(x + 2, y - 1, '0' + val, SMLSIZE | FOCUS_COLOR);
}
else {
drawTrimSquare(dc, x, y - 2);
@@ -141,22 +121,22 @@ void drawHorizontalSlider(BitmapBuffer * dc, coord_t x, coord_t y, int len, int
int delta = len / steps;
for (int i = 0; i <= len; i += delta) {
if ((options & OPTION_SLIDER_BIG_TICKS) && (i == 0 || i == len / 2 || i == len))
dc->drawSolidVerticalLine(x + i, y, 13, TEXT_COLOR);
dc->drawSolidVerticalLine(x + i, y, 13, DEFAULT_COLOR);
else
dc->drawSolidVerticalLine(x + i, y + 2, 9, TEXT_COLOR);
dc->drawSolidVerticalLine(x + i, y + 2, 9, DEFAULT_COLOR);
}
}
}
else if (options & OPTION_SLIDER_EMPTY_BAR) {
dc->drawBitmapPattern(x, y + 1, LBM_HTRIM_FRAME, TEXT_COLOR);
dc->drawBitmapPattern(x, y + 1, LBM_HTRIM_FRAME, DEFAULT_COLOR);
}
else if (options & OPTION_SLIDER_DBL_COLOR) {
dc->drawBitmapPattern(x, y + 8, LBM_SLIDER_BAR_LEFT, w <= 0 ? LINE_COLOR : TEXT_INVERTED_BGCOLOR);
dc->drawBitmapPattern(x, y + 8, LBM_SLIDER_BAR_LEFT, w <= 0 ? LINE_COLOR : FOCUS_BGCOLOR);
if (w > 4)
dc->drawSolidFilledRect(x + 4, y + 8, w - 4, 4, TEXT_INVERTED_BGCOLOR);
dc->drawSolidFilledRect(x + 4, y + 8, w - 4, 4, FOCUS_BGCOLOR);
if (w < len - 4)
dc->drawSolidFilledRect(x + w, y + 8, len - w - 4, 4, LINE_COLOR);
dc->drawBitmapPattern(x + len - 4, y + 8, LBM_SLIDER_BAR_RIGHT, w >= len ? TEXT_INVERTED_BGCOLOR : LINE_COLOR);
dc->drawBitmapPattern(x + len - 4, y + 8, LBM_SLIDER_BAR_RIGHT, w >= len ? FOCUS_BGCOLOR : LINE_COLOR);
}
else {
dc->drawBitmapPattern(x, y + 8, LBM_SLIDER_BAR_LEFT, LINE_COLOR);
@@ -176,16 +156,16 @@ void drawHorizontalSlider(BitmapBuffer * dc, coord_t x, coord_t y, int len, int
else if (options & OPTION_SLIDER_NUMBER_BUTTON) {
drawTrimSquare(dc, x+2, y - 1);
char text[] = { (char)('0' + val), '\0' };
dc->drawText(x + 7, y - 1, text, SMLSIZE | CENTERED | TEXT_INVERTED_COLOR);
dc->drawText(x + 7, y - 1, text, SMLSIZE | CENTERED | FOCUS_COLOR);
}
else if (options & OPTION_SLIDER_SQUARE_BUTTON) {
drawTrimSquare(dc, x, y - 1);
}
else {
dc->drawBitmapPattern(x, y + 2, LBM_SLIDER_POINT_OUT, TEXT_COLOR);
dc->drawBitmapPattern(x, y + 2, LBM_SLIDER_POINT_OUT, DEFAULT_COLOR);
dc->drawBitmapPattern(x, y + 2, LBM_SLIDER_POINT_MID, TEXT_BGCOLOR);
if ((options & INVERS) && (!(options & BLINK) || !BLINK_ON_PHASE))
dc->drawBitmapPattern(x, y + 2, LBM_SLIDER_POINT_IN, TEXT_INVERTED_BGCOLOR);
dc->drawBitmapPattern(x, y + 2, LBM_SLIDER_POINT_IN, FOCUS_BGCOLOR);
}
}
@@ -285,10 +265,10 @@ void drawShutdownAnimation(uint32_t duration, uint32_t totalDuration, const char
else {
lcdRestoreBackupBuffer();
int quarter = duration / (totalDuration / 5);
if (quarter >= 1) lcd->drawBitmapPattern(LCD_W/2, (LCD_H-SHUTDOWN_CIRCLE_DIAMETER)/2, LBM_SHUTDOWN_CIRCLE, TEXT_COLOR, 0, SHUTDOWN_CIRCLE_DIAMETER/2);
if (quarter >= 2) lcd->drawBitmapPattern(LCD_W/2, LCD_H/2, LBM_SHUTDOWN_CIRCLE, TEXT_COLOR, SHUTDOWN_CIRCLE_DIAMETER/2, SHUTDOWN_CIRCLE_DIAMETER/2);
if (quarter >= 3) lcd->drawBitmapPattern((LCD_W-SHUTDOWN_CIRCLE_DIAMETER)/2, LCD_H/2, LBM_SHUTDOWN_CIRCLE, TEXT_COLOR, SHUTDOWN_CIRCLE_DIAMETER, SHUTDOWN_CIRCLE_DIAMETER/2);
if (quarter >= 4) lcd->drawBitmapPattern((LCD_W-SHUTDOWN_CIRCLE_DIAMETER)/2, (LCD_H-SHUTDOWN_CIRCLE_DIAMETER)/2, LBM_SHUTDOWN_CIRCLE, TEXT_COLOR, SHUTDOWN_CIRCLE_DIAMETER*3/2, SHUTDOWN_CIRCLE_DIAMETER/2);
if (quarter >= 1) lcd->drawBitmapPattern(LCD_W/2, (LCD_H-SHUTDOWN_CIRCLE_DIAMETER)/2, LBM_SHUTDOWN_CIRCLE, DEFAULT_COLOR, 0, SHUTDOWN_CIRCLE_DIAMETER/2);
if (quarter >= 2) lcd->drawBitmapPattern(LCD_W/2, LCD_H/2, LBM_SHUTDOWN_CIRCLE, DEFAULT_COLOR, SHUTDOWN_CIRCLE_DIAMETER/2, SHUTDOWN_CIRCLE_DIAMETER/2);
if (quarter >= 3) lcd->drawBitmapPattern((LCD_W-SHUTDOWN_CIRCLE_DIAMETER)/2, LCD_H/2, LBM_SHUTDOWN_CIRCLE, DEFAULT_COLOR, SHUTDOWN_CIRCLE_DIAMETER, SHUTDOWN_CIRCLE_DIAMETER/2);
if (quarter >= 4) lcd->drawBitmapPattern((LCD_W-SHUTDOWN_CIRCLE_DIAMETER)/2, (LCD_H-SHUTDOWN_CIRCLE_DIAMETER)/2, LBM_SHUTDOWN_CIRCLE, DEFAULT_COLOR, SHUTDOWN_CIRCLE_DIAMETER*3/2, SHUTDOWN_CIRCLE_DIAMETER/2);
}
}
else {
-1
View File
@@ -59,7 +59,6 @@ void drawFlightMode(coord_t x, coord_t y, int8_t idx, LcdFlags att);
void drawStatusText(BitmapBuffer * dc, const char * text);
void drawColumnHeader(BitmapBuffer * dc, const char * const * headers, const char * const * descriptions, uint8_t index);
void drawCheckBox(BitmapBuffer * dc, coord_t x, coord_t y, uint8_t value, LcdFlags attr);
void drawVerticalScrollbar(BitmapBuffer * dc, coord_t x, coord_t y, coord_t h, uint16_t offset, uint16_t count, uint8_t visible);
void drawProgressScreen(BitmapBuffer * dc, const char * title, const char * message, int num, int den);
void drawTrimSquare(BitmapBuffer * dc, coord_t x, coord_t y);
+1 -1
View File
@@ -47,7 +47,7 @@ void FullScreenDialog::paint(BitmapBuffer * dc)
{
static_cast<ThemeBase *>(theme)->drawBackground(dc);
dc->drawFilledRect(0, ALERT_FRAME_TOP, LCD_W, ALERT_FRAME_HEIGHT, SOLID, TEXT_INVERTED_COLOR | OPACITY(8));
dc->drawFilledRect(0, ALERT_FRAME_TOP, LCD_W, ALERT_FRAME_HEIGHT, SOLID, FOCUS_COLOR | OPACITY(8));
if (type == WARNING_TYPE_ALERT || type == WARNING_TYPE_ASTERISK)
dc->drawBitmap(ALERT_BITMAP_LEFT, ALERT_BITMAP_TOP, static_cast<ThemeBase *>(theme)->asterisk);
+8 -8
View File
@@ -108,10 +108,10 @@ bool CheckBox(W * window, rect_t & rect, const char * label, uint8_t & value, Lc
drawText(window, rect.x, rect.y+4, label);
coord_t x = rect.x + rect.w - 20;
if (hasFocus) {
window->drawSolidFilledRect(x-1, rect.y+8, 14, 14, TEXT_INVERTED_BGCOLOR);
window->drawSolidFilledRect(x-1, rect.y+8, 14, 14, FOCUS_BGCOLOR);
window->drawSolidFilledRect(x+1, rect.y+10, 10, 10, TEXT_BGCOLOR);
if (value) {
window->drawSolidFilledRect(x+2, rect.y+11, 8, 8, TEXT_INVERTED_BGCOLOR);
window->drawSolidFilledRect(x+2, rect.y+11, 8, 8, FOCUS_BGCOLOR);
}
}
else {
@@ -150,10 +150,10 @@ bool Choice(W * window, rect_t & rect, const char * label, const char * values,
rect.h = 30;
bool hasFocus = (flags & HAS_FOCUS) || window->hasFocus(rect.x, rect.y);
LcdFlags textColor = 0;
LcdFlags lineColor = CURVE_AXIS_COLOR;
LcdFlags lineColor = DISABLE_COLOR;
if (hasFocus) {
textColor = TEXT_INVERTED_BGCOLOR;
lineColor = TEXT_INVERTED_BGCOLOR;
textColor = FOCUS_BGCOLOR;
lineColor = FOCUS_BGCOLOR;
}
drawTextAtIndex(window, rect.x, rect.y + 9, values, value, textColor);
drawWidgetLine(window, rect, lineColor);
@@ -175,10 +175,10 @@ bool TextEdit(W * window, rect_t & rect, const char * label, char * value, uint8
rect.h = 30;
bool hasFocus = (flags & HAS_FOCUS) || window->hasFocus(rect.x, rect.y);
LcdFlags textColor = 0;
LcdFlags lineColor = CURVE_AXIS_COLOR;
LcdFlags lineColor = DISABLE_COLOR;
if (hasFocus) {
textColor = TEXT_INVERTED_BGCOLOR;
lineColor = TEXT_INVERTED_BGCOLOR;
textColor = FOCUS_BGCOLOR;
lineColor = FOCUS_BGCOLOR;
}
if (!hasFocus && zlen(value, length) == 0)
menuBodyWindow.drawSizedText(rect.x, rect.y + 9, "---", length, textColor);
+1 -1
View File
@@ -153,7 +153,7 @@ class CurveButton : public Button {
void paint(BitmapBuffer * dc) override
{
// bounding rect
dc->drawSolidRect(0, 0, rect.w, rect.h, 2, hasFocus() ? SCROLLBOX_COLOR : CURVE_AXIS_COLOR);
dc->drawSolidRect(0, 0, rect.w, rect.h, 2, hasFocus() ? SCROLLBOX_COLOR : DISABLE_COLOR);
// curve characteristics
if (isCurveFilled(index)) {
@@ -108,7 +108,7 @@ bool menuModelCustomScriptOne(event_t event)
}
if (scriptInputsOutputs[s_currIdx].outputsCount > 0) {
lcdDrawSolidVerticalLine(SCRIPT_ONE_3RD_COLUMN_POS-4, DEFAULT_SCROLLBAR_Y, DEFAULT_SCROLLBAR_H+5, TEXT_COLOR);
lcdDrawSolidVerticalLine(SCRIPT_ONE_3RD_COLUMN_POS-4, DEFAULT_SCROLLBAR_Y, DEFAULT_SCROLLBAR_H+5, DEFAULT_COLOR);
// lcdDrawText(SCRIPT_ONE_3RD_COLUMN_POS, FH+1, STR_OUTPUTS);
for (int i=0; i<scriptInputsOutputs[s_currIdx].outputsCount; i++) {
@@ -157,7 +157,7 @@ bool menuModelCustomScripts(event_t event)
lcdDrawText(SCRIPTS_COLUMN_STATE, y, "(killed)");
break;
default:
lcdDrawNumber(SCRIPTS_COLUMN_STATE, y, luaGetCpuUsed(scriptIndex), LEFT|TEXT_COLOR, 0, NULL, "%");
lcdDrawNumber(SCRIPTS_COLUMN_STATE, y, luaGetCpuUsed(scriptIndex), LEFT|DEFAULT_COLOR, 0, NULL, "%");
break;
}
scriptIndex++;
+2 -2
View File
@@ -314,7 +314,7 @@ void CommonInputOrMixButton::paint(BitmapBuffer * dc)
if (active)
dc->drawSolidFilledRect(2, 2, rect.w - 4, rect.h - 4, WARNING_COLOR);
paintBody(dc);
dc->drawSolidRect(0, 0, rect.w, rect.h, 2, hasFocus() ? SCROLLBOX_COLOR : CURVE_AXIS_COLOR);
dc->drawSolidRect(0, 0, rect.w, rect.h, 2, hasFocus() ? SCROLLBOX_COLOR : DISABLE_COLOR);
}
class InputLineButton : public CommonInputOrMixButton {
@@ -348,7 +348,7 @@ class InputLineButton : public CommonInputOrMixButton {
// second line ...
if (line.swtch) {
dc->drawMask(3, PAGE_LINE_HEIGHT + FIELD_PADDING_TOP, mixerSetupSwitchIcon, TEXT_COLOR);
dc->drawMask(3, PAGE_LINE_HEIGHT + FIELD_PADDING_TOP, mixerSetupSwitchIcon, DEFAULT_COLOR);
drawSwitch(dc, 21, PAGE_LINE_HEIGHT + FIELD_PADDING_TOP, line.swtch);
}
@@ -265,7 +265,7 @@ class LogicalSwitchButton : public Button {
dc->drawSolidFilledRect(2, 2, rect.w-4, rect.h-4, WARNING_COLOR);
// The bounding rect
dc->drawSolidRect(0, 0, rect.w, rect.h, 2, hasFocus() ? SCROLLBOX_COLOR : CURVE_AXIS_COLOR);
dc->drawSolidRect(0, 0, rect.w, rect.h, 2, hasFocus() ? SCROLLBOX_COLOR : DISABLE_COLOR);
// CSW func
dc->drawTextAtIndex(col1, line1, STR_VCSWFUNC, ls->func);
+1 -1
View File
@@ -141,7 +141,7 @@ class OutputLineButton : public Button {
}
// bounding rect
dc->drawSolidRect(0, 0, rect.w, rect.h, 2, hasFocus() ? SCROLLBOX_COLOR : CURVE_AXIS_COLOR);
dc->drawSolidRect(0, 0, rect.w, rect.h, 2, hasFocus() ? SCROLLBOX_COLOR : DISABLE_COLOR);
}
protected:
+4 -4
View File
@@ -45,11 +45,11 @@ ModelCell * currentModel;
void drawCategory(coord_t y, const char * name, bool selected)
{
if (selected) {
lcdDrawSolidFilledRect(1, y-INVERT_VERT_MARGIN, CATEGORIES_WIDTH-10, INVERT_LINE_HEIGHT+2, TEXT_INVERTED_BGCOLOR);
lcdDrawText(6, y, name, TEXT_COLOR | INVERS);
lcdDrawSolidFilledRect(1, y-INVERT_VERT_MARGIN, CATEGORIES_WIDTH-10, INVERT_LINE_HEIGHT+2, FOCUS_BGCOLOR);
lcdDrawText(6, y, name, DEFAULT_COLOR | INVERS);
}
else {
lcdDrawText(6, y, name, TEXT_COLOR);
lcdDrawText(6, y, name, DEFAULT_COLOR);
}
}
@@ -484,7 +484,7 @@ bool menuModelSelect(event_t event)
}
if (selected) {
lcd->drawBitmap(5, LCD_H-FH, modelselModelNameBitmap);
lcdDrawText(22, LCD_H-FH-1, (*it)->modelFilename, SMLSIZE|TEXT_COLOR);
lcdDrawText(22, LCD_H-FH-1, (*it)->modelFilename, SMLSIZE|DEFAULT_COLOR);
}
}
}
+1 -1
View File
@@ -54,7 +54,7 @@ class ChannelFailsafeBargraph: public Window {
x += width() / 2;
const coord_t xChannel = (channelValue > 0) ? x : x + 1 - lenChannel;
const coord_t xFailsafe = (failsafeValue > 0) ? x : x + 1 - lenFailsafe;
dc->drawSolidFilledRect(xChannel, + 2, lenChannel, (height() / 2) - 3, TEXT_COLOR);
dc->drawSolidFilledRect(xChannel, + 2, lenChannel, (height() / 2) - 3, DEFAULT_COLOR);
dc->drawSolidFilledRect(xFailsafe, (height() / 2) + 1, lenFailsafe, (height() / 2) - 3, ALARM_COLOR);
}
+2 -2
View File
@@ -82,7 +82,7 @@ class SensorButton : public Button {
dc->drawSizedText(SENSOR_COL1, line1, g_model.telemetrySensors[index].label, TELEM_LABEL_LEN);
if (telemetryItem.isAvailable()) {
LcdFlags color = telemetryItem.isOld() ? ALARM_COLOR : TEXT_COLOR;
LcdFlags color = telemetryItem.isOld() ? ALARM_COLOR : DEFAULT_COLOR;
drawSensorCustomValue(dc, SENSOR_COL2, line1, index, getValue(MIXSRC_FIRST_TELEM + 3 * index), LEFT | color);
}
else {
@@ -96,7 +96,7 @@ class SensorButton : public Button {
else if (sensor->type == TELEM_TYPE_CUSTOM && !g_model.ignoreSensorIds) {
dc->drawNumber(SENSOR_COL3, line1, sensor->instance, LEFT);
}
dc->drawSolidRect(0, 0, rect.w, rect.h, 2, hasFocus() ? SCROLLBOX_COLOR : CURVE_AXIS_COLOR);
dc->drawSolidRect(0, 0, rect.w, rect.h, 2, hasFocus() ? SCROLLBOX_COLOR : DISABLE_COLOR);
}
protected:
+5 -5
View File
@@ -102,12 +102,12 @@ void ModelCell::loadBitmap()
buffer->clear(TEXT_BGCOLOR);
if (error) {
buffer->drawText(5, 2, "(Invalid Model)", TEXT_COLOR);
buffer->drawBitmapPattern(5, 23, LBM_LIBRARY_SLOT, TEXT_COLOR);
buffer->drawText(5, 2, "(Invalid Model)", DEFAULT_COLOR);
buffer->drawBitmapPattern(5, 23, LBM_LIBRARY_SLOT, DEFAULT_COLOR);
}
else {
char timer[LEN_TIMER_STRING];
buffer->drawSizedText(5, 2, modelName, LEN_MODEL_NAME, SMLSIZE|TEXT_COLOR);
buffer->drawSizedText(5, 2, modelName, LEN_MODEL_NAME, SMLSIZE|DEFAULT_COLOR);
getTimerString(timer, 0);
for (uint8_t i = 0; i < MAX_TIMERS; i++) {
if (partialmodel.timers[i].mode > 0 && partialmodel.timers[i].persistent) {
@@ -115,7 +115,7 @@ void ModelCell::loadBitmap()
break;
}
}
buffer->drawText(101, 40, timer, TEXT_COLOR);
buffer->drawText(101, 40, timer, DEFAULT_COLOR);
for (int i=0; i<4; i++) {
buffer->drawBitmapPattern(104+i*11, 25, LBM_SCORE0, TITLE_BGCOLOR);
}
@@ -126,7 +126,7 @@ void ModelCell::loadBitmap()
delete bitmap;
}
else {
buffer->drawBitmapPattern(5, 23, LBM_LIBRARY_SLOT, TEXT_COLOR);
buffer->drawBitmapPattern(5, 23, LBM_LIBRARY_SLOT, DEFAULT_COLOR);
}
}
buffer->drawSolidHorizontalLine(5, 19, 143, LINE_COLOR);
+1 -1
View File
@@ -80,7 +80,7 @@ class FilePreview : public Window
{
coord_t y = parent->getScrollPositionY() + 2;
coord_t h = MENU_BODY_HEIGHT - 4;
lcd->drawSolidFilledRect(0, y, width(), h, CURVE_AXIS_COLOR);
lcd->drawSolidFilledRect(0, y, width(), h, DISABLE_COLOR);
if (bitmap) {
coord_t bitmapHeight = min<coord_t>(h, bitmap->getHeight());
coord_t bitmapWidth = min<coord_t>(width(), bitmap->getWidth());
+1 -1
View File
@@ -63,7 +63,7 @@ class LayoutChoice: public FormField {
{
FormField::paint(dc);
auto layout = getValue();
layout->drawThumb(dc, 4, 4, editMode ? TEXT_INVERTED_COLOR : LINE_COLOR);
layout->drawThumb(dc, 4, 4, editMode ? FOCUS_COLOR : LINE_COLOR);
}
#if defined(HARDWARE_KEYS)
+15 -15
View File
@@ -73,8 +73,8 @@ uint8_t editColorPart(coord_t x, coord_t y, event_t event, uint8_t part, uint8_t
{
const char * STR_COLOR_PARTS = "\002" "R:" "G:" "B:";
uint8_t PART_BITS[] = { 5, 6, 5 };
lcdDrawTextAtIndex(x, y, STR_COLOR_PARTS, part, (attr && menuHorizontalPosition < 0) ? TEXT_INVERTED_COLOR : TEXT_COLOR);
lcdDrawNumber(x + 20, y, value << (8-PART_BITS[part]), LEFT|TEXT_COLOR|((attr && (menuHorizontalPosition < 0 || menuHorizontalPosition == part)) ? attr : TEXT_COLOR));
lcdDrawTextAtIndex(x, y, STR_COLOR_PARTS, part, (attr && menuHorizontalPosition < 0) ? FOCUS_COLOR : DEFAULT_COLOR);
lcdDrawNumber(x + 20, y, value << (8-PART_BITS[part]), LEFT|DEFAULT_COLOR|((attr && (menuHorizontalPosition < 0 || menuHorizontalPosition == part)) ? attr : DEFAULT_COLOR));
if (attr && menuHorizontalPosition == part) {
value = checkIncDec(event, value, 0, (1 << PART_BITS[part])-1, i_flags);
}
@@ -142,11 +142,11 @@ bool editZoneOption(coord_t y, const ZoneOption * option, ZoneOptionValue * valu
RGB_SPLIT(value->unsignedValue, r, g, b);
if (attr && menuHorizontalPosition < 0) {
lcdDrawSolidFilledRect(SCREENS_SETUP_2ND_COLUMN-3, y-1, 230, FH+1, TEXT_INVERTED_BGCOLOR);
lcdDrawSolidFilledRect(SCREENS_SETUP_2ND_COLUMN-3, y-1, 230, FH+1, FOCUS_BGCOLOR);
}
lcdSetColor(value->unsignedValue);
lcdDrawSolidFilledRect(SCREENS_SETUP_2ND_COLUMN-1, y+1, 42, 17, TEXT_COLOR);
lcdDrawSolidFilledRect(SCREENS_SETUP_2ND_COLUMN-1, y+1, 42, 17, DEFAULT_COLOR);
lcdDrawSolidFilledRect(SCREENS_SETUP_2ND_COLUMN, y+2, 40, 15, CUSTOM_COLOR);
r = editColorPart(SCREENS_SETUP_2ND_COLUMN + 50, y, event, 0, r, attr, i_flags);
@@ -305,15 +305,15 @@ bool menuWidgetChoice(event_t event)
currentWidget->refresh();
if (iterator != getRegisteredWidgets().cbegin()) {
lcdDrawBitmapPattern(zone.x-10, zone.y+zone.h/2-10, LBM_SWIPE_CIRCLE, TEXT_INVERTED_BGCOLOR);
lcdDrawBitmapPattern(zone.x-10, zone.y+zone.h/2-10, LBM_SWIPE_LEFT, TEXT_INVERTED_COLOR);
lcdDrawBitmapPattern(zone.x-10, zone.y+zone.h/2-10, LBM_SWIPE_CIRCLE, FOCUS_BGCOLOR);
lcdDrawBitmapPattern(zone.x-10, zone.y+zone.h/2-10, LBM_SWIPE_LEFT, FOCUS_COLOR);
}
if (iterator != --getRegisteredWidgets().cend()) {
lcdDrawBitmapPattern(zone.x+zone.w-9, zone.y+zone.h/2-10, LBM_SWIPE_CIRCLE, TEXT_INVERTED_BGCOLOR);
lcdDrawBitmapPattern(zone.x+zone.w-9, zone.y+zone.h/2-10, LBM_SWIPE_RIGHT, TEXT_INVERTED_COLOR);
lcdDrawBitmapPattern(zone.x+zone.w-9, zone.y+zone.h/2-10, LBM_SWIPE_CIRCLE, FOCUS_BGCOLOR);
lcdDrawBitmapPattern(zone.x+zone.w-9, zone.y+zone.h/2-10, LBM_SWIPE_RIGHT, FOCUS_COLOR);
}
if (currentWidget)
lcdDrawText(zone.x + zone.w, zone.y-1, currentWidget->getFactory()->getName(), RIGHT | TEXT_COLOR | SMLSIZE | INVERS);
lcdDrawText(zone.x + zone.w, zone.y-1, currentWidget->getFactory()->getName(), RIGHT | DEFAULT_COLOR | SMLSIZE | INVERS);
return true;
}
@@ -356,7 +356,7 @@ bool menuWidgetsSetup(event_t event)
thickness = 1;
}
else {
color = TEXT_INVERTED_BGCOLOR;
color = FOCUS_BGCOLOR;
padding = 4;
thickness = 2;
}
@@ -425,7 +425,7 @@ T * editThemeChoice(coord_t x, coord_t y, std::list<T *> & elList, T * current,
}
if (attr) {
if (menuHorizontalPosition < 0) {
lcdDrawSolidFilledRect(x-3, y-1, min<uint8_t>(4, elCount)*56+1, 2*FH-5, TEXT_INVERTED_BGCOLOR);
lcdDrawSolidFilledRect(x-3, y-1, min<uint8_t>(4, elCount)*56+1, 2*FH-5, FOCUS_BGCOLOR);
}
else {
if (needsOffsetCheck) {
@@ -445,14 +445,14 @@ T * editThemeChoice(coord_t x, coord_t y, std::list<T *> & elList, T * current,
elItr = elList.cbegin();
std::advance(elItr, min<uint8_t>(menuHorizontalOffset, elCount - 1));
for (; idx < last && elItr != elList.cend(); ++idx, ++elItr, pos += 56) {
(*elItr)->drawThumb(pos, y+1, current == (*elItr) ? ((attr && menuHorizontalPosition < 0) ? TEXT_INVERTED_COLOR : TEXT_INVERTED_BGCOLOR) : LINE_COLOR);
(*elItr)->drawThumb(pos, y+1, current == (*elItr) ? ((attr && menuHorizontalPosition < 0) ? FOCUS_COLOR : FOCUS_BGCOLOR) : LINE_COLOR);
}
if (elCount > 4) {
lcdDrawBitmapPattern(x - 12, y+1, LBM_CARROUSSEL_LEFT, menuHorizontalOffset > 0 ? LINE_COLOR : CURVE_AXIS_COLOR);
lcdDrawBitmapPattern(x + 4 * 56, y+1, LBM_CARROUSSEL_RIGHT, last < getRegisteredLayouts().size() ? LINE_COLOR : CURVE_AXIS_COLOR);
lcdDrawBitmapPattern(x - 12, y+1, LBM_CARROUSSEL_LEFT, menuHorizontalOffset > 0 ? LINE_COLOR : DISABLE_COLOR);
lcdDrawBitmapPattern(x + 4 * 56, y+1, LBM_CARROUSSEL_RIGHT, last < getRegisteredLayouts().size() ? LINE_COLOR : DISABLE_COLOR);
}
if (attr && menuHorizontalPosition >= 0) {
lcdDrawSolidRect(x + (menuHorizontalPosition - menuHorizontalOffset) * 56 - 3, y - 1, 57, 35, 1, TEXT_INVERTED_BGCOLOR);
lcdDrawSolidRect(x + (menuHorizontalPosition - menuHorizontalOffset) * 56 - 3, y - 1, 57, 35, 1, FOCUS_BGCOLOR);
if (event == EVT_KEY_FIRST(KEY_ENTER)) {
s_editMode = 0;
elItr = elList.cbegin();
+3 -3
View File
@@ -60,11 +60,11 @@ void SourceChoice::paint(BitmapBuffer * dc)
unsigned value = getValue();
LcdFlags textColor;
if (editMode)
textColor = TEXT_INVERTED_COLOR;
textColor = FOCUS_COLOR;
else if (hasFocus())
textColor = TEXT_INVERTED_BGCOLOR;
textColor = FOCUS_BGCOLOR;
else if (value == 0)
textColor = CURVE_AXIS_COLOR;
textColor = DISABLE_COLOR;
else
textColor = 0;
drawSource(dc, FIELD_PADDING_LEFT, FIELD_PADDING_TOP, value, textColor);
+2 -2
View File
@@ -360,7 +360,7 @@ class SpecialFunctionButton : public Button {
break;
}
if (HAS_ENABLE_PARAM(func)) {
drawCheckBox(dc, col3, line2, CFN_ACTIVE(cfn), 0);
theme->drawCheckBox(dc, col3, line2, CFN_ACTIVE(cfn));
}
else if (HAS_REPEAT_PARAM(func)) {
if (CFN_PLAY_REPEAT(cfn) == 0) {
@@ -380,7 +380,7 @@ class SpecialFunctionButton : public Button {
if (active)
dc->drawSolidFilledRect(2, 2, rect.w - 4, rect.h - 4, WARNING_COLOR);
paintSpecialFunctionLine(dc);
dc->drawSolidRect(0, 0, rect.w, rect.h, 2, hasFocus() ? SCROLLBOX_COLOR : CURVE_AXIS_COLOR);
dc->drawSolidRect(0, 0, rect.w, rect.h, 2, hasFocus() ? SCROLLBOX_COLOR : DISABLE_COLOR);
}
protected:
+3 -3
View File
@@ -44,11 +44,11 @@ void SwitchChoice::paint(BitmapBuffer * dc)
unsigned value = getValue();
LcdFlags textColor;
if (editMode)
textColor = TEXT_INVERTED_COLOR;
textColor = FOCUS_COLOR;
else if (hasFocus())
textColor = TEXT_INVERTED_BGCOLOR;
textColor = FOCUS_BGCOLOR;
else if (value == 0)
textColor = CURVE_AXIS_COLOR;
textColor = DISABLE_COLOR;
else
textColor = 0;
drawSwitch(dc, FIELD_PADDING_LEFT, FIELD_PADDING_TOP, value, textColor);
+20 -22
View File
@@ -19,6 +19,7 @@
*/
#include "opentx.h"
#include "checkbox.h"
extern ThemeBase * defaultTheme;
const BitmapBuffer * ThemeBase::asterisk = NULL;
@@ -107,7 +108,7 @@ void ThemeBase::drawMessageBox(const char * title, const char * text, const char
//{
// //if (flags & MESSAGEBOX_TYPE_ALERT) {
// drawBackground();
// lcdDrawFilledRect(0, POPUP_Y, LCD_W, POPUP_H, SOLID, TEXT_INVERTED_COLOR | OPACITY(8));
// lcdDrawFilledRect(0, POPUP_Y, LCD_W, POPUP_H, SOLID, FOCUS_COLOR | OPACITY(8));
// //}
//
// if (type == WARNING_TYPE_ALERT || type == WARNING_TYPE_ASTERISK)
@@ -139,25 +140,22 @@ void ThemeBase::drawMessageBox(const char * title, const char * text, const char
// }
//}
void ThemeBase::drawCheckBox(BitmapBuffer * dc, bool value, bool focus) const
void ThemeBase::drawCheckBox(BitmapBuffer * dc, bool checked, coord_t x, coord_t y, bool focus) const
{
if (focus) {
dc->drawSolidFilledRect(0, 2, 16, 16, TEXT_INVERTED_BGCOLOR);
if (value) {
dc->drawSolidFilledRect(2, 4, 12, 12, TEXT_BGCOLOR);
dc->drawSolidFilledRect(3, 5, 10, 10, SCROLLBOX_COLOR);
dc->drawSolidFilledRect(x + 0, y + 2, 16, 16, FOCUS_BGCOLOR);
if (checked) {
dc->drawSolidFilledRect(x + 2, y + 4, 12, 12, TEXT_BGCOLOR);
dc->drawSolidFilledRect(x + 3, y + 5, 10, 10, SCROLLBOX_COLOR);
}
else {
dc->drawSolidFilledRect(2, 4, 12, 12, TEXT_BGCOLOR);
dc->drawSolidFilledRect(x + 2, y + 4, 12, 12, TEXT_BGCOLOR);
}
}
else {
if (value) {
dc->drawSolidFilledRect(2, 4, 12, 12, SCROLLBOX_COLOR);
dc->drawSolidRect(0, 2, 16, 16, 1, CURVE_AXIS_COLOR);
}
else {
dc->drawSolidRect(0, 2, 16, 16, 1, CURVE_AXIS_COLOR);
dc->drawSolidRect(x + 0, y + 2, 16, 16, 1, DISABLE_COLOR);
if (checked) {
dc->drawSolidFilledRect(x + 2, y + 4, 12, 12, SCROLLBOX_COLOR);
}
}
}
@@ -166,13 +164,13 @@ void ThemeBase::drawChoice(BitmapBuffer * dc, ChoiceBase * choice, const char *
{
LcdFlags textColor;
if (choice->isEditMode())
textColor = TEXT_INVERTED_COLOR;
textColor = FOCUS_COLOR;
else if (choice->hasFocus())
textColor = TEXT_INVERTED_BGCOLOR;
textColor = FOCUS_BGCOLOR;
else if (!str || str[0] == '\0')
textColor = CURVE_AXIS_COLOR;
textColor = DISABLE_COLOR;
else
textColor = TEXT_COLOR;
textColor = DEFAULT_COLOR;
dc->drawText(FIELD_PADDING_LEFT, FIELD_PADDING_TOP, str[0] == '\0' ? "---" : str, textColor);
dc->drawBitmapPattern(choice->getRect().w - 20, (choice->getRect().h - 11) / 2, choice->getType() == CHOICE_TYPE_FOLDER ? LBM_FOLDER : LBM_DROPDOWN, textColor);
@@ -184,9 +182,9 @@ void ThemeBase::drawSlider(BitmapBuffer * dc, int vmin, int vmax, int value, con
int w = divRoundClosest((rect.w - 16) * (val - vmin), vmax - vmin);
if (edit) {
dc->drawBitmapPattern(0, 11, LBM_SLIDER_BAR_LEFT, TEXT_INVERTED_BGCOLOR);
dc->drawSolidFilledRect(4, 11, rect.w - 8, 4, TEXT_INVERTED_BGCOLOR);
dc->drawBitmapPattern(rect.w - 4, 11, LBM_SLIDER_BAR_RIGHT, TEXT_INVERTED_BGCOLOR);
dc->drawBitmapPattern(0, 11, LBM_SLIDER_BAR_LEFT, FOCUS_BGCOLOR);
dc->drawSolidFilledRect(4, 11, rect.w - 8, 4, FOCUS_BGCOLOR);
dc->drawBitmapPattern(rect.w - 4, 11, LBM_SLIDER_BAR_RIGHT, FOCUS_BGCOLOR);
}
else {
dc->drawBitmapPattern(0, 11, LBM_SLIDER_BAR_LEFT, LINE_COLOR);
@@ -194,11 +192,11 @@ void ThemeBase::drawSlider(BitmapBuffer * dc, int vmin, int vmax, int value, con
dc->drawBitmapPattern(rect.w - 4, 11, LBM_SLIDER_BAR_RIGHT, LINE_COLOR);
}
dc->drawBitmapPattern(w, 5, LBM_SLIDER_POINT_OUT, TEXT_COLOR);
dc->drawBitmapPattern(w, 5, LBM_SLIDER_POINT_OUT, DEFAULT_COLOR);
dc->drawBitmapPattern(w, 5, LBM_SLIDER_POINT_MID, TEXT_BGCOLOR);
// if ((options & INVERS) && (!(options & BLINK) || !BLINK_ON_PHASE))
if (focus) {
dc->drawBitmapPattern(w, 5, LBM_SLIDER_POINT_IN, TEXT_INVERTED_BGCOLOR);
dc->drawBitmapPattern(w, 5, LBM_SLIDER_POINT_IN, FOCUS_BGCOLOR);
}
}
+1 -1
View File
@@ -82,7 +82,7 @@ class ThemeBase: public Theme
virtual void drawMessageBox(const char * title, const char * text, const char * action, uint32_t flags) const;
// virtual void drawProgressBar(BitmapBuffer * dc, coord_t x, coord_t y, coord_t w, coord_t h, int value) const = 0;
void drawCheckBox(BitmapBuffer * dc, bool value, bool focus) const override;
void drawCheckBox(BitmapBuffer * dc, bool checked, coord_t x, coord_t y, bool focus) const override;
void drawChoice(BitmapBuffer * dc, ChoiceBase * choice, const char * str) const override;
+23 -23
View File
@@ -40,10 +40,10 @@ class FlyskyTheme: public ThemeBase
{
TRACE("Load FlySky theme colors");
lcdColorTable[TEXT_COLOR_INDEX] = BLACK;
lcdColorTable[DEFAULT_COLOR_INDEX] = BLACK;
lcdColorTable[TEXT_BGCOLOR_INDEX] = WHITE;
lcdColorTable[TEXT_INVERTED_COLOR_INDEX] = WHITE;
lcdColorTable[TEXT_INVERTED_BGCOLOR_INDEX] = RED;
lcdColorTable[FOCUS_COLOR_INDEX] = WHITE;
lcdColorTable[FOCUS_BGCOLOR_INDEX] = RED;
lcdColorTable[TEXT_STATUSBAR_COLOR_INDEX] = WHITE;
lcdColorTable[LINE_COLOR_INDEX] = GREY;
lcdColorTable[SCROLLBOX_COLOR_INDEX] = RED;
@@ -54,7 +54,7 @@ class FlyskyTheme: public ThemeBase
lcdColorTable[ALARM_COLOR_INDEX] = RED;
lcdColorTable[WARNING_COLOR_INDEX] = YELLOW;
lcdColorTable[TEXT_DISABLE_COLOR_INDEX] = GREY;
lcdColorTable[CURVE_AXIS_COLOR_INDEX] = LIGHTGREY;
lcdColorTable[DISABLE_COLOR_INDEX] = LIGHTGREY;
lcdColorTable[CURVE_COLOR_INDEX] = RED;
lcdColorTable[CURVE_CURSOR_COLOR_INDEX] = RED;
lcdColorTable[TRIM_BGCOLOR_INDEX] = RED;
@@ -127,7 +127,7 @@ class FlyskyTheme: public ThemeBase
void loadIcons() const
{
#if defined(LOG_TELEMETRY) || defined(WATCHDOG_DISABLED)
loadMenuIcon(ICON_OPENTX, "mask_opentx_testmode.png", TEXT_COLOR);
loadMenuIcon(ICON_OPENTX, "mask_opentx_testmode.png", DEFAULT_COLOR);
#else
loadMenuIcon(ICON_OPENTX, "mask_opentx.png");
#endif
@@ -226,13 +226,13 @@ class FlyskyTheme: public ThemeBase
}
delete modelselSdFreeBitmap;
modelselSdFreeBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_sdfree.png", TEXT_COLOR, TEXT_BGCOLOR);
modelselSdFreeBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_sdfree.png", DEFAULT_COLOR, TEXT_BGCOLOR);
delete modelselModelQtyBitmap;
modelselModelQtyBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_modelqty.png", TEXT_COLOR, TEXT_BGCOLOR);
modelselModelQtyBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_modelqty.png", DEFAULT_COLOR, TEXT_BGCOLOR);
delete modelselModelNameBitmap;
modelselModelNameBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_modelname.png", TEXT_COLOR, TEXT_BGCOLOR);
modelselModelNameBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_modelname.png", DEFAULT_COLOR, TEXT_BGCOLOR);
delete modelselModelMoveBackground;
modelselModelMoveBackground = BitmapBuffer::loadMask(getFilePath("modelsel/mask_moveback.png"));
@@ -245,10 +245,10 @@ class FlyskyTheme: public ThemeBase
// Channels monitor screen
delete chanMonLockedBitmap;
chanMonLockedBitmap = BitmapBuffer::loadMaskOnBackground("mask_monitor_lockch.png", TEXT_COLOR, TEXT_BGCOLOR);
chanMonLockedBitmap = BitmapBuffer::loadMaskOnBackground("mask_monitor_lockch.png", DEFAULT_COLOR, TEXT_BGCOLOR);
delete chanMonInvertedBitmap;
chanMonInvertedBitmap = BitmapBuffer::loadMaskOnBackground("mask_monitor_inver.png", TEXT_COLOR, TEXT_BGCOLOR);
chanMonInvertedBitmap = BitmapBuffer::loadMaskOnBackground("mask_monitor_inver.png", DEFAULT_COLOR, TEXT_BGCOLOR);
// Mixer setup screen
delete mixerSetupMixerBitmap;
@@ -261,19 +261,19 @@ class FlyskyTheme: public ThemeBase
mixerSetupOutputBitmap = BitmapBuffer::loadMaskOnBackground("mask_sbar_output.png", MENU_TITLE_COLOR, HEADER_BGCOLOR);
delete mixerSetupAddBitmap;
mixerSetupAddBitmap = BitmapBuffer::loadMaskOnBackground("mask_mplex_add.png", TEXT_COLOR, TEXT_BGCOLOR);
mixerSetupAddBitmap = BitmapBuffer::loadMaskOnBackground("mask_mplex_add.png", DEFAULT_COLOR, TEXT_BGCOLOR);
delete mixerSetupMultiBitmap;
mixerSetupMultiBitmap = BitmapBuffer::loadMaskOnBackground("mask_mplex_multi.png", TEXT_COLOR, TEXT_BGCOLOR);
mixerSetupMultiBitmap = BitmapBuffer::loadMaskOnBackground("mask_mplex_multi.png", DEFAULT_COLOR, TEXT_BGCOLOR);
delete mixerSetupReplaceBitmap;
mixerSetupReplaceBitmap = BitmapBuffer::loadMaskOnBackground("mask_mplex_replace.png", TEXT_COLOR, TEXT_BGCOLOR);
mixerSetupReplaceBitmap = BitmapBuffer::loadMaskOnBackground("mask_mplex_replace.png", DEFAULT_COLOR, TEXT_BGCOLOR);
delete mixerSetupLabelBitmap;
mixerSetupLabelBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_label.png", TEXT_COLOR, TEXT_BGCOLOR);
mixerSetupLabelBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_label.png", DEFAULT_COLOR, TEXT_BGCOLOR);
delete mixerSetupCurveBitmap;
mixerSetupCurveBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_curve.png", TEXT_COLOR, TEXT_BGCOLOR);
mixerSetupCurveBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_curve.png", DEFAULT_COLOR, TEXT_BGCOLOR);
delete mixerSetupSwitchIcon;
mixerSetupSwitchIcon = BitmapBuffer::loadMask(getFilePath("mask_textline_switch.png"));
@@ -282,13 +282,13 @@ class FlyskyTheme: public ThemeBase
mixerSetupFlightmodeIcon = BitmapBuffer::loadMask(getFilePath("mask_textline_fm.png"));
delete mixerSetupSlowBitmap;
mixerSetupSlowBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_slow.png", TEXT_COLOR, TEXT_BGCOLOR);
mixerSetupSlowBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_slow.png", DEFAULT_COLOR, TEXT_BGCOLOR);
delete mixerSetupDelayBitmap;
mixerSetupDelayBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_delay.png", TEXT_COLOR, TEXT_BGCOLOR);
mixerSetupDelayBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_delay.png", DEFAULT_COLOR, TEXT_BGCOLOR);
delete mixerSetupDelaySlowBitmap;
mixerSetupDelaySlowBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_delayslow.png", TEXT_COLOR, TEXT_BGCOLOR);
mixerSetupDelaySlowBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_delayslow.png", DEFAULT_COLOR, TEXT_BGCOLOR);
}
void load() const override
@@ -310,7 +310,7 @@ class FlyskyTheme: public ThemeBase
uint32_t bg_color = UNEXPECTED_SHUTDOWN() ? WHITE : g_eeGeneral.themeData.options[0].unsignedValue;
lcdColorTable[TEXT_BGCOLOR_INDEX] = bg_color;
lcdColorTable[TEXT_INVERTED_BGCOLOR_INDEX] = color;
lcdColorTable[FOCUS_BGCOLOR_INDEX] = color;
lcdColorTable[SCROLLBOX_COLOR_INDEX] = color;
lcdColorTable[CURVE_COLOR_INDEX] = color;
lcdColorTable[CURVE_CURSOR_COLOR_INDEX] = color;
@@ -390,7 +390,7 @@ class FlyskyTheme: public ThemeBase
void drawMenuDatetime(BitmapBuffer * dc) const
{
dc->drawSolidVerticalLine(DATETIME_SEPARATOR_X, 7, 31, TEXT_INVERTED_COLOR);
dc->drawSolidVerticalLine(DATETIME_SEPARATOR_X, 7, 31, FOCUS_COLOR);
struct gtm t;
gettime(&t);
@@ -402,15 +402,15 @@ class FlyskyTheme: public ThemeBase
const char * const STR_MONTHS[] = TR_MONTHS;
sprintf(str, "%d %s", t.tm_mday, STR_MONTHS[t.tm_mon]);
#endif
dc->drawText(DATETIME_MIDDLE, DATETIME_LINE1, str, SMLSIZE|TEXT_INVERTED_COLOR|CENTERED);
dc->drawText(DATETIME_MIDDLE, DATETIME_LINE1, str, SMLSIZE|FOCUS_COLOR|CENTERED);
getTimerString(str, getValue(MIXSRC_TX_TIME));
dc->drawText(DATETIME_MIDDLE, DATETIME_LINE2, str, SMLSIZE|TEXT_INVERTED_COLOR|CENTERED);
dc->drawText(DATETIME_MIDDLE, DATETIME_LINE2, str, SMLSIZE|FOCUS_COLOR|CENTERED);
}
void drawProgressBar(BitmapBuffer * dc, coord_t x, coord_t y, coord_t w, coord_t h, int value) const override
{
dc->drawSolidRect(x, y, w, h, 1, TEXT_COLOR);
dc->drawSolidRect(x, y, w, h, 1, DEFAULT_COLOR);
if (value > 0) {
int width = (w * value) / 100;
dc->drawSolidFilledRect(x + 2, y + 2, width - 4, h - 4, SCROLLBOX_COLOR);
+23 -23
View File
@@ -39,10 +39,10 @@ class FrskyTheme: public ThemeBase
void loadColors() const
{
TRACE("Load FrSky theme colors");
lcdColorTable[TEXT_COLOR_INDEX] = BLACK;
lcdColorTable[DEFAULT_COLOR_INDEX] = BLACK;
lcdColorTable[TEXT_BGCOLOR_INDEX] = WHITE;
lcdColorTable[TEXT_INVERTED_COLOR_INDEX] = WHITE;
lcdColorTable[TEXT_INVERTED_BGCOLOR_INDEX] = RED;
lcdColorTable[FOCUS_COLOR_INDEX] = WHITE;
lcdColorTable[FOCUS_BGCOLOR_INDEX] = RED;
lcdColorTable[TEXT_STATUSBAR_COLOR_INDEX] = WHITE;
lcdColorTable[LINE_COLOR_INDEX] = GREY;
lcdColorTable[SCROLLBOX_COLOR_INDEX] = RED;
@@ -53,7 +53,7 @@ class FrskyTheme: public ThemeBase
lcdColorTable[ALARM_COLOR_INDEX] = RED;
lcdColorTable[WARNING_COLOR_INDEX] = YELLOW;
lcdColorTable[TEXT_DISABLE_COLOR_INDEX] = GREY;
lcdColorTable[CURVE_AXIS_COLOR_INDEX] = LIGHTGREY;
lcdColorTable[DISABLE_COLOR_INDEX] = LIGHTGREY;
lcdColorTable[CURVE_COLOR_INDEX] = RED;
lcdColorTable[CURVE_CURSOR_COLOR_INDEX] = RED;
lcdColorTable[TITLE_BGCOLOR_INDEX] = RED;
@@ -97,7 +97,7 @@ class FrskyTheme: public ThemeBase
void loadIcons() const
{
#if defined(LOG_TELEMETRY) || !defined(WATCHDOG)
loadMenuIcon(ICON_OPENTX, "mask_opentx_testmode.png", TEXT_COLOR);
loadMenuIcon(ICON_OPENTX, "mask_opentx_testmode.png", DEFAULT_COLOR);
#else
loadMenuIcon(ICON_OPENTX, "mask_opentx.png");
#endif
@@ -207,13 +207,13 @@ class FrskyTheme: public ThemeBase
}
delete modelselSdFreeBitmap;
modelselSdFreeBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_sdfree.png", TEXT_COLOR, TEXT_BGCOLOR);
modelselSdFreeBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_sdfree.png", DEFAULT_COLOR, TEXT_BGCOLOR);
delete modelselModelQtyBitmap;
modelselModelQtyBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_modelqty.png", TEXT_COLOR, TEXT_BGCOLOR);
modelselModelQtyBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_modelqty.png", DEFAULT_COLOR, TEXT_BGCOLOR);
delete modelselModelNameBitmap;
modelselModelNameBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_modelname.png", TEXT_COLOR, TEXT_BGCOLOR);
modelselModelNameBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_modelname.png", DEFAULT_COLOR, TEXT_BGCOLOR);
delete modelselModelMoveBackground;
modelselModelMoveBackground = BitmapBuffer::loadMask(getFilePath("modelsel/mask_moveback.png"));
@@ -226,10 +226,10 @@ class FrskyTheme: public ThemeBase
// Channels monitor screen
delete chanMonLockedBitmap;
chanMonLockedBitmap = BitmapBuffer::loadMaskOnBackground("mask_monitor_lockch.png", TEXT_COLOR, TEXT_BGCOLOR);
chanMonLockedBitmap = BitmapBuffer::loadMaskOnBackground("mask_monitor_lockch.png", DEFAULT_COLOR, TEXT_BGCOLOR);
delete chanMonInvertedBitmap;
chanMonInvertedBitmap = BitmapBuffer::loadMaskOnBackground("mask_monitor_inver.png", TEXT_COLOR, TEXT_BGCOLOR);
chanMonInvertedBitmap = BitmapBuffer::loadMaskOnBackground("mask_monitor_inver.png", DEFAULT_COLOR, TEXT_BGCOLOR);
// Mixer setup screen
delete mixerSetupMixerBitmap;
@@ -242,19 +242,19 @@ class FrskyTheme: public ThemeBase
mixerSetupOutputBitmap = BitmapBuffer::loadMaskOnBackground("mask_sbar_output.png", MENU_TITLE_COLOR, HEADER_BGCOLOR);
delete mixerSetupAddBitmap;
mixerSetupAddBitmap = BitmapBuffer::loadMaskOnBackground("mask_mplex_add.png", TEXT_COLOR, TEXT_BGCOLOR);
mixerSetupAddBitmap = BitmapBuffer::loadMaskOnBackground("mask_mplex_add.png", DEFAULT_COLOR, TEXT_BGCOLOR);
delete mixerSetupMultiBitmap;
mixerSetupMultiBitmap = BitmapBuffer::loadMaskOnBackground("mask_mplex_multi.png", TEXT_COLOR, TEXT_BGCOLOR);
mixerSetupMultiBitmap = BitmapBuffer::loadMaskOnBackground("mask_mplex_multi.png", DEFAULT_COLOR, TEXT_BGCOLOR);
delete mixerSetupReplaceBitmap;
mixerSetupReplaceBitmap = BitmapBuffer::loadMaskOnBackground("mask_mplex_replace.png", TEXT_COLOR, TEXT_BGCOLOR);
mixerSetupReplaceBitmap = BitmapBuffer::loadMaskOnBackground("mask_mplex_replace.png", DEFAULT_COLOR, TEXT_BGCOLOR);
delete mixerSetupLabelBitmap;
mixerSetupLabelBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_label.png", TEXT_COLOR, TEXT_BGCOLOR);
mixerSetupLabelBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_label.png", DEFAULT_COLOR, TEXT_BGCOLOR);
delete mixerSetupCurveBitmap;
mixerSetupCurveBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_curve.png", TEXT_COLOR, TEXT_BGCOLOR);
mixerSetupCurveBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_curve.png", DEFAULT_COLOR, TEXT_BGCOLOR);
delete mixerSetupSwitchIcon;
mixerSetupSwitchIcon = BitmapBuffer::loadMask(getFilePath("mask_textline_switch.png"));
@@ -263,13 +263,13 @@ class FrskyTheme: public ThemeBase
mixerSetupFlightmodeIcon = BitmapBuffer::loadMask(getFilePath("mask_textline_fm.png"));
delete mixerSetupSlowBitmap;
mixerSetupSlowBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_slow.png", TEXT_COLOR, TEXT_BGCOLOR);
mixerSetupSlowBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_slow.png", DEFAULT_COLOR, TEXT_BGCOLOR);
delete mixerSetupDelayBitmap;
mixerSetupDelayBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_delay.png", TEXT_COLOR, TEXT_BGCOLOR);
mixerSetupDelayBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_delay.png", DEFAULT_COLOR, TEXT_BGCOLOR);
delete mixerSetupDelaySlowBitmap;
mixerSetupDelaySlowBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_delayslow.png", TEXT_COLOR, TEXT_BGCOLOR);
mixerSetupDelaySlowBitmap = BitmapBuffer::loadMaskOnBackground("mask_textline_delayslow.png", DEFAULT_COLOR, TEXT_BGCOLOR);
}
void load() const override
@@ -290,7 +290,7 @@ class FrskyTheme: public ThemeBase
uint32_t bg_color = UNEXPECTED_SHUTDOWN() ? WHITE : g_eeGeneral.themeData.options[0].unsignedValue;
lcdColorTable[TEXT_BGCOLOR_INDEX] = bg_color;
lcdColorTable[TEXT_INVERTED_BGCOLOR_INDEX] = color;
lcdColorTable[FOCUS_BGCOLOR_INDEX] = color;
lcdColorTable[SCROLLBOX_COLOR_INDEX] = color;
lcdColorTable[CURVE_COLOR_INDEX] = color;
lcdColorTable[CURVE_CURSOR_COLOR_INDEX] = color;
@@ -367,7 +367,7 @@ class FrskyTheme: public ThemeBase
void drawMenuDatetime(BitmapBuffer * dc) const
{
dc->drawSolidVerticalLine(DATETIME_SEPARATOR_X, 7, 31, TEXT_INVERTED_COLOR);
dc->drawSolidVerticalLine(DATETIME_SEPARATOR_X, 7, 31, FOCUS_COLOR);
struct gtm t;
gettime(&t);
@@ -378,14 +378,14 @@ class FrskyTheme: public ThemeBase
const char * const STR_MONTHS[] = TR_MONTHS;
sprintf(str, "%d %s", t.tm_mday, STR_MONTHS[t.tm_mon]);
#endif
dc->drawText(DATETIME_MIDDLE, DATETIME_LINE1, str, SMLSIZE|TEXT_INVERTED_COLOR|CENTERED);
dc->drawText(DATETIME_MIDDLE, DATETIME_LINE1, str, SMLSIZE|FOCUS_COLOR|CENTERED);
getTimerString(str, getValue(MIXSRC_TX_TIME));
dc->drawText(DATETIME_MIDDLE, DATETIME_LINE2, str, SMLSIZE|TEXT_INVERTED_COLOR|CENTERED);
dc->drawText(DATETIME_MIDDLE, DATETIME_LINE2, str, SMLSIZE|FOCUS_COLOR|CENTERED);
}
void drawProgressBar(BitmapBuffer * dc, coord_t x, coord_t y, coord_t w, coord_t h, int value) const override
{
dc->drawSolidRect(x, y, w, h, 1, TEXT_COLOR);
dc->drawSolidRect(x, y, w, h, 1, DEFAULT_COLOR);
if (value > 0) {
int width = (w * value) / 100;
dc->drawSolidFilledRect(x + 2, y + 2, width - 4, h - 4, SCROLLBOX_COLOR);
+3 -3
View File
@@ -34,11 +34,11 @@ void TimeEdit::paint(BitmapBuffer * dc)
LcdFlags textColor;
if (editMode)
textColor = TEXT_INVERTED_COLOR;
textColor = FOCUS_COLOR;
else if (hasFocus())
textColor = TEXT_INVERTED_BGCOLOR;
textColor = FOCUS_BGCOLOR;
else
textColor = TEXT_COLOR;
textColor = DEFAULT_COLOR;
dc->drawText(FIELD_PADDING_LEFT, FIELD_PADDING_TOP, getTimerString(getValue(), (flags & TIMEHOUR) != 0), textColor);
}
+2 -2
View File
@@ -104,7 +104,7 @@ void drawTopBar()
else if (sensor.prec == 1) {
att |= PREC1;
}
att |= (item.isOld() ? ALARM_COLOR : TEXT_COLOR);
att |= (item.isOld() ? ALARM_COLOR : DEFAULT_COLOR);
lcdDrawSolidFilledRect(ALTITUDE_X, VOLTS_Y, ALTITUDE_W, ALTITUDE_H, TEXT_BGCOLOR);
lcdDrawText(ALTITUDE_X+PADDING, VOLTS_Y+2, "Voltage", att);
drawValueWithUnit(ALTITUDE_X+PADDING, VOLTS_Y+12, value, UNIT_VOLTS, DBLSIZE|LEFT|att);
@@ -118,7 +118,7 @@ void drawTopBar()
int32_t value = item.value;
TelemetrySensor & sensor = g_model.telemetrySensors[g_model.frsky.altitudeSource-1];
if (sensor.prec) value /= sensor.prec == 2 ? 100 : 10;
LcdFlags att = (item.isOld() ? ALARM_COLOR : TEXT_COLOR);
LcdFlags att = (item.isOld() ? ALARM_COLOR : DEFAULT_COLOR);
lcdDrawSolidFilledRect(ALTITUDE_X, ALTITUDE_Y, ALTITUDE_W, ALTITUDE_H, TEXT_BGCOLOR);
lcdDrawText(ALTITUDE_X+PADDING, ALTITUDE_Y+2, "Alt", att);
drawValueWithUnit(ALTITUDE_X+PADDING, ALTITUDE_Y+12, value, UNIT_METERS, DBLSIZE|LEFT|att);
+18 -18
View File
@@ -59,13 +59,13 @@ uint16_t posOnBar(int16_t value_to100)
void drawOutputBarLimits(coord_t left, coord_t right, coord_t y)
{
lcd->drawSolidVerticalLine(left, y, BAR_HEIGHT, TEXT_COLOR);
lcd->drawSolidHorizontalLine(left, y, 3, TEXT_COLOR);
lcd->drawSolidHorizontalLine(left, y + BAR_HEIGHT - 1, 3, TEXT_COLOR);
lcd->drawSolidVerticalLine(left, y, BAR_HEIGHT, DEFAULT_COLOR);
lcd->drawSolidHorizontalLine(left, y, 3, DEFAULT_COLOR);
lcd->drawSolidHorizontalLine(left, y + BAR_HEIGHT - 1, 3, DEFAULT_COLOR);
lcd->drawSolidVerticalLine(--right, y, BAR_HEIGHT, TEXT_COLOR);
lcd->drawSolidHorizontalLine(right - 3, y, 3, TEXT_COLOR);
lcd->drawSolidHorizontalLine(right - 3, y + BAR_HEIGHT - 1, 3, TEXT_COLOR);
lcd->drawSolidVerticalLine(--right, y, BAR_HEIGHT, DEFAULT_COLOR);
lcd->drawSolidHorizontalLine(right - 3, y, 3, DEFAULT_COLOR);
lcd->drawSolidHorizontalLine(right - 3, y + BAR_HEIGHT - 1, 3, DEFAULT_COLOR);
}
void drawSingleMixerBar(coord_t x, coord_t y, coord_t w, coord_t h, uint8_t channel)
@@ -79,16 +79,16 @@ void drawSingleMixerBar(coord_t x, coord_t y, coord_t w, coord_t h, uint8_t chan
lcdDrawSolidFilledRect(x, y, w, h, BARGRAPH_BGCOLOR);
if (chanVal > 0) {
lcdDrawSolidFilledRect(x + w / 2, y, divRoundClosest(chanVal * w, VIEW_CHANNELS_LIMIT_PCT * 2), h, BARGRAPH2_COLOR);
lcdDrawNumber(x - 10 + w / 2, y - 2, displayVal, SMLSIZE | TEXT_COLOR | RIGHT, 0, NULL, "%");
lcdDrawNumber(x - 10 + w / 2, y - 2, displayVal, SMLSIZE | DEFAULT_COLOR | RIGHT, 0, NULL, "%");
}
else if (chanVal < 0) {
const uint16_t endpoint = x + w / 2;
const uint16_t size = divRoundClosest(-chanVal * w, VIEW_CHANNELS_LIMIT_PCT * 2);
lcdDrawSolidFilledRect(endpoint - size, y, size, h, BARGRAPH2_COLOR);
lcdDrawNumber(x + 10 + w / 2, y - 2, displayVal, SMLSIZE | TEXT_COLOR, 0, NULL, "%");
lcdDrawNumber(x + 10 + w / 2, y - 2, displayVal, SMLSIZE | DEFAULT_COLOR, 0, NULL, "%");
}
lcd->drawSolidVerticalLine(x + w / 2, y, h, TEXT_COLOR);
lcd->drawSolidVerticalLine(x + w / 2, y, h, DEFAULT_COLOR);
}
void drawSingleOutputBar(coord_t x, coord_t y, coord_t w, coord_t h, uint8_t channel)
@@ -101,16 +101,16 @@ void drawSingleOutputBar(coord_t x, coord_t y, coord_t w, coord_t h, uint8_t cha
lcdDrawSolidFilledRect(x, y, w, h, BARGRAPH_BGCOLOR);
if (chanVal > 0) {
lcdDrawSolidFilledRect(x + w / 2, y, divRoundClosest(chanVal * w, VIEW_CHANNELS_LIMIT_PCT * 2), h, BARGRAPH1_COLOR);
lcdDrawNumber(x - 10 + w / 2, y - 2, displayVal, SMLSIZE | TEXT_COLOR | RIGHT, 0, NULL, "%");
lcdDrawNumber(x - 10 + w / 2, y - 2, displayVal, SMLSIZE | DEFAULT_COLOR | RIGHT, 0, NULL, "%");
}
else if (chanVal < 0) {
uint16_t endpoint = x + w / 2;
uint16_t size = divRoundClosest(-chanVal * w, VIEW_CHANNELS_LIMIT_PCT * 2);
lcdDrawSolidFilledRect(endpoint - size, y, size, h, BARGRAPH1_COLOR);
lcdDrawNumber(x + 10 + w / 2, y - 2, displayVal, SMLSIZE | TEXT_COLOR, 0, NULL, "%");
lcdDrawNumber(x + 10 + w / 2, y - 2, displayVal, SMLSIZE | DEFAULT_COLOR, 0, NULL, "%");
}
lcd->drawSolidVerticalLine(x + w / 2, y, h, TEXT_COLOR);
lcd->drawSolidVerticalLine(x + w / 2, y, h, DEFAULT_COLOR);
}
void drawComboOutputBar(coord_t x, coord_t y, coord_t w, coord_t h, uint8_t channel)
@@ -123,10 +123,10 @@ void drawComboOutputBar(coord_t x, coord_t y, coord_t w, coord_t h, uint8_t chan
uint16_t valPos;
strAppendSigned(&chanString[2], channel + 1, 2);
lcdDrawText(x, y, chanString, SMLSIZE | TEXT_COLOR | LEFT);
lcdDrawText(x, y, chanString, SMLSIZE | DEFAULT_COLOR | LEFT);
lcdDrawSizedText(x + 45, y, g_model.limitData[channel].name, sizeof(g_model.limitData[channel].name), SMLSIZE | TEXT_COLOR | LEFT | ZCHAR);
lcdDrawNumber(x + w, y, usValue, SMLSIZE | TEXT_COLOR | RIGHT, 0, NULL, STR_US);
lcdDrawSizedText(x + 45, y, g_model.limitData[channel].name, sizeof(g_model.limitData[channel].name), SMLSIZE | DEFAULT_COLOR | LEFT | ZCHAR);
lcdDrawNumber(x + w, y, usValue, SMLSIZE | DEFAULT_COLOR | RIGHT, 0, NULL, STR_US);
lcdDrawSolidFilledRect(x, y + Y_OUTBAR, w, h, BARGRAPH_BGCOLOR);
lcd->drawSolidVerticalLine(x + limPos, y + Y_OUTBAR, h, MAINVIEW_GRAPHICS_COLOR);
@@ -154,11 +154,11 @@ void drawComboOutputBar(coord_t x, coord_t y, coord_t w, coord_t h, uint8_t chan
if (safetyCh[channel] != OVERRIDE_CHANNEL_UNDEFINED)
lcd->drawBitmap(x - X_OFFSET + 7, y + 7, chanMonLockedBitmap);
#endif
lcd->drawSolidVerticalLine(x + w / 2, y + Y_OUTBAR, h, TEXT_COLOR);
lcd->drawSolidVerticalLine(x + w / 2, y + Y_OUTBAR, h, DEFAULT_COLOR);
if (chanVal > calcRESXto100((ld && ld->revert) ? -ld->offset : ld->offset))
lcdDrawNumber(x + limPos, y + h, chanVal, SMLSIZE | TEXT_COLOR | RIGHT, 0, NULL, "%");
lcdDrawNumber(x + limPos, y + h, chanVal, SMLSIZE | DEFAULT_COLOR | RIGHT, 0, NULL, "%");
else
lcdDrawNumber(x + limPos, y + h, chanVal, SMLSIZE | TEXT_COLOR, 0, NULL, "%");
lcdDrawNumber(x + limPos, y + h, chanVal, SMLSIZE | DEFAULT_COLOR, 0, NULL, "%");
}
coord_t drawChannelsMonitorLegend(coord_t x, const char * s, int color)
+1 -1
View File
@@ -25,7 +25,7 @@
class ViewMain: public Window {
public:
ViewMain(bool icons=true);
explicit ViewMain(bool icons = true);
~ViewMain() override;
+6 -6
View File
@@ -60,10 +60,10 @@ bool menuStatsGraph(event_t event)
const coord_t x = 10;
const coord_t y = 240;
lcdDrawHorizontalLine(x-3, y, MAXTRACE+3+3, SOLID, TEXT_COLOR);
lcdDrawVerticalLine(x, y-96, 96+3, SOLID, TEXT_COLOR);
lcdDrawHorizontalLine(x-3, y, MAXTRACE+3+3, SOLID, DEFAULT_COLOR);
lcdDrawVerticalLine(x, y-96, 96+3, SOLID, DEFAULT_COLOR);
for (coord_t i=0; i<MAXTRACE; i+=6) {
lcdDrawVerticalLine(x+i, y-1, 3, SOLID, TEXT_COLOR);
lcdDrawVerticalLine(x+i, y-1, 3, SOLID, DEFAULT_COLOR);
}
uint16_t traceRd = s_traceWr > MAXTRACE ? s_traceWr - MAXTRACE : 0;
@@ -74,17 +74,17 @@ bool menuStatsGraph(event_t event)
if (prev_yv != (coord_t)-1) {
if (prev_yv < yv) {
for (int y=prev_yv; y<=yv; y++) {
lcdDrawBitmapPattern(x + i - 3, y, LBM_POINT, TEXT_COLOR);
lcdDrawBitmapPattern(x + i - 3, y, LBM_POINT, DEFAULT_COLOR);
}
}
else {
for (int y=yv; y<=prev_yv; y++) {
lcdDrawBitmapPattern(x + i - 3, y, LBM_POINT, TEXT_COLOR);
lcdDrawBitmapPattern(x + i - 3, y, LBM_POINT, DEFAULT_COLOR);
}
}
}
else {
lcdDrawBitmapPattern(x + i - 3, yv, LBM_POINT, TEXT_COLOR);
lcdDrawBitmapPattern(x + i - 3, yv, LBM_POINT, DEFAULT_COLOR);
}
prev_yv = yv;
}
+2 -2
View File
@@ -59,11 +59,11 @@ void GaugeWidget::refresh()
int percent = divRoundClosest(100 * (value_in_range - min), (max - min));
// Gauge label
drawSource(zone.x, zone.y, index, SMLSIZE | TEXT_INVERTED_COLOR);
drawSource(zone.x, zone.y, index, SMLSIZE | FOCUS_COLOR);
// Gauge
lcdSetColor(color);
lcdDrawSolidFilledRect(zone.x, zone.y + 16, zone.w, 16, TEXT_INVERTED_COLOR);
lcdDrawSolidFilledRect(zone.x, zone.y + 16, zone.w, 16, FOCUS_COLOR);
lcdDrawNumber(zone.x+zone.w/2, zone.y + 17, percent, SMLSIZE | CUSTOM_COLOR | CENTERED, 0, NULL, "%");
lcd->invertRect(zone.x + w, zone.y + 16, zone.w - w, 16, CUSTOM_COLOR);
}
+4 -4
View File
@@ -59,13 +59,13 @@ class OutputsWidget: public Widget
lcdDrawSolidFilledRect((chanVal > 0 ? barMid : barMid - fillW), barTop, fillW, barH, MAINVIEW_GRAPHICS_COLOR);
lcd->drawSolidVerticalLine(barMid, barTop, barH, MAINVIEW_GRAPHICS_COLOR);
lcdDrawRect(x, rowTop, w, rowH + 1);
lcdDrawNumber(x + barW - 10, barTop, chanVal, SMLSIZE | TEXT_COLOR | RIGHT, 0, NULL, "%");
lcdDrawNumber(x + barW - 10, barTop, chanVal, SMLSIZE | DEFAULT_COLOR | RIGHT, 0, NULL, "%");
if (g_model.limitData[curChan - 1].name[0] != 0) {
lcdDrawNumber(barLft + 1, barTop, curChan, SMLSIZE | TEXT_COLOR | LEFT | LEADING0, 2);
lcdDrawSizedText(barLft + 23, barTop, g_model.limitData[curChan - 1].name, sizeof(g_model.limitData[curChan - 1].name), SMLSIZE | TEXT_COLOR | LEFT | ZCHAR);
lcdDrawNumber(barLft + 1, barTop, curChan, SMLSIZE | DEFAULT_COLOR | LEFT | LEADING0, 2);
lcdDrawSizedText(barLft + 23, barTop, g_model.limitData[curChan - 1].name, sizeof(g_model.limitData[curChan - 1].name), SMLSIZE | DEFAULT_COLOR | LEFT | ZCHAR);
}
else {
putsChn(barLft + 1, barTop, curChan, SMLSIZE | TEXT_COLOR | LEFT);
putsChn(barLft + 1, barTop, curChan, SMLSIZE | DEFAULT_COLOR | LEFT);
}
}
return lastChan - 1;
+9 -9
View File
@@ -61,37 +61,37 @@ void TimerWidget::refresh()
lcdDrawBitmapPattern(zone.x + 3, zone.y + 4, LBM_TIMER, MAINVIEW_GRAPHICS_COLOR);
}
if (abs(timerState.val) >= 3600) {
drawTimer(zone.x + 70, zone.y + 31, abs(timerState.val), TEXT_COLOR | MIDSIZE | LEFT | TIMEHOUR);
drawTimer(zone.x + 70, zone.y + 31, abs(timerState.val), DEFAULT_COLOR | MIDSIZE | LEFT | TIMEHOUR);
}
else {
drawTimer(zone.x + 76, zone.y + 31, abs(timerState.val), TEXT_COLOR | DBLSIZE | LEFT);
drawTimer(zone.x + 76, zone.y + 31, abs(timerState.val), DEFAULT_COLOR | DBLSIZE | LEFT);
}
if (ZLEN(timerData.name) > 0) {
lcdDrawSizedText(zone.x + 78, zone.y + 20, timerData.name, LEN_TIMER_NAME, ZCHAR | SMLSIZE | TEXT_COLOR);
lcdDrawSizedText(zone.x + 78, zone.y + 20, timerData.name, LEN_TIMER_NAME, ZCHAR | SMLSIZE | DEFAULT_COLOR);
}
else {
drawStringWithIndex(zone.x + 137, zone.y + 17, "TMR", index + 1, SMLSIZE | TEXT_COLOR);
drawStringWithIndex(zone.x + 137, zone.y + 17, "TMR", index + 1, SMLSIZE | DEFAULT_COLOR);
}
}
else {
if (timerState.val < 0 && timerState.val % 2) {
lcdDrawSolidFilledRect(zone.x, zone.y, zone.w, zone.h, HEADER_ICON_BGCOLOR);
}
drawStringWithIndex(zone.x + 2, zone.y, "TMR", index + 1, SMLSIZE | TEXT_INVERTED_COLOR);
drawStringWithIndex(zone.x + 2, zone.y, "TMR", index + 1, SMLSIZE | FOCUS_COLOR);
if (zone.w > 100 && zone.h > 40) {
if (abs(timerState.val) >= 3600) {
drawTimer(zone.x + 3, zone.y + 16, abs(timerState.val), TEXT_INVERTED_COLOR | LEFT | TIMEHOUR);
drawTimer(zone.x + 3, zone.y + 16, abs(timerState.val), FOCUS_COLOR | LEFT | TIMEHOUR);
}
else {
drawTimer(zone.x + 3, zone.y + 16, abs(timerState.val), TEXT_INVERTED_COLOR | LEFT | MIDSIZE);
drawTimer(zone.x + 3, zone.y + 16, abs(timerState.val), FOCUS_COLOR | LEFT | MIDSIZE);
}
}
else {
if (abs(timerState.val) >= 3600) {
drawTimer(zone.x + 3, zone.y + 14, abs(timerState.val), TEXT_INVERTED_COLOR | LEFT | SMLSIZE | TIMEHOUR);
drawTimer(zone.x + 3, zone.y + 14, abs(timerState.val), FOCUS_COLOR | LEFT | SMLSIZE | TIMEHOUR);
}
else {
drawTimer(zone.x + 3, zone.y + 14, abs(timerState.val), TEXT_INVERTED_COLOR | LEFT);
drawTimer(zone.x + 3, zone.y + 14, abs(timerState.val), FOCUS_COLOR | LEFT);
}
}
}
+4 -4
View File
@@ -1636,10 +1636,10 @@ const luaR_value_entry opentxConstants[] = {
{ "BOOL", ZoneOption::Bool },
{ "STRING", ZoneOption::String },
{ "CUSTOM_COLOR", CUSTOM_COLOR },
{ "TEXT_COLOR", TEXT_COLOR },
{ "DEFAULT_COLOR", DEFAULT_COLOR },
{ "TEXT_BGCOLOR", TEXT_BGCOLOR },
{ "TEXT_INVERTED_COLOR", TEXT_INVERTED_COLOR },
{ "TEXT_INVERTED_BGCOLOR", TEXT_INVERTED_BGCOLOR },
{ "FOCUS_COLOR", FOCUS_COLOR },
{ "FOCUS_BGCOLOR", FOCUS_BGCOLOR },
{ "LINE_COLOR", LINE_COLOR },
{ "SCROLLBOX_COLOR", SCROLLBOX_COLOR },
{ "MENU_TITLE_BGCOLOR", MENU_TITLE_BGCOLOR },
@@ -1649,7 +1649,7 @@ const luaR_value_entry opentxConstants[] = {
{ "WARNING_COLOR", WARNING_COLOR },
{ "TEXT_DISABLE_COLOR", TEXT_DISABLE_COLOR },
{ "HEADER_COLOR", HEADER_COLOR },
{ "CURVE_AXIS_COLOR", CURVE_AXIS_COLOR },
{ "DISABLE_COLOR", DISABLE_COLOR },
{ "CURVE_COLOR", CURVE_COLOR },
{ "CURVE_CURSOR_COLOR", CURVE_CURSOR_COLOR },
{ "TITLE_BGCOLOR", TITLE_BGCOLOR },
+4 -4
View File
@@ -777,10 +777,10 @@ Set a color for specific area
@param area (unsigned number) specific screen area in the list bellow
* `CUSTOM_COLOR`
* `TEXT_COLOR`
* `DEFAULT_COLOR`
* `TEXT_BGCOLOR`
* `TEXT_INVERTED_COLOR`
* `TEXT_INVERTED_BGCOLOR`
* `FOCUS_COLOR`
* `FOCUS_BGCOLOR`
* `LINE_COLOR`
* `SCROLLBOX_COLOR`
* `MENU_TITLE_BGCOLOR`
@@ -791,7 +791,7 @@ Set a color for specific area
* `WARNING_COLOR`
* `TEXT_DISABLE_COLOR`
* `HEADER_COLOR`
* `CURVE_AXIS_COLOR`
* `DISABLE_COLOR`
* `CURVE_CURSOR_COLOR`
* `TITLE_BGCOLOR`
* `TRIM_BGCOLOR`
+1 -1
View File
@@ -649,7 +649,7 @@ void checkSwitches()
unsigned int state = ((g_model.switchWarningState >> (3*i)) & 0x07);
if (state && state-1 != ((switches_states >> (i*2)) & 0x03)) {
if (++numWarnings < 6) {
// LcdFlags attr = ((states & mask) == (switches_states & mask)) ? TEXT_COLOR : ALARM_COLOR;
// LcdFlags attr = ((states & mask) == (switches_states & mask)) ? DEFAULT_COLOR : ALARM_COLOR;
// LcdFlags attr = ALARM_COLOR;
// drawSwitch(x, y, SWSRC_FIRST_SWITCH+i*3+state-1, attr);
x += 35;
@@ -2,7 +2,7 @@
#include "../../common/arm/stm32/bootloader/boot.h"
#include "../../common/arm/stm32/bootloader/bin_files.h"
#define SELECTED_COLOR (INVERS | TEXT_COLOR)
#define SELECTED_COLOR (INVERS | DEFAULT_COLOR)
const uint8_t __bmp_plug_usb_rle[] {
#include "bmp_plug_usb.lbm"
@@ -40,7 +40,7 @@ const uint8_t LBM_OK[] = {
void bootloaderInitScreen()
{
lcdColorTable[TEXT_COLOR_INDEX] = BLACK;
lcdColorTable[DEFAULT_COLOR_INDEX] = BLACK;
lcdColorTable[TEXT_BGCOLOR_INDEX] = WHITE;
lcdColorTable[LINE_COLOR_INDEX] = RED;
lcdColorTable[BARGRAPH1_COLOR_INDEX] = RED;
@@ -56,12 +56,12 @@ void bootloaderInitScreen()
static void bootloaderDrawTitle(unsigned int x, const char* text)
{
lcd->drawText(x, 28, text);
lcd->drawSolidFilledRect(28, 56, 422, 2, TEXT_COLOR);
lcd->drawSolidFilledRect(28, 56, 422, 2, DEFAULT_COLOR);
}
static void bootloaderDrawFooter()
{
lcd->drawSolidFilledRect(28, 234, 422, 2, TEXT_COLOR);
lcd->drawSolidFilledRect(28, 234, 422, 2, DEFAULT_COLOR);
}
void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
@@ -75,10 +75,10 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
if (st == ST_START) {
bootloaderDrawTitle(88, "HORUS BOOTLOADER");
lcd->drawBitmapPattern(90, 72, LBM_FLASH, TEXT_COLOR);
lcd->drawBitmapPattern(90, 72, LBM_FLASH, DEFAULT_COLOR);
lcd->drawText(124, 75, "Write Firmware");
lcd->drawBitmapPattern(90, 107, LBM_EXIT, TEXT_COLOR);
lcd->drawBitmapPattern(90, 107, LBM_EXIT, DEFAULT_COLOR);
lcd->drawText(124, 110, "Exit");
lcd->drawSolidRect(119, (opt == 0) ? 72 : 107, 270, 26, 2, LINE_COLOR);
@@ -100,7 +100,7 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
st == ST_FLASHING || st == ST_FLASH_DONE) {
bootloaderDrawTitle(126, "SD>FIRMWARE");
lcd->drawBitmapPattern(87, 16, LBM_SD, TEXT_COLOR);
lcd->drawBitmapPattern(87, 16, LBM_SD, DEFAULT_COLOR);
if (st == ST_FLASHING || st == ST_FLASH_DONE) {
@@ -151,7 +151,7 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
if ( st != ST_DIR_CHECK && (st != ST_FLASH_CHECK || opt == FC_OK)) {
lcd->drawBitmapPattern(28, 242, LBM_FLASH, TEXT_COLOR);
lcd->drawBitmapPattern(28, 242, LBM_FLASH, DEFAULT_COLOR);
if (st == ST_FILE_LIST) {
lcd->drawText(56, 244, "[ENT] to select file");
@@ -168,7 +168,7 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
}
if (st != ST_FLASHING) {
lcd->drawBitmapPattern(305, 242, LBM_EXIT, TEXT_COLOR);
lcd->drawBitmapPattern(305, 242, LBM_EXIT, DEFAULT_COLOR);
lcd->drawText(335, 244, "[RTN] to exit");
}
}
@@ -176,7 +176,7 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
void bootloaderDrawFilename(const char* str, uint8_t line, bool selected)
{
lcd->drawBitmapPattern(94, 76 + (line * 25), LBM_FILE, TEXT_COLOR);
lcd->drawBitmapPattern(94, 76 + (line * 25), LBM_FILE, DEFAULT_COLOR);
lcd->drawText(124, 75 + (line * 25), str);
if (selected) {
+4 -4
View File
@@ -91,10 +91,10 @@ constexpr uint32_t ALERT_ACTION_TOP = 240;
// TODO common code, not in target
enum LcdColorIndex
{
TEXT_COLOR_INDEX,
DEFAULT_COLOR_INDEX,
TEXT_BGCOLOR_INDEX,
TEXT_INVERTED_COLOR_INDEX,
TEXT_INVERTED_BGCOLOR_INDEX,
FOCUS_COLOR_INDEX,
FOCUS_BGCOLOR_INDEX,
TEXT_STATUSBAR_COLOR_INDEX,
LINE_COLOR_INDEX,
SCROLLBOX_COLOR_INDEX,
@@ -105,7 +105,7 @@ enum LcdColorIndex
ALARM_COLOR_INDEX,
WARNING_COLOR_INDEX,
TEXT_DISABLE_COLOR_INDEX,
CURVE_AXIS_COLOR_INDEX,
DISABLE_COLOR_INDEX,
CURVE_COLOR_INDEX,
CURVE_CURSOR_COLOR_INDEX,
HEADER_BGCOLOR_INDEX,
+10 -10
View File
@@ -2,7 +2,7 @@
#include "../../common/arm/stm32/bootloader/boot.h"
#include "../../common/arm/stm32/bootloader/bin_files.h"
#define SELECTED_COLOR (INVERS | TEXT_COLOR)
#define SELECTED_COLOR (INVERS | DEFAULT_COLOR)
#include "bmp_plug_usb.lbm"
#include "bmp_usb_plugged.lbm"
@@ -33,7 +33,7 @@ const uint8_t LBM_OK[] = {
void bootloaderInitScreen()
{
lcdColorTable[TEXT_COLOR_INDEX] = BLACK;
lcdColorTable[DEFAULT_COLOR_INDEX] = BLACK;
lcdColorTable[TEXT_BGCOLOR_INDEX] = WHITE;
lcdColorTable[LINE_COLOR_INDEX] = RED;
lcdColorTable[BARGRAPH1_COLOR_INDEX] = RED;
@@ -45,12 +45,12 @@ void bootloaderInitScreen()
static void bootloaderDrawTitle(unsigned int x, const char* text)
{
lcdDrawText(x, 28, text);
lcdDrawSolidFilledRect(28, 56, 422, 2, TEXT_COLOR);
lcdDrawSolidFilledRect(28, 56, 422, 2, DEFAULT_COLOR);
}
static void bootloaderDrawFooter()
{
lcdDrawSolidFilledRect(28, 234, 422, 2, TEXT_COLOR);
lcdDrawSolidFilledRect(28, 234, 422, 2, DEFAULT_COLOR);
}
void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
@@ -62,10 +62,10 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
bootloaderDrawTitle(88, "HORUS BOOTLOADER");
lcdDrawBitmapPattern(90, 72, LBM_FLASH, TEXT_COLOR);
lcdDrawBitmapPattern(90, 72, LBM_FLASH, DEFAULT_COLOR);
lcdDrawText(124, 75, "Write Firmware");
lcdDrawBitmapPattern(90, 107, LBM_EXIT, TEXT_COLOR);
lcdDrawBitmapPattern(90, 107, LBM_EXIT, DEFAULT_COLOR);
lcdDrawText(124, 110, "Exit");
lcdDrawSolidRect(119, (opt == 0) ? 72 : 107, 270, 26, 2, LINE_COLOR);
@@ -87,7 +87,7 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
st == ST_FLASHING || st == ST_FLASH_DONE) {
bootloaderDrawTitle(126, "SD>FIRMWARE");
lcdDrawBitmapPattern(87, 16, LBM_SD, TEXT_COLOR);
lcdDrawBitmapPattern(87, 16, LBM_SD, DEFAULT_COLOR);
if (st == ST_FLASHING || st == ST_FLASH_DONE) {
@@ -138,7 +138,7 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
if ( st != ST_DIR_CHECK && (st != ST_FLASH_CHECK || opt == FC_OK)) {
lcdDrawBitmapPattern(28, 242, LBM_FLASH, TEXT_COLOR);
lcdDrawBitmapPattern(28, 242, LBM_FLASH, DEFAULT_COLOR);
if (st == ST_FILE_LIST) {
lcdDrawText(56, 244, "[ENT] to select file");
@@ -155,7 +155,7 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
}
if (st != ST_FLASHING) {
lcdDrawBitmapPattern(305, 242, LBM_EXIT, TEXT_COLOR);
lcdDrawBitmapPattern(305, 242, LBM_EXIT, DEFAULT_COLOR);
lcdDrawText(335, 244, "[RTN] to exit");
}
}
@@ -163,7 +163,7 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
void bootloaderDrawFilename(const char* str, uint8_t line, bool selected)
{
lcdDrawBitmapPattern(94, 76 + (line * 25), LBM_FILE, TEXT_COLOR);
lcdDrawBitmapPattern(94, 76 + (line * 25), LBM_FILE, DEFAULT_COLOR);
lcdDrawText(124, 75 + (line * 25), str);
if (selected) {
+4 -4
View File
@@ -89,10 +89,10 @@ constexpr uint32_t ALERT_BUTTON_TOP = 300;
enum LcdColorIndex
{
TEXT_COLOR_INDEX,
DEFAULT_COLOR_INDEX,
TEXT_BGCOLOR_INDEX,
TEXT_INVERTED_COLOR_INDEX,
TEXT_INVERTED_BGCOLOR_INDEX,
FOCUS_COLOR_INDEX,
FOCUS_BGCOLOR_INDEX,
TEXT_STATUSBAR_COLOR_INDEX,
LINE_COLOR_INDEX,
SCROLLBOX_COLOR_INDEX,
@@ -103,7 +103,7 @@ enum LcdColorIndex
ALARM_COLOR_INDEX,
WARNING_COLOR_INDEX,
TEXT_DISABLE_COLOR_INDEX,
CURVE_AXIS_COLOR_INDEX,
DISABLE_COLOR_INDEX,
CURVE_COLOR_INDEX,
CURVE_CURSOR_COLOR_INDEX,
HEADER_BGCOLOR_INDEX,
+20 -20
View File
@@ -85,7 +85,7 @@ TEST(Lcd_colorlcd, vline)
loadFonts();
lcd->clear(TEXT_BGCOLOR);
for (int x=0; x<100; x+=2) {
lcdDrawSolidVerticalLine(x, x/2, 12, TEXT_COLOR);
lcdDrawSolidVerticalLine(x, x/2, 12, DEFAULT_COLOR);
}
EXPECT_TRUE(checkScreenshot_colorlcd("vline"));
}
@@ -94,11 +94,11 @@ TEST(Lcd_colorlcd, primitives)
{
loadFonts();
lcd->clear(TEXT_BGCOLOR);
lcdDrawText(8, 8, "The quick brown fox jumps over the lazy dog", CURVE_AXIS_COLOR);
lcdDrawText(5, 5, "The quick brown fox jumps over the lazy dog", TEXT_COLOR);
lcdDrawText(8, 8, "The quick brown fox jumps over the lazy dog", DISABLE_COLOR);
lcdDrawText(5, 5, "The quick brown fox jumps over the lazy dog", DEFAULT_COLOR);
lcdDrawFilledRect(10, 30, 30, 30, SOLID, TITLE_BGCOLOR);
lcdDrawFilledRect(50, 30, 30, 30, DOTTED, TEXT_COLOR);
lcdDrawFilledRect(50, 30, 30, 30, DOTTED, DEFAULT_COLOR);
lcdDrawFilledRect(90, 30, 30, 30, SOLID, ROUND|TITLE_BGCOLOR);
lcdDrawRect(130, 30, 30, 30, 1, SOLID, TITLE_BGCOLOR);
lcdDrawRect(170, 30, 30, 30, 2, SOLID, TITLE_BGCOLOR);
@@ -109,10 +109,10 @@ TEST(Lcd_colorlcd, primitives)
lcdDrawVerticalLine(20, 70, 80, SOLID, TITLE_BGCOLOR);
lcdDrawVerticalLine(25, 70, 70, SOLID, TITLE_BGCOLOR);
lcdDrawHorizontalLine(30, 70, 100, SOLID, TEXT_COLOR);
lcdDrawHorizontalLine(30, 75, 90, SOLID, TEXT_COLOR);
lcdDrawHorizontalLine(30, 80, 80, SOLID, TEXT_COLOR);
lcdDrawHorizontalLine(30, 85, 70, SOLID, TEXT_COLOR);
lcdDrawHorizontalLine(30, 70, 100, SOLID, DEFAULT_COLOR);
lcdDrawHorizontalLine(30, 75, 90, SOLID, DEFAULT_COLOR);
lcdDrawHorizontalLine(30, 80, 80, SOLID, DEFAULT_COLOR);
lcdDrawHorizontalLine(30, 85, 70, SOLID, DEFAULT_COLOR);
EXPECT_TRUE(checkScreenshot_colorlcd("primitives"));
@@ -122,11 +122,11 @@ TEST(Lcd_colorlcd, transparency)
{
loadFonts();
lcd->clear(TEXT_BGCOLOR);
lcdDrawText(8, 8, "The quick brown fox jumps over the lazy dog", TEXT_COLOR|OPACITY(4));
lcdDrawText(5, 5, "The quick brown fox jumps over the lazy dog", TEXT_COLOR|OPACITY(12));
lcdDrawText(8, 8, "The quick brown fox jumps over the lazy dog", DEFAULT_COLOR|OPACITY(4));
lcdDrawText(5, 5, "The quick brown fox jumps over the lazy dog", DEFAULT_COLOR|OPACITY(12));
lcdDrawFilledRect(10, 30, 30, 30, SOLID, TITLE_BGCOLOR|OPACITY(8));
lcdDrawFilledRect(50, 30, 30, 30, DOTTED, TEXT_COLOR|OPACITY(10));
lcdDrawFilledRect(50, 30, 30, 30, DOTTED, DEFAULT_COLOR|OPACITY(10));
lcdDrawFilledRect(90, 30, 30, 30, SOLID, ROUND|TITLE_BGCOLOR|OPACITY(12));
lcdDrawRect(130, 30, 30, 30, 1, SOLID, TITLE_BGCOLOR|OPACITY(8));
lcdDrawRect(170, 30, 30, 30, 2, SOLID, TITLE_BGCOLOR|OPACITY(8));
@@ -137,10 +137,10 @@ TEST(Lcd_colorlcd, transparency)
lcdDrawVerticalLine(20, 70, 80, SOLID, TITLE_BGCOLOR|OPACITY(10));
lcdDrawVerticalLine(25, 70, 70, SOLID, TITLE_BGCOLOR|OPACITY(OPACITY_MAX));
lcdDrawHorizontalLine(30, 70, 100, SOLID, TEXT_COLOR|OPACITY(2));
lcdDrawHorizontalLine(30, 75, 90, SOLID, TEXT_COLOR|OPACITY(6));
lcdDrawHorizontalLine(30, 80, 80, SOLID, TEXT_COLOR|OPACITY(10));
lcdDrawHorizontalLine(30, 85, 70, SOLID, TEXT_COLOR|OPACITY(OPACITY_MAX));
lcdDrawHorizontalLine(30, 70, 100, SOLID, DEFAULT_COLOR|OPACITY(2));
lcdDrawHorizontalLine(30, 75, 90, SOLID, DEFAULT_COLOR|OPACITY(6));
lcdDrawHorizontalLine(30, 80, 80, SOLID, DEFAULT_COLOR|OPACITY(10));
lcdDrawHorizontalLine(30, 85, 70, SOLID, DEFAULT_COLOR|OPACITY(OPACITY_MAX));
for(int n=0; n<10; n++) {
@@ -160,12 +160,12 @@ TEST(Lcd_colorlcd, fonts)
loadFonts();
lcd->clear(TEXT_BGCOLOR);
lcdDrawText(8, 8, "The quick brown fox jumps over the lazy dog", TEXT_COLOR|OPACITY(4));
lcdDrawText(5, 5, "The quick brown fox jumps over the lazy dog", TEXT_COLOR|OPACITY(12));
lcdDrawText(8, 8, "The quick brown fox jumps over the lazy dog", DEFAULT_COLOR|OPACITY(4));
lcdDrawText(5, 5, "The quick brown fox jumps over the lazy dog", DEFAULT_COLOR|OPACITY(12));
lcdDrawText(10, 200, "The quick", TEXT_COLOR|VERTICAL);
lcdDrawText(30, 200, "The quick brown fox", TEXT_COLOR|VERTICAL);
// lcdDrawText(50, 200, "The quick brown fox jumps over the lazy dog", TEXT_COLOR|VERTICAL);
lcdDrawText(10, 200, "The quick", DEFAULT_COLOR|VERTICAL);
lcdDrawText(30, 200, "The quick brown fox", DEFAULT_COLOR|VERTICAL);
// lcdDrawText(50, 200, "The quick brown fox jumps over the lazy dog", DEFAULT_COLOR|VERTICAL);
lcdDrawText(8, 208, "The quick brown fox jumps over the lazy dog", TITLE_BGCOLOR|OPACITY(4));
lcdDrawText(5, 205, "The quick brown fox jumps over the lazy dog", TITLE_BGCOLOR|OPACITY(12));