Skip to content

Change ARDUINO_ESP32_DEV define to ARDUINO_INKPLATE6 #197

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

Change ARDUINO_ESP32_DEV define to ARDUINO_INKPLATE6 #197

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
2 changes: 1 addition & 1 deletion src/boards/Inkplate10.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ bool Inkplate::begin()
(((i & B11100000) >> 5) << 25);
#endif

#ifdef ARDUINO_ESP32_DEV
#ifdef ARDUINO_INKPLATE6
digitalWriteInternal(IO_INT_ADDR, ioRegsInt, 9, HIGH);
#else
digitalWriteInternal(IO_INT_ADDR, ioRegsInt, 9, LOW);
Expand Down
18 changes: 9 additions & 9 deletions src/boards/Inkplate6.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "../include/Graphics.h"
#include "../include/defines.h"

#if (defined(ARDUINO_ESP32_DEV) || defined(ARDUINO_INKPLATE6V2))
#if (defined(ARDUINO_INKPLATE6) || defined(ARDUINO_INKPLATE6V2))

/**
* @brief begin function initialize Inkplate object with predefined
Expand All @@ -44,7 +44,7 @@ bool Inkplate::begin(void)
pinLUT[i] = ((i & B00000011) << 4) | (((i & B00001100) >> 2) << 18) | (((i & B00010000) >> 4) << 23) |
(((i & B11100000) >> 5) << 25);

#ifdef ARDUINO_ESP32_DEV
#ifdef ARDUINO_INKPLATE6
digitalWriteInternal(IO_INT_ADDR, ioRegsInt, 9, HIGH);
#else
digitalWriteInternal(IO_INT_ADDR, ioRegsInt, 9, LOW);
Expand Down Expand Up @@ -250,7 +250,7 @@ void Inkplate::display1b(bool leaveOn)
clean(2, 1);

// How many cycles / phases / frames of dark pixels
#if defined(ARDUINO_ESP32_DEV)
#if defined(ARDUINO_INKPLATE6)
int rep = 4;
#elif defined(ARDUINO_INKPLATE6V2)
int rep = 5;
Expand Down Expand Up @@ -284,7 +284,7 @@ void Inkplate::display1b(bool leaveOn)
GPIO.out_w1tc = DATA | CL;
}
// New Inkplate6 panel doesn't need last clock
#ifdef ARDUINO_ESP32_DEV
#ifdef ARDUINO_INKPLATE6
GPIO.out_w1ts = CL;
GPIO.out_w1tc = DATA | CL;
#endif
Expand Down Expand Up @@ -320,7 +320,7 @@ void Inkplate::display1b(bool leaveOn)
_pos--;
}
// New Inkplate6 panel doesn't need last clock
#ifdef ARDUINO_ESP32_DEV
#ifdef ARDUINO_INKPLATE6
GPIO.out_w1ts = CL;
GPIO.out_w1tc = DATA | CL;
#endif
Expand All @@ -346,7 +346,7 @@ void Inkplate::display1b(bool leaveOn)
GPIO.out_w1tc = DATA | CL;
}
// New Inkplate6 panel doesn't need last clock
#ifdef ARDUINO_ESP32_DEV
#ifdef ARDUINO_INKPLATE6
GPIO.out_w1ts = CL;
GPIO.out_w1tc = DATA | CL;
#endif
Expand Down Expand Up @@ -411,7 +411,7 @@ void Inkplate::display3b(bool leaveOn)
GPIO.out_w1tc = DATA | CL;
}
// New Inkplate6 panel doesn't need last clock
#ifdef ARDUINO_ESP32_DEV
#ifdef ARDUINO_INKPLATE6
GPIO.out_w1ts = CL;
GPIO.out_w1tc = DATA | CL;
#endif
Expand Down Expand Up @@ -488,7 +488,7 @@ uint32_t Inkplate::partialUpdate(bool _forced, bool leaveOn)
return 0;

// How many cycles / phases / frames to write to the panel.
#if defined(ARDUINO_ESP32_DEV)
#if defined(ARDUINO_INKPLATE6)
int rep = 5;
#elif defined(ARDUINO_INKPLATE6V2)
int rep = 6;
Expand All @@ -513,7 +513,7 @@ uint32_t Inkplate::partialUpdate(bool _forced, bool leaveOn)
n--;
}
// New Inkplate6 panel doesn't need last clock
#ifdef ARDUINO_ESP32_DEV
#ifdef ARDUINO_INKPLATE6
GPIO.out_w1ts = CL;
GPIO.out_w1tc = DATA | CL;
#endif
Expand Down
4 changes: 2 additions & 2 deletions src/boards/Inkplate6.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#ifndef INKPLATE6_H
#define INKPLATE6_H

#ifdef ARDUINO_ESP32_DEV
#ifdef ARDUINO_INKPLATE6
#define IO_INT_ADDR 0x20
#define IO_EXT_ADDR 0x22
#endif
Expand All @@ -37,7 +37,7 @@
#define E_INK_HEIGHT 600

// Last element (index = 8) in waveform array is not used!
#ifdef ARDUINO_ESP32_DEV
#ifdef ARDUINO_INKPLATE6
#define WAVEFORM3BIT \
{{0, 1, 1, 0, 0, 1, 1, 0, 0}, {0, 1, 2, 1, 1, 2, 1, 0, 0}, {1, 1, 1, 2, 2, 1, 0, 0, 0}, \
{0, 0, 0, 1, 1, 1, 2, 0, 0}, {2, 1, 1, 1, 2, 1, 2, 0, 0}, {2, 2, 1, 1, 2, 1, 2, 0, 0}, \
Expand Down
2 changes: 1 addition & 1 deletion src/boards/Inkplate6plus.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ bool Inkplate::begin(void)
(((i & B11100000) >> 5) << 25);
#endif

#ifdef ARDUINO_ESP32_DEV
#ifdef ARDUINO_INKPLATE6
digitalWriteInternal(IO_INT_ADDR, ioRegsInt, 9, HIGH);
#else
digitalWriteInternal(IO_INT_ADDR, ioRegsInt, 9, LOW);
Expand Down
2 changes: 1 addition & 1 deletion src/include/Mcp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* @authors Soldered
***************************************************/

#if defined(ARDUINO_INKPLATE10) || defined(ARDUINO_ESP32_DEV) || defined(ARDUINO_INKPLATE6PLUS)
#if defined(ARDUINO_INKPLATE10) || defined(ARDUINO_INKPLATE6) || defined(ARDUINO_INKPLATE6PLUS)

#include "Mcp.h"

Expand Down
2 changes: 1 addition & 1 deletion src/include/System.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
#include "Touch.h"
#endif

#if defined(ARDUINO_INKPLATE10) || defined(ARDUINO_ESP32_DEV) || defined(ARDUINO_INKPLATE6PLUS)
#if defined(ARDUINO_INKPLATE10) || defined(ARDUINO_INKPLATE6) || defined(ARDUINO_INKPLATE6PLUS)
#include "Mcp.h"
#endif

Expand Down
2 changes: 1 addition & 1 deletion src/include/defines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#include "Arduino.h"

#if (defined(ARDUINO_ESP32_DEV) || defined(ARDUINO_INKPLATE6V2))
#if (defined(ARDUINO_INKPLATE6) || defined(ARDUINO_INKPLATE6V2))
#include "../boards/Inkplate6.h"
#elif ARDUINO_INKPLATE5
#include "../boards/Inkplate5.h"
Expand Down