Skip to content

Add support for drawing images #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
blikacka wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for drawing images #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
139 changes: 99 additions & 40 deletions Arduino_ST7789.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,32 +10,41 @@
#include "wiring_private.h"
#include <SPI.h>


#define ST7789_CASET 0x2A
#define ST7789_RASET 0x2B
#define ST7789_RAMWR 0x2C
#define ST7789_RAMRD 0x2E

#define ST7789_COLMOD 0x3A
#define ST7789_MADCTL 0x36

static const uint8_t PROGMEM
cmd_240x240[] = { // Initialization commands for 7789 screens
10, // 9 commands in list:
ST7789_SWRESET, ST_CMD_DELAY, // 1: Software reset, no args, w/delay
150, // 150 ms delay
ST7789_SLPOUT , ST_CMD_DELAY, // 2: Out of sleep mode, no args, w/delay
255, // 255 = 500 ms delay
ST7789_COLMOD , 1+ST_CMD_DELAY, // 3: Set color mode, 1 arg + delay:
0x55, // 16-bit color
10, // 10 ms delay
ST7789_MADCTL , 1, // 4: Memory access ctrl (directions), 1 arg:
0x00, // Row addr/col addr, bottom to top refresh
ST7789_CASET , 4, // 5: Column addr set, 4 args, no delay:
cmd_240x240[] = { // Initialization commands for 7789 screens
10, // 9 commands in list:
ST7789_SWRESET, ST_CMD_DELAY, // 1: Software reset, no args, w/delay
150, // 150 ms delay
ST7789_SLPOUT , ST_CMD_DELAY, // 2: Out of sleep mode, no args, w/delay
255, // 255 = 500 ms delay
ST7789_COLMOD , 1+ST_CMD_DELAY, // 3: Set color mode, 1 arg + delay:
0x55, // 16-bit color
10, // 10 ms delay
ST7789_MADCTL , 1, // 4: Memory access ctrl (directions), 1 arg:
0x00, // Row addr/col addr, bottom to top refresh
ST7789_CASET , 4, // 5: Column addr set, 4 args, no delay:
0x00, ST7789_240x240_XSTART, // XSTART = 0
(240+ST7789_240x240_XSTART) >> 8,
(240+ST7789_240x240_XSTART) & 0xFF, // XEND = 240
ST7789_RASET , 4, // 6: Row addr set, 4 args, no delay:
(240+ST7789_240x240_XSTART) >> 8,
(240+ST7789_240x240_XSTART) & 0xFF, // XEND = 240
ST7789_RASET , 4, // 6: Row addr set, 4 args, no delay:
0x00, ST7789_240x240_YSTART, // YSTART = 0
(240+ST7789_240x240_YSTART) >> 8,
(240+ST7789_240x240_YSTART) & 0xFF, // YEND = 240
ST7789_INVON , ST_CMD_DELAY, // 7: Inversion ON
(240+ST7789_240x240_YSTART) & 0xFF, // YEND = 240
ST7789_INVON , ST_CMD_DELAY, // 7: Inversion ON
10,
ST7789_NORON , ST_CMD_DELAY, // 8: Normal display on, no args, w/delay
10, // 10 ms delay
ST7789_DISPON , ST_CMD_DELAY, // 9: Main screen turn on, no args, w/delay
255 }; // 255 = 500 ms delay
ST7789_NORON , ST_CMD_DELAY, // 8: Normal display on, no args, w/delay
10, // 10 ms delay
ST7789_DISPON , ST_CMD_DELAY, // 9: Main screen turn on, no args, w/delay
255 }; // 255 = 500 ms delay

inline uint16_t swapcolor(uint16_t x) {
return (x << 11) | (x & 0x07E0) | (x >> 11);
Expand Down Expand Up @@ -102,12 +111,12 @@ inline void Arduino_ST7789::spiwrite(uint8_t c) {
// Fast SPI bitbang swiped from LPD8806 library
for(uint8_t bit = 0x80; bit; bit >>= 1) {
#if defined(USE_FAST_IO)
*clkport &= ~clkpinmask;
*clkport &= ~clkpinmask;
if(c & bit) *dataport |= datapinmask;
else *dataport &= ~datapinmask;
*clkport |= clkpinmask;
#else
digitalWrite(_sclk, LOW);
digitalWrite(_sclk, LOW);
if(c & bit) digitalWrite(_sid, HIGH);
else digitalWrite(_sid, LOW);
digitalWrite(_sclk, HIGH);
Expand Down Expand Up @@ -180,15 +189,15 @@ void Arduino_ST7789::commonInit(const uint8_t *cmdList) {

pinMode(_dc, OUTPUT);
if(_cs) {
pinMode(_cs, OUTPUT);
pinMode(_cs, OUTPUT);
}

#if defined(USE_FAST_IO)
dcport = portOutputRegister(digitalPinToPort(_dc));
dcpinmask = digitalPinToBitMask(_dc);
if(_cs) {
csport = portOutputRegister(digitalPinToPort(_cs));
cspinmask = digitalPinToBitMask(_cs);
csport = portOutputRegister(digitalPinToPort(_cs));
cspinmask = digitalPinToBitMask(_cs);
}

#endif
Expand Down Expand Up @@ -412,23 +421,23 @@ void Arduino_ST7789::invertDisplay(boolean i) {
/******** low level bit twiddling **********/

inline void Arduino_ST7789::CS_HIGH(void) {
if(_cs) {
#if defined(USE_FAST_IO)
*csport |= cspinmask;
#else
digitalWrite(_cs, HIGH);
#endif
}
if(_cs) {
#if defined(USE_FAST_IO)
*csport |= cspinmask;
#else
digitalWrite(_cs, HIGH);
#endif
}
}

inline void Arduino_ST7789::CS_LOW(void) {
if(_cs) {
#if defined(USE_FAST_IO)
*csport &= ~cspinmask;
#else
digitalWrite(_cs, LOW);
#endif
}
if(_cs) {
#if defined(USE_FAST_IO)
*csport &= ~cspinmask;
#else
digitalWrite(_cs, LOW);
#endif
}
}

inline void Arduino_ST7789::DC_HIGH(void) {
Expand Down Expand Up @@ -459,3 +468,53 @@ void Arduino_ST7789::init(uint16_t width, uint16_t height) {

setRotation(2);
}




// ----------------------------------------------------------
// fast method to send multiple 16-bit values from RAM via SPI
inline void Arduino_ST7789::copyMulti(uint8_t *img, uint16_t num)
{
while(num--) { writedata(*(img+1)); writedata(*(img+0)); img+=2; }
}


// ----------------------------------------------------------
// draws image from RAM, only basic clipping
void Arduino_ST7789::drawImage(int16_t x, int16_t y, int16_t w, int16_t h, uint16_t *img16)
{
// all clipping should be on the application side
if(w<=0 || h<=0) return; // left for compatibility
//if(x>=_width || y>=_height || w<=0 || h<=0) return;
//if(x+w-1>=_width) w=_width -x;
//if(y+h-1>=_height) h=_height-y;
setAddrWindow(x, y, x+w-1, y+h-1);

copyMulti((uint8_t *)img16, w*h); // assumed w*h will never be >64k
}

// ----------------------------------------------------------
// draws image from flash (PROGMEM)
void Arduino_ST7789::drawImageF(int16_t x, int16_t y, int16_t w, int16_t h, const uint16_t *img16)
{
if(x>=_width || y>=_height || w<=0 || h<=0) return;
setAddrWindow(x, y, x+w-1, y+h-1);

uint32_t num = (uint32_t)w*h;
uint16_t num16 = num>>3;
uint8_t *img = (uint8_t *)img16;
while(num16--) {
writedata(pgm_read_byte(img+1)); writedata(pgm_read_byte(img+0)); img+=2;
writedata(pgm_read_byte(img+1)); writedata(pgm_read_byte(img+0)); img+=2;
writedata(pgm_read_byte(img+1)); writedata(pgm_read_byte(img+0)); img+=2;
writedata(pgm_read_byte(img+1)); writedata(pgm_read_byte(img+0)); img+=2;
writedata(pgm_read_byte(img+1)); writedata(pgm_read_byte(img+0)); img+=2;
writedata(pgm_read_byte(img+1)); writedata(pgm_read_byte(img+0)); img+=2;
writedata(pgm_read_byte(img+1)); writedata(pgm_read_byte(img+0)); img+=2;
writedata(pgm_read_byte(img+1)); writedata(pgm_read_byte(img+0)); img+=2;
}
uint8_t num8 = num & 0x7;
while(num8--) { writedata(pgm_read_byte(img+1)); writedata(pgm_read_byte(img+0)); img+=2; }
}

20 changes: 12 additions & 8 deletions Arduino_ST7789.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
typedef unsigned char prog_uchar;
#endif

#define ST7789_TFTWIDTH_240 240
#define ST7789_TFTHEIGHT_240 240
#define ST7789_TFTWIDTH_240 240
#define ST7789_TFTHEIGHT_240 240

#define ST7789_240x240_XSTART 0
#define ST7789_240x240_YSTART 0
Expand Down Expand Up @@ -76,10 +76,10 @@
#define ST7789_RDID4 0xDD

// Color definitions
#define BLACK 0x0000
#define BLUE 0x001F
#define RED 0xF800
#define GREEN 0x07E0
#define BLACK 0x0000
#define BLUE 0x001F
#define RED 0xF800
#define GREEN 0x07E0
#define CYAN 0x07FF
#define MAGENTA 0xF81F
#define YELLOW 0xFFE0
Expand All @@ -101,12 +101,16 @@ class Arduino_ST7789 : public Adafruit_GFX {
fillRect(int16_t x, int16_t y, int16_t w, int16_t h, uint16_t color),
setRotation(uint8_t r),
invertDisplay(boolean i),
init(uint16_t width, uint16_t height);
drawImage(int16_t x, int16_t y, int16_t w, int16_t h, uint16_t *img),
init(uint16_t width, uint16_t height);
uint16_t Color565(uint8_t r, uint8_t g, uint8_t b);
uint16_t color565(uint8_t r, uint8_t g, uint8_t b) { return Color565(r, g, b); }
uint16_t color565(uint8_t r, uint8_t g, uint8_t b) { return Color565(r, g, b); }
void drawImageF(int16_t x, int16_t y, int16_t w, int16_t h, const uint16_t *img16);
void drawImageF(int16_t x, int16_t y, const uint16_t *img16) { drawImageF(x,y,pgm_read_word(img16),pgm_read_word(img16+1),img16+3); }

protected:
uint8_t _colstart, _rowstart, _xstart, _ystart; // some displays need this changed
void copyMulti(uint8_t *img, uint16_t num);

void displayInit(const uint8_t *addr);
void spiwrite(uint8_t),
Expand Down