Michel2/TFTLCD-Library
1
0
Fork 0
mirror of https://github.com/adafruit/TFTLCD-Library.git synced 2026-07-28 04:06:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:adafruit/TFTLCD-Library

Browse Source 
Conflicts:
	Adafruit_TFTLCD.cpp
This commit is contained in:
ladyada
2014-08-13 17:43:31 -04:00
parent 87479c7442 7a983dcbc5
commit 9323b5cdb5
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Adafruit_TFTLCD.cpp
+1 -2
View File
@@ -372,7 +372,6 @@ void Adafruit_TFTLCD::reset(void) {
// Relevant to rect/screen fills and H/V lines. Input coordinates are
// assumed pre-sorted (e.g. x2 >= x1).
void Adafruit_TFTLCD::setAddrWindow(int x1, int y1, int x2, int y2) {
CS_ACTIVE;
if(driver == ID_932X) {
@@ -676,7 +675,7 @@ void Adafruit_TFTLCD::drawPixel(int16_t x, int16_t y, uint16_t color) {
CD_COMMAND; write8(0x22); CD_DATA; write8(hi); write8(lo);
} else if ((driver == ID_9341) || (driver == ID_HX8357D)) {
setAddrWindow(x, y, TFTWIDTH-1, TFTHEIGHT-1);
setAddrWindow(x, y, _width-1, _height-1);
CS_ACTIVE;
CD_COMMAND;
write8(0x2C);
examples/tftbmp/tftbmp.pde
+3 -2
View File
@@ -1,11 +1,12 @@
// BMP-loading example specifically for the TFTLCD breakout board.
// If using the Arduino shield, use the tftbmp_shield.pde sketch instead!
// If using an Arduino Mega, make sure the SD library is configured for
// 'soft' SPI in the file Sd2Card.h.
// If using an Arduino Mega make sure to use its hardware SPI pins, OR make
// sure the SD library is configured for 'soft' SPI in the file Sd2Card.h.
#include <Adafruit_GFX.h> // Core graphics library
#include <Adafruit_TFTLCD.h> // Hardware-specific library
#include <SD.h>
#include <SPI.h>
// The control pins for the LCD can be assigned to any digital or
// analog pins...but we'll use the analog pins as this allows us to
examples/tftbmp_shield/tftbmp_shield.pde
+3 -2
View File
@@ -1,7 +1,8 @@
// BMP-loading example specifically for the TFTLCD Arduino shield.
// If using the breakout board, use the tftbmp.pde sketch instead!
// If using an Arduino Mega, make sure the SD library is configured for
// 'soft' SPI in the file Sd2Card.h.
// If using an Arduino Mega and your sheild does not use the ICSP header for
// SPI, make sure the SD library is configured for 'soft' SPI in the file Sd2Card.h.
// If in doubt, update the library to use 'soft' SPI.
#include <Adafruit_GFX.h> // Core graphics library
#include <Adafruit_TFTLCD.h> // Hardware-specific library