piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

New UI merged

Browse Source
This commit is contained in:
Bertrand Songis
2019-08-28 20:50:14 +02:00
parent 1f41076b0e
commit f4f8893ae9
806 changed files with 30836 additions and 11704 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/128x64/lcd.cpp
+5 -5
View File
@@ -557,10 +557,10 @@ void lcdDrawVerticalLine(coord_t x, coord_t y, coord_t h, uint8_t pat, LcdFlags
y = (y & 0x07);
if (y) {
ASSERT_IN_DISPLAY(p);
uint8_t msk = ~(BITMASK(y)-1);
uint8_t msk = ~(bfBitmask<uint8_t>(y));
h -= 8-y;
if (h < 0)
msk -= ~(BITMASK(8+h)-1);
msk -= ~(bfBitmask<uint8_t>(8 + h));
lcdMaskPoint(p, msk & pat, att);
p += LCD_W;
}
@@ -572,7 +572,7 @@ void lcdDrawVerticalLine(coord_t x, coord_t y, coord_t h, uint8_t pat, LcdFlags
}
if (h > 0) {
ASSERT_IN_DISPLAY(p);
lcdMaskPoint(p, (BITMASK(h)-1) & pat, att);
lcdMaskPoint(p, (bfBitmask<uint8_t>(h)) & pat, att);
}
}
@@ -953,7 +953,7 @@ void lcdDrawPoint(coord_t x, coord_t y, LcdFlags att)
{
uint8_t * p = &displayBuf[ y / 8 * LCD_W + x ];
if (p < DISPLAY_END) {
lcdMaskPoint(p, BITMASK(y % 8), att);
lcdMaskPoint(p, bfBit<uint8_t>(y % 8), att);
}
}
@@ -975,7 +975,7 @@ void lcdDrawHorizontalLine(coord_t x, coord_t y, coord_t w, uint8_t pat, LcdFlag
if (x+w > LCD_W) { w = LCD_W - x; }
uint8_t *p = &displayBuf[ y / 8 * LCD_W + x ];
uint8_t msk = BITMASK(y%8);
uint8_t msk = bfBit<uint8_t>(y % 8);
while (w--) {
if(pat&1) {
lcdMaskPoint(p, msk, att);