Skip to content

added esp8266 Arduino compatibility #4

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
nullboundary wants to merge 5 commits into
base: master
Choose a base branch
from
Open

added esp8266 Arduino compatibility #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
025addb
added esp8266 to spihw
nullboundary Dec 23, 2015
f5e1933
hwCS and cleanup
nullboundary Dec 29, 2015
215d0a3
optimizations for esp8266
nullboundary Dec 30, 2015
8de0841
fixed merge
nullboundary Dec 30, 2015
0819ff5
spisw fixes for esp8266
nullboundary Dec 30, 2015
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
20 changes: 19 additions & 1 deletion Pixels.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,20 @@
#define regtype volatile uint32_t
#define regsize uint32_t

#elif defined(ESP8266)
#include "Arduino.h"
#include <pgmspace.h>
#define cbi(reg, bitmask) GPOC = bitmask
#define sbi(reg, bitmask) GPOS = bitmask
#define pulse_high(reg, bitmask) sbi(reg, bitmask); cbi(reg, bitmask);
#define pulse_low(reg, bitmask) cbi(reg, bitmask); sbi(reg, bitmask);

#define cport(port, data) port &= data
#define sport(port, data) port |= data

#define regtype volatile uint32_t
#define regsize uint32_t

#else
#define PROGMEM

Expand Down Expand Up @@ -117,7 +131,11 @@


#define ipart(X) ((int16_t)(X))
#define round(X) ((uint16_t)(((double)(X))+0.5))

#ifndef ESP8266
#define round(X) ((uint16_t)(((double)(X))+0.5))
#endif

#define fpart(X) (((double)(X))-(double)ipart(X))
#define rfpart(X) (1.0-fpart(X))

Expand Down
122 changes: 78 additions & 44 deletions Pixels_ILI9341.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,13 @@ class Pixels : public PixelsBase
{
protected:
void deviceWriteData(uint8_t high, uint8_t low) {
writeData(high, low);

#if defined(ESP8266) && defined(PIXELS_SPIHW_H)
int16_t data = (high<<8) | low; //convert back to 16bit
writeData16(data);
#else
writeData(high, low);
#endif
}

void setRegion(int16_t x1, int16_t y1, int16_t x2, int16_t y2);
Expand Down Expand Up @@ -135,7 +141,7 @@ void Pixels::init() {
writeData(0x08);
writeData(0x82);
writeData(0x27);
/*

writeCmd(0xF2); // 3Gamma Function Disable
writeData(0x00);

Expand Down Expand Up @@ -175,7 +181,7 @@ void Pixels::init() {
writeData(0x31);
writeData(0x36);
writeData(0x0F);
*/

writeCmd(0x11); //Exit Sleep
delay(120);

Expand All @@ -188,8 +194,13 @@ void Pixels::init() {
void Pixels::scrollCmd() {
chipSelect();
writeCmd(0x37);
writeData(highByte(currentScroll));
writeData(lowByte(currentScroll));

#if defined(ESP8266) && defined(PIXELS_SPIHW_H)
writeData16(currentScroll);
#else
writeData(highByte(currentScroll));
writeData(lowByte(currentScroll));
#endif
chipDeselect();
}

Expand All @@ -205,34 +216,42 @@ void Pixels::quickFill (int color, int16_t x1, int16_t y1, int16_t x2, int16_t y

registerSelect();

uint8_t lo = lowByte(color);
uint8_t hi = highByte(color);

for (int16_t i = 0; i < counter / 20; i++) {
writeData(hi);writeData(lo);
writeData(hi);writeData(lo);
writeData(hi);writeData(lo);
writeData(hi);writeData(lo);
writeData(hi);writeData(lo);
writeData(hi);writeData(lo);
writeData(hi);writeData(lo);
writeData(hi);writeData(lo);
writeData(hi);writeData(lo);
writeData(hi);writeData(lo);
writeData(hi);writeData(lo);
writeData(hi);writeData(lo);
writeData(hi);writeData(lo);
writeData(hi);writeData(lo);
writeData(hi);writeData(lo);
writeData(hi);writeData(lo);
writeData(hi);writeData(lo);
writeData(hi);writeData(lo);
writeData(hi);writeData(lo);
writeData(hi);writeData(lo);
}
for (int32_t i = 0; i < counter % 20; i++) {
writeData(hi);writeData(lo);
}
#if defined(ESP8266) && defined(PIXELS_SPIHW_H)

uint8_t colorBin[] = { (uint8_t) (color >> 8), (uint8_t) color };
writeDataPattern(&colorBin[0], 2, counter);

#else

uint8_t lo = lowByte(color);
uint8_t hi = highByte(color);

for (int16_t i = 0; i < counter / 20; i++) {
writeData(hi);writeData(lo);
writeData(hi);writeData(lo);
writeData(hi);writeData(lo);
writeData(hi);writeData(lo);
writeData(hi);writeData(lo);
writeData(hi);writeData(lo);
writeData(hi);writeData(lo);
writeData(hi);writeData(lo);
writeData(hi);writeData(lo);
writeData(hi);writeData(lo);
writeData(hi);writeData(lo);
writeData(hi);writeData(lo);
writeData(hi);writeData(lo);
writeData(hi);writeData(lo);
writeData(hi);writeData(lo);
writeData(hi);writeData(lo);
writeData(hi);writeData(lo);
writeData(hi);writeData(lo);
writeData(hi);writeData(lo);
writeData(hi);writeData(lo);
}
for (int32_t i = 0; i < counter % 20; i++) {
writeData(hi);writeData(lo);
}
#endif

chipDeselect();
}
Expand Down Expand Up @@ -273,16 +292,31 @@ void Pixels::setRegion(int16_t x1, int16_t y1, int16_t x2, int16_t y2) {
}
}

writeCmd(0x2a);
writeData(x1>>8);
writeData(x1);
writeData(x2>>8);
writeData(x2);
writeCmd(0x2b);
writeData(y1>>8);
writeData(y1);
writeData(y2>>8);
writeData(y2);
writeCmd(0x2c);
#if defined(ESP8266) && defined(PIXELS_SPIHW_H)

uint8_t buffC[] = { (uint8_t) (x1 >> 8), (uint8_t) x1, (uint8_t) (x2 >> 8), (uint8_t) x2 };
uint8_t buffP[] = { (uint8_t) (y1 >> 8), (uint8_t) y1, (uint8_t) (y2 >> 8), (uint8_t) y2 };

writeCmd(0x2a);
writeDataBytes(&buffC[0], sizeof(buffC));
writeCmd(0x2b);
writeDataBytes(&buffP[0], sizeof(buffP));
writeCmd(0x2c);

#else

writeCmd(0x2a);
writeData(x1>>8);
writeData(x1);
writeData(x2>>8);
writeData(x2);
writeCmd(0x2b);
writeData(y1>>8);
writeData(y1);
writeData(y2>>8);
writeData(y2);
writeCmd(0x2c);

#endif
}
#endif
Loading