Skip to content

Support color depth for 8 colors screen #21

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
eggfly wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support color depth for 8 colors screen #21

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
39 changes: 24 additions & 15 deletions Adafruit_SharpMem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,14 @@ All text above, and the splash screen must be included in any redistribution
* @param height The display height
* @param freq The SPI clock frequency desired (unlikely to be that fast in soft
* spi mode!)
* @param color_depth_bits The color depth in bits per pixel
*/
Adafruit_SharpMem::Adafruit_SharpMem(uint8_t clk, uint8_t mosi, uint8_t cs,
uint16_t width, uint16_t height,
uint32_t freq)
uint32_t freq, uint8_t color_depth_bits)
: Adafruit_GFX(width, height) {
_cs = cs;
_color_depth_bits = color_depth_bits;
if (spidev) {
delete spidev;
}
Expand All @@ -88,12 +90,14 @@ Adafruit_SharpMem::Adafruit_SharpMem(uint8_t clk, uint8_t mosi, uint8_t cs,
* @param width The display width
* @param height The display height
* @param freq The SPI clock frequency desired
* @param color_depth_bits The color depth in bits per pixel
*/
Adafruit_SharpMem::Adafruit_SharpMem(SPIClass *theSPI, uint8_t cs,
uint16_t width, uint16_t height,
uint32_t freq)
uint32_t freq, uint8_t color_depth_bits)
: Adafruit_GFX(width, height) {
_cs = cs;
_color_depth_bits = color_depth_bits;
if (spidev) {
delete spidev;
}
Expand All @@ -118,7 +122,7 @@ boolean Adafruit_SharpMem::begin(void) {
// Set the vcom bit to a defined state
_sharpmem_vcom = SHARPMEM_BIT_VCOM;

sharpmem_buffer = (uint8_t *)malloc((WIDTH * HEIGHT) / 8);
sharpmem_buffer = (uint8_t *)malloc((WIDTH * HEIGHT * _color_depth_bits) / 8);

if (!sharpmem_buffer)
return false;
Expand Down Expand Up @@ -165,11 +169,14 @@ void Adafruit_SharpMem::drawPixel(int16_t x, int16_t y, uint16_t color) {
y = HEIGHT - 1 - y;
break;
}

if (color) {
sharpmem_buffer[(y * WIDTH + x) / 8] |= pgm_read_byte(&set[x & 7]);
} else {
sharpmem_buffer[(y * WIDTH + x) / 8] &= pgm_read_byte(&clr[x & 7]);
for (int i = 0; i < _color_depth_bits; i++) {
if (color & set[i]) {
sharpmem_buffer[((y * WIDTH + x) * _color_depth_bits + i) / 8] |=
pgm_read_byte(&set[(x * _color_depth_bits + i) & 7]);
} else {
sharpmem_buffer[((y * WIDTH + x) * _color_depth_bits + i) / 8] &=
pgm_read_byte(&clr[(x * _color_depth_bits + i) & 7]);
}
}
}

Expand Down Expand Up @@ -204,8 +211,10 @@ uint8_t Adafruit_SharpMem::getPixel(uint16_t x, uint16_t y) {
break;
}

return sharpmem_buffer[(y * WIDTH + x) / 8] & pgm_read_byte(&set[x & 7]) ? 1
: 0;
return sharpmem_buffer[(y * WIDTH + x) * _color_depth_bits / 8] &
pgm_read_byte(&set[x * _color_depth_bits & 7])
? 1
: 0;
}

/**************************************************************************/
Expand All @@ -214,7 +223,7 @@ uint8_t Adafruit_SharpMem::getPixel(uint16_t x, uint16_t y) {
*/
/**************************************************************************/
void Adafruit_SharpMem::clearDisplay() {
memset(sharpmem_buffer, 0xff, (WIDTH * HEIGHT) / 8);
memset(sharpmem_buffer, 0xff, (WIDTH * HEIGHT * _color_depth_bits) / 8);

spidev->beginTransaction();
// Send the clear screen command rather than doing a HW refresh (quicker)
Expand Down Expand Up @@ -244,14 +253,14 @@ void Adafruit_SharpMem::refresh(void) {
spidev->transfer(_sharpmem_vcom | SHARPMEM_BIT_WRITECMD);
TOGGLE_VCOM;

uint8_t bytes_per_line = WIDTH / 8;
uint16_t totalbytes = (WIDTH * HEIGHT) / 8;
uint8_t bytes_per_line = WIDTH * _color_depth_bits / 8;
uint16_t totalbytes = (WIDTH * HEIGHT * _color_depth_bits) / 8;

for (i = 0; i < totalbytes; i += bytes_per_line) {
uint8_t line[bytes_per_line + 2];

// Send address byte
currentline = ((i + 1) / (WIDTH / 8)) + 1;
currentline = ((i + 1) / (WIDTH * _color_depth_bits / 8)) + 1;
line[0] = currentline;
// copy over this line
memcpy(line + 1, sharpmem_buffer + i, bytes_per_line);
Expand All @@ -273,5 +282,5 @@ void Adafruit_SharpMem::refresh(void) {
*/
/**************************************************************************/
void Adafruit_SharpMem::clearDisplayBuffer() {
memset(sharpmem_buffer, 0xff, (WIDTH * HEIGHT) / 8);
memset(sharpmem_buffer, 0xff, (WIDTH * HEIGHT * _color_depth_bits) / 8);
}
7 changes: 5 additions & 2 deletions Adafruit_SharpMem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,11 @@ All text above, and the splash screen must be included in any redistribution
class Adafruit_SharpMem : public Adafruit_GFX {
public:
Adafruit_SharpMem(uint8_t clk, uint8_t mosi, uint8_t cs, uint16_t w = 96,
uint16_t h = 96, uint32_t freq = 2000000);
uint16_t h = 96, uint32_t freq = 2000000,
uint8_t color_depth_bits = 1);
Adafruit_SharpMem(SPIClass *theSPI, uint8_t cs, uint16_t w = 96,
uint16_t h = 96, uint32_t freq = 2000000);
uint16_t h = 96, uint32_t freq = 2000000,
uint8_t color_depth_bits = 1);
boolean begin();
void drawPixel(int16_t x, int16_t y, uint16_t color);
uint8_t getPixel(uint16_t x, uint16_t y);
Expand All @@ -52,6 +54,7 @@ class Adafruit_SharpMem : public Adafruit_GFX {
uint8_t *sharpmem_buffer = NULL;
uint8_t _cs;
uint8_t _sharpmem_vcom;
uint8_t _color_depth_bits;
};

#endif
4 changes: 4 additions & 0 deletions examples/sharpmemtest/sharpmemtest.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ All text above, must be included in any redistribution
#define SHARP_MOSI 11
#define SHARP_SS 10

// Set the size and color depth, default is 1 bit depth.
// For example: 3 bits for LS013B7DH06 (8 colors 128x128 display)
// Adafruit_SharpMem display(SHARP_SCK, SHARP_MOSI, SHARP_SS, 128, 128, 2000000, 3);

// Set the size of the display here, e.g. 144x168!
Adafruit_SharpMem display(SHARP_SCK, SHARP_MOSI, SHARP_SS, 144, 168);
// The currently-available SHARP Memory Display (144x168 pixels)
Expand Down