ScStw/ESP32-HUB75-MatrixPanel-DMA
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #638 from board707/virtual_16px_high

Browse source 
Fix incorrect getCoords() for 16px_high panels, as mentioned in issue #635
This commit is contained in:
mrcodetastic 2024-07-04 01:32:57 +01:00 committed by GitHub
commit 89dc02998f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/ESP32-VirtualMatrixPanel-I2S-DMA.h
View file

@ -389,7 +389,7 @@ inline VirtualCoords VirtualMatrixPanel::getCoords(int16_t virt_x, int16_t virt_
as if the panel is 2 * W and 0.5 * H ! as if the panel is 2 * W and 0.5 * H !
*/ */
if ((virt_y & 8) == 0) if ((coords.y & 8) == 0)
{ {
coords.x += ((coords.x / panelResX) + 1) * panelResX; // 1st, 3rd 'block' of 8 rows of pixels, offset by panel width in DMA buffer coords.x += ((coords.x / panelResX) + 1) * panelResX; // 1st, 3rd 'block' of 8 rows of pixels, offset by panel width in DMA buffer
} }
@ -405,22 +405,15 @@ inline VirtualCoords VirtualMatrixPanel::getCoords(int16_t virt_x, int16_t virt_
} }
else if (panel_scan_rate == FOUR_SCAN_16PX_HIGH) else if (panel_scan_rate == FOUR_SCAN_16PX_HIGH)
{ {
if ((virt_y & 8) == 0) if ((coords.y & 4) == 0)
{ {
coords.x += (panelResX >> 2) * (((coords.x & 0xFFF0) >> 4) + 1); // 1st, 3rd 'block' of 8 rows of pixels, offset by panel width in DMA buffer coords.x += ((coords.x / panelResX) + 1) * panelResX; // 1st, 3rd 'block' of 8 rows of pixels, offset by panel width in DMA buffer
} }
else else
{ {
coords.x += (panelResX >> 2) * (((coords.x & 0xFFF0) >> 4)); // 2nd, 4th 'block' of 8 rows of pixels, offset by panel width in DMA buffer coords.x += (coords.x / panelResX) * panelResX; // 2nd, 4th 'block' of 8 rows of pixels, offset by panel width in DMA buffer
}
if (virt_y < 32)
coords.y = (virt_y >> 4) * 8 + (virt_y & 0b00000111);
else
{
coords.y = ((virt_y - 32) >> 4) * 8 + (virt_y & 0b00000111);
coords.x += 256;
} }
coords.y = (coords.y >> 3) * 4 + (coords.y & 0b00000011);
} }
return coords; return coords;