1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-27 07:21:18 +01:00

Merge pull request #21518 from camoz/lcdfill-fix

tests/drivers/{st77xx,ili9341}: fix coordinates in lcd_fill()
This commit is contained in:
crasbe 2025-06-10 21:33:09 +00:00 committed by GitHub
commit 168799cc78
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 10 deletions

View File

@ -53,22 +53,24 @@ int main(void)
}
puts("lcd TFT display filling map");
lcd_fill(&dev, 0, dev.params->lines, 0, dev.params->rgb_channels, 0x0000);
lcd_fill(&dev, 0, dev.params->lines - 1, 0, dev.params->rgb_channels - 1,
0x0000);
puts("lcd TFT display map filled");
/* Fill square with blue */
puts("Drawing blue rectangle");
lcd_fill(&dev, 0, dev.params->lines / 3, 0, dev.params->rgb_channels, 0x001F);
lcd_fill(&dev, 0, dev.params->lines / 3, 0, dev.params->rgb_channels - 1,
0x001F);
ztimer_sleep(ZTIMER_MSEC, 1 * MS_PER_SEC);
puts("Drawing green rectangle");
lcd_fill(&dev, dev.params->lines / 3, 2 * (dev.params->lines / 3), 0,
dev.params->rgb_channels, 0x07E0);
dev.params->rgb_channels - 1, 0x07E0);
ztimer_sleep(ZTIMER_MSEC, 1 * MS_PER_SEC);
puts("Drawing red rectangle");
lcd_fill(&dev, 2 * (dev.params->lines / 3), dev.params->lines, 0,
dev.params->rgb_channels, 0xf800);
dev.params->rgb_channels - 1, 0xf800);
ztimer_sleep(ZTIMER_MSEC, 1 * MS_PER_SEC);
lcd_invert_on(&dev);
@ -78,7 +80,8 @@ int main(void)
puts("lcd TFT display normal");
puts("lcd TFT display clear screen");
lcd_fill(&dev, 0, dev.params->lines, 0, dev.params->rgb_channels, 0x0000);
lcd_fill(&dev, 0, dev.params->lines - 1, 0, dev.params->rgb_channels - 1,
0x0000);
#ifndef CONFIG_NO_RIOT_IMAGE
/* Approximate middle of the display */
uint8_t x1 = (dev.params->lines / 2) - (RIOT_LOGO_WIDTH / 2);

View File

@ -69,22 +69,24 @@ int main(void)
#endif
puts("lcd TFT display filling map");
lcd_fill(&dev, 0, dev.params->lines, 0, dev.params->rgb_channels, 0x0000);
lcd_fill(&dev, 0, dev.params->lines - 1, 0, dev.params->rgb_channels - 1,
0x0000);
puts("lcd TFT display map filled");
/* Fill square with blue */
puts("Drawing blue rectangle");
lcd_fill(&dev, 0, dev.params->lines / 3, 0, dev.params->rgb_channels, 0x001F);
lcd_fill(&dev, 0, dev.params->lines / 3, 0, dev.params->rgb_channels - 1,
0x001F);
ztimer_sleep(ZTIMER_MSEC, 1 * MS_PER_SEC);
puts("Drawing green rectangle");
lcd_fill(&dev, dev.params->lines / 3, 2 * (dev.params->lines / 3), 0,
dev.params->rgb_channels, 0x07E0);
dev.params->rgb_channels - 1, 0x07E0);
ztimer_sleep(ZTIMER_MSEC, 1 * MS_PER_SEC);
puts("Drawing red rectangle");
lcd_fill(&dev, 2 * (dev.params->lines / 3), dev.params->lines, 0,
dev.params->rgb_channels, 0xf800);
dev.params->rgb_channels - 1, 0xf800);
ztimer_sleep(ZTIMER_MSEC, 1 * MS_PER_SEC);
lcd_invert_on(&dev);
@ -95,7 +97,10 @@ int main(void)
puts("lcd TFT display clear screen with benchmarking");
BENCHMARK_FUNC("fill", 1,
lcd_fill(&dev, 0, dev.params->lines, 0, dev.params->rgb_channels, 0x0000));
lcd_fill(&dev,
0, dev.params->lines - 1,
0, dev.params->rgb_channels - 1,
0x0000));
#ifndef CONFIG_NO_RIOT_IMAGE
printf("Write pixmap of size %u x %u with benchmarking\n",