From 2b1c3b2889811bf62fa2ddae9be41cf18fa99027 Mon Sep 17 00:00:00 2001 From: Mike C Date: Sat, 6 Apr 2013 18:44:34 -0400 Subject: [PATCH] Working LCD print of splash.bmp --- Universal_Serial_Adapter/UILCD.h | 5 - .../Universal_Serial_Adapter.ino | 165 +++++++++++++++++- 2 files changed, 160 insertions(+), 10 deletions(-) diff --git a/Universal_Serial_Adapter/UILCD.h b/Universal_Serial_Adapter/UILCD.h index 5ecd84e..ce82aa9 100644 --- a/Universal_Serial_Adapter/UILCD.h +++ b/Universal_Serial_Adapter/UILCD.h @@ -7,8 +7,3 @@ use this code however you'd like, just keep this license and attribute. */ - -// Standard colors -#define BACKGROUND BLACK -#define TEXT GRAY -#define HILIGHT GOLD diff --git a/Universal_Serial_Adapter/Universal_Serial_Adapter.ino b/Universal_Serial_Adapter/Universal_Serial_Adapter.ino index 6ee71c3..0790479 100644 --- a/Universal_Serial_Adapter/Universal_Serial_Adapter.ino +++ b/Universal_Serial_Adapter/Universal_Serial_Adapter.ino @@ -12,10 +12,17 @@ #include "UIButton.h" #include "UIJoystickPSP.h" +#include +#include +#include +#include + UIButton* okButton; UIButton* cancelButton; UIJoystickPSP* pspJoystick; +Adafruit_ST7735 tft = Adafruit_ST7735(LCD_CS, LCD_DC, LCD_RST); + // Defaults void setDefaults() { //FIXME: Re-enable once new LCD is online @@ -34,12 +41,160 @@ void setup() { okButton = new UIButton(okButtonPin, okButtonLed); cancelButton = new UIButton(cancelButtonPin, cancelButtonLed); pspJoystick = new UIJoystickPSP(pspXPin, pspYPin); + + tft.initR(INITR_BLACKTAB); + + if (!SD.begin(SD_CS)) { + Serial.println("SD.begin(SD_CS) -- failed!"); + } + Serial.println("OK!"); + + tft.fillScreen(ST7735_WHITE); + + tft.setRotation(3); + + Serial.println("bmpDraw(splash.bmp)"); + bmpDraw("splash.bmp", 13, 0); + Serial.println("end bmpDraw"); } void loop() { - int direction = pspJoystick->direction(); - if (direction != joyNone) { - Serial.print("Joystick Direction: "); - Serial.println(direction); - } } + +#define BUFFPIXEL 20 + +void bmpDraw(char *filename, uint8_t x, uint8_t y) { + + File bmpFile; + int bmpWidth, bmpHeight; // W+H in pixels + uint8_t bmpDepth; // Bit depth (currently must be 24) + uint32_t bmpImageoffset; // Start of image data in file + uint32_t rowSize; // Not always = bmpWidth; may have padding + uint8_t sdbuffer[3*BUFFPIXEL]; // pixel buffer (R+G+B per pixel) + uint8_t buffidx = sizeof(sdbuffer); // Current position in sdbuffer + boolean goodBmp = false; // Set to true on valid header parse + boolean flip = true; // BMP is stored bottom-to-top + int w, h, row, col; + uint8_t r, g, b; + uint32_t pos = 0, startTime = millis(); + + if((x >= tft.width()) || (y >= tft.height())) return; + + Serial.println(); + Serial.print("Loading image '"); + Serial.print(filename); + Serial.println('\''); + + // Open requested file on SD card + if ((bmpFile = SD.open(filename)) == NULL) { + Serial.print("File not found"); + return; + } + + // Parse BMP header + if(read16(bmpFile) == 0x4D42) { // BMP signature + Serial.print("File size: "); + Serial.println(read32(bmpFile)); + (void)read32(bmpFile); // Read & ignore creator bytes + bmpImageoffset = read32(bmpFile); // Start of image data + Serial.print("Image Offset: "); + Serial.println(bmpImageoffset, DEC); + // Read DIB header + Serial.print("Header size: "); + Serial.println(read32(bmpFile)); + bmpWidth = read32(bmpFile); + bmpHeight = read32(bmpFile); + if(read16(bmpFile) == 1) { // # planes -- must be '1' + bmpDepth = read16(bmpFile); // bits per pixel + Serial.print("Bit Depth: "); + Serial.println(bmpDepth); + if((bmpDepth == 24) && (read32(bmpFile) == 0)) { // 0 = uncompressed + + goodBmp = true; // Supported BMP format -- proceed! + Serial.print("Image size: "); + Serial.print(bmpWidth); + Serial.print('x'); + Serial.println(bmpHeight); + + // BMP rows are padded (if needed) to 4-byte boundary + rowSize = (bmpWidth * 3 + 3) & ~3; + + // If bmpHeight is negative, image is in top-down order. + // This is not canon but has been observed in the wild. + if(bmpHeight < 0) { + bmpHeight = -bmpHeight; + flip = false; + } + + // Crop area to be loaded + w = bmpWidth; + h = bmpHeight; + if((x+w-1) >= tft.width()) w = tft.width() - x; + if((y+h-1) >= tft.height()) h = tft.height() - y; + + // Set TFT address window to clipped image bounds + tft.setAddrWindow(x, y, x+w-1, y+h-1); + + for (row=0; row= sizeof(sdbuffer)) { // Indeed + bmpFile.read(sdbuffer, sizeof(sdbuffer)); + buffidx = 0; // Set index to beginning + } + + // Convert pixel from BMP to TFT format, push to display + b = sdbuffer[buffidx++]; + g = sdbuffer[buffidx++]; + r = sdbuffer[buffidx++]; + tft.pushColor(tft.Color565(r,g,b)); + } // end pixel + } // end scanline + Serial.print("Loaded in "); + Serial.print(millis() - startTime); + Serial.println(" ms"); + } // end goodBmp + } + } + + bmpFile.close(); + if(!goodBmp) Serial.println("BMP format not recognized."); +} + +// These read 16- and 32-bit types from the SD card file. +// BMP data is stored little-endian, Arduino is little-endian too. +// May need to reverse subscript order if porting elsewhere. + +uint16_t read16(File f) { + uint16_t result; + ((uint8_t *)&result)[0] = f.read(); // LSB + ((uint8_t *)&result)[1] = f.read(); // MSB + return result; +} + +uint32_t read32(File f) { + uint32_t result; + ((uint8_t *)&result)[0] = f.read(); // LSB + ((uint8_t *)&result)[1] = f.read(); + ((uint8_t *)&result)[2] = f.read(); + ((uint8_t *)&result)[3] = f.read(); // MSB + return result; +} + +