projects/esp-weather-station
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update GfxUi.cpp

Browse Source 
The display of the bmp images was not working (nothing displayed, everything else working ok). The pixels were being calculated and written OK. I guess the "setAddrWindow" is not working as expected. I changed to use the "writePixel" instruction instead.
This commit is contained in:
david-robson
2017-03-27 00:47:42 +02:00
committed by GitHub
parent 348172d72c
commit ac8c3dd313
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
GfxUi.cpp
View File

@@ -145,8 +145,8 @@ void GfxUi::drawBmp(String filename, uint8_t x, uint16_t y) {
if((x+w-1) >= _tft->width()) w = _tft->width() - x; if((x+w-1) >= _tft->width()) w = _tft->width() - x;
if((y+h-1) >= _tft->height()) h = _tft->height() - y; if((y+h-1) >= _tft->height()) h = _tft->height() - y;
// Set TFT address window to clipped image bounds // Open write access to the tft
_tft->setAddrWindow(x, y, x+w-1, y+h-1); _tft->startWrite();
for (row=0; row<h; row++) { // For each scanline... for (row=0; row<h; row++) { // For each scanline...
@@ -166,6 +166,7 @@ void GfxUi::drawBmp(String filename, uint8_t x, uint16_t y) {
} }
for (col=0; col<w; col++) { // For each pixel... for (col=0; col<w; col++) { // For each pixel...
// Time to read more pixel data? // Time to read more pixel data?
if (buffidx >= sizeof(sdbuffer)) { // Indeed if (buffidx >= sizeof(sdbuffer)) { // Indeed
bmpFile.read(sdbuffer, sizeof(sdbuffer)); bmpFile.read(sdbuffer, sizeof(sdbuffer));
@@ -176,10 +177,15 @@ void GfxUi::drawBmp(String filename, uint8_t x, uint16_t y) {
b = sdbuffer[buffidx++]; b = sdbuffer[buffidx++];
g = sdbuffer[buffidx++]; g = sdbuffer[buffidx++];
r = sdbuffer[buffidx++]; r = sdbuffer[buffidx++];
_tft->pushColor(_tft->color565(r,g,b));
_tft->writePixel(x+col,y+row,_tft->color565(r,g,b));
yield(); yield();
} // end pixel } // end pixel
} // end scanline } // end scanline
_tft->endWrite();
Serial.print(F("Loaded in ")); Serial.print(F("Loaded in "));
Serial.print(millis() - startTime); Serial.print(millis() - startTime);
Serial.println(" ms"); Serial.println(" ms");
@@ -210,4 +216,3 @@ uint32_t GfxUi::read32(File &f) {
((uint8_t *)&result)[3] = f.read(); // MSB ((uint8_t *)&result)[3] = f.read(); // MSB
return result; return result;
} }