me/IronOS
1
0
Fork 1
mirror of https://github.com/Ralim/IronOS.git synced 2025-02-26 07:53:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix oled normal draw for variable height

Browse Source
This commit is contained in:
Ben V. Brown
2024-03-21 20:02:02 +11:00
parent fe534c9845
commit 5f48b53d03
1 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
source/Core/Drivers/OLED.cpp
View File

@@ -639,39 +639,33 @@ void OLED::drawSymbol(uint8_t symbolID) {
} }
// Draw an area, but y must be aligned on 0/8 offset // Draw an area, but y must be aligned on 0/8 offset
void OLED::drawArea(int16_t x, int8_t y, uint8_t wide, uint8_t height, const uint8_t *ptr) { void OLED::drawArea(int16_t x, int8_t y, uint8_t width, uint8_t height, const uint8_t *ptr) {
// Splat this from x->x+wide in two strides // Splat this from x->x+width in two strides
if (x <= -wide) { if (x <= -width) {
return; // cutoffleft return; // cutoffleft
} }
if (x > 96) { if (x > OLED_WIDTH) {
return; // cutoff right return; // cutoff right
} }
uint8_t visibleStart = 0; uint8_t visibleStart = 0;
uint8_t visibleEnd = wide; uint8_t visibleEnd = width;
// trimming to draw partials // trimming to draw partials
if (x < 0) { if (x < 0) {
visibleStart -= x; // subtract negative value == add absolute value visibleStart -= x; // subtract negative value == add absolute value
} }
if (x + wide > 96) { if (x + width > OLED_WIDTH) {
visibleEnd = 96 - x; visibleEnd = OLED_WIDTH - x;
} }
uint8_t rowsDrawn = 0;
if (y == 0) { while (height > 0) {
// Splat first line of data
for (uint8_t xx = visibleStart; xx < visibleEnd; xx++) { for (uint8_t xx = visibleStart; xx < visibleEnd; xx++) {
stripPointers[0][xx + x] = ptr[xx]; stripPointers[(y / 8) + rowsDrawn][x + xx] = ptr[xx + (rowsDrawn * width)];
} }
height -= 8;
rowsDrawn++;
} }
if (y == 8 || height >= 16) {
// Splat the second line
for (uint8_t xx = visibleStart; xx < visibleEnd; xx++) {
stripPointers[1][x + xx] = ptr[xx + (height == 16 ? wide : 0)];
}
}
// TODO NEEDS HEIGHT HANDLERS for 24/32
} }
// Draw an area, but y must be aligned on 0/8 offset // Draw an area, but y must be aligned on 0/8 offset