Skip to content

Commit ce568ec

Browse files
ladyadaladyada
authored
Merge pull request #62 from mirzafahad/master
Changed pins variable type from int8_t to int16_t.
2 parents 7a20f80 + 95438c0 commit ce568ec

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+311
-294
lines changed

‎src/Adafruit_EPD.cpp

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,10 @@ bool Adafruit_EPD::_isInTransaction = false;
5353
@param BUSY the busy pin to use
5454
*/
5555
/**************************************************************************/
56-
Adafruit_EPD::Adafruit_EPD(int width, int height, int8_t spi_mosi,
57-
int8_t spi_clock, int8_t DC, int8_t RST, int8_t CS,
58-
int8_t SRCS, int8_t spi_miso, int8_t BUSY)
56+
Adafruit_EPD::Adafruit_EPD(int width, int height, int16_t spi_mosi,
57+
int16_t spi_clock, int16_t DC, int16_t RST,
58+
int16_t CS, int16_t SRCS, int16_t spi_miso,
59+
int16_t BUSY)
5960
: Adafruit_GFX(width, height), sram(spi_mosi, spi_miso, spi_clock, SRCS) {
6061
_cs_pin = CS;
6162
_reset_pin = RST;
@@ -94,8 +95,9 @@ Adafruit_EPD::Adafruit_EPD(int width, int height, int8_t spi_mosi,
9495
@param spi the SPI bus to use
9596
*/
9697
/**************************************************************************/
97-
Adafruit_EPD::Adafruit_EPD(int width, int height, int8_t DC, int8_t RST,
98-
int8_t CS, int8_t SRCS, int8_t BUSY, SPIClass *spi)
98+
Adafruit_EPD::Adafruit_EPD(int width, int height, int16_t DC, int16_t RST,
99+
int16_t CS, int16_t SRCS, int16_t BUSY,
100+
SPIClass *spi)
99101
: Adafruit_GFX(width, height), sram(SRCS) {
100102
_cs_pin = CS;
101103
_reset_pin = RST;

‎src/Adafruit_EPD.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ typedef enum {
6464
/**************************************************************************/
6565
class Adafruit_EPD : public Adafruit_GFX {
6666
public:
67-
Adafruit_EPD(int width, int height, int8_t SID, int8_t SCLK, int8_t DC,
68-
int8_t RST, int8_t CS, int8_t SRCS, int8_t MISO,
69-
int8_t BUSY = -1);
70-
Adafruit_EPD(int width, int height, int8_t DC, int8_t RST, int8_t CS,
71-
int8_t SRCS, int8_t BUSY = -1, SPIClass *spi = &SPI);
67+
Adafruit_EPD(int width, int height, int16_t SID, int16_t SCLK, int16_t DC,
68+
int16_t RST, int16_t CS, int16_t SRCS, int16_t MISO,
69+
int16_t BUSY = -1);
70+
Adafruit_EPD(int width, int height, int16_t DC, int16_t RST, int16_t CS,
71+
int16_t SRCS, int16_t BUSY = -1, SPIClass *spi = &SPI);
7272
~Adafruit_EPD();
7373

7474
void begin(bool reset = true);
@@ -132,7 +132,7 @@ class Adafruit_EPD : public Adafruit_GFX {
132132
virtual void powerDown(void) = 0;
133133
void hardwareReset(void);
134134

135-
int8_t _dc_pin, ///< data/command pin
135+
int16_t _dc_pin, ///< data/command pin
136136
_reset_pin, ///< reset pin
137137
_cs_pin, ///< chip select pin
138138
_busy_pin; ///< busy pin

‎src/Adafruit_MCPSRAM.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
@param cs chip select pin
1414
*/
1515
/**************************************************************************/
16-
Adafruit_MCPSRAM::Adafruit_MCPSRAM(int8_t mosi, int8_t miso, int8_t sck,
17-
int8_t cs) {
16+
Adafruit_MCPSRAM::Adafruit_MCPSRAM(int16_t mosi, int16_t miso, int16_t sck,
17+
int16_t cs) {
1818
_mosi = mosi;
1919
_miso = miso;
2020
_sck = sck;
@@ -29,7 +29,7 @@ Adafruit_MCPSRAM::Adafruit_MCPSRAM(int8_t mosi, int8_t miso, int8_t sck,
2929
@param spi the SPI bus to use
3030
*/
3131
/**************************************************************************/
32-
Adafruit_MCPSRAM::Adafruit_MCPSRAM(int8_t cs, SPIClass *spi) {
32+
Adafruit_MCPSRAM::Adafruit_MCPSRAM(int16_t cs, SPIClass *spi) {
3333
_cs = cs;
3434
_spi = spi;
3535
hwSPI = true;

‎src/Adafruit_MCPSRAM.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
/**************************************************************************/
1616
class Adafruit_MCPSRAM {
1717
public:
18-
Adafruit_MCPSRAM(int8_t mosi, int8_t miso, int8_t sck, int8_t cs);
19-
Adafruit_MCPSRAM(int8_t cs, SPIClass *spi = &SPI);
18+
Adafruit_MCPSRAM(int16_t mosi, int16_t miso, int16_t sck, int16_t cs);
19+
Adafruit_MCPSRAM(int16_t cs, SPIClass *spi = &SPI);
2020
~Adafruit_MCPSRAM() {}
2121

2222
void begin();
@@ -42,6 +42,6 @@ class Adafruit_MCPSRAM {
4242
PortReg *mosiport, *clkport, *csport, *misoport;
4343
PortMask mosipinmask, clkpinmask, cspinmask, misopinmask;
4444
#endif
45-
int8_t _cs, _mosi, _miso, _sck;
45+
int16_t _cs, _mosi, _miso, _sck;
4646
SPIClass *_spi = NULL;
4747
};

‎src/drivers/Adafruit_ACeP.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ const uint8_t acep_default_init_code[] {
3838
@param BUSY the busy pin to use
3939
*/
4040
/**************************************************************************/
41-
Adafruit_ACEP::Adafruit_ACEP(int width, int height, int8_t SID, int8_t SCLK,
42-
int8_t DC, int8_t RST, int8_t CS, int8_t SRCS,
43-
int8_t MISO, int8_t BUSY)
41+
Adafruit_ACEP::Adafruit_ACEP(int width, int height, int16_t SID, int16_t SCLK,
42+
int16_t DC, int16_t RST, int16_t CS, int16_t SRCS,
43+
int16_t MISO, int16_t BUSY)
4444
: Adafruit_EPD(width, height, SID, SCLK, DC, RST, CS, SRCS, MISO, BUSY) {
4545

4646
if ((width % 8) != 0) {
@@ -75,8 +75,9 @@ Adafruit_ACEP::Adafruit_ACEP(int width, int height, int8_t SID, int8_t SCLK,
7575
@param BUSY the busy pin to use
7676
*/
7777
/**************************************************************************/
78-
Adafruit_ACEP::Adafruit_ACEP(int width, int height, int8_t DC, int8_t RST,
79-
int8_t CS, int8_t SRCS, int8_t BUSY, SPIClass *spi)
78+
Adafruit_ACEP::Adafruit_ACEP(int width, int height, int16_t DC, int16_t RST,
79+
int16_t CS, int16_t SRCS, int16_t BUSY,
80+
SPIClass *spi)
8081
: Adafruit_EPD(width, height, DC, RST, CS, SRCS, BUSY, spi) {
8182

8283
if ((height % 8) != 0) {

‎src/drivers/Adafruit_ACeP.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@
3535
/**************************************************************************/
3636
class Adafruit_ACEP : public Adafruit_EPD {
3737
public:
38-
Adafruit_ACEP(int width, int height, int8_t SID, int8_t SCLK, int8_t DC,
39-
int8_t RST, int8_t CS, int8_t SRCS, int8_t MISO,
40-
int8_t BUSY = -1);
41-
Adafruit_ACEP(int width, int height, int8_t DC, int8_t RST, int8_t CS,
42-
int8_t SRCS, int8_t BUSY = -1, SPIClass *spi = &SPI);
38+
Adafruit_ACEP(int width, int height, int16_t SID, int16_t SCLK, int16_t DC,
39+
int16_t RST, int16_t CS, int16_t SRCS, int16_t MISO,
40+
int16_t BUSY = -1);
41+
Adafruit_ACEP(int width, int height, int16_t DC, int16_t RST, int16_t CS,
42+
int16_t SRCS, int16_t BUSY = -1, SPIClass *spi = &SPI);
4343

4444
void begin(bool reset = true);
4545
void powerUp();

‎src/drivers/Adafruit_EK79686.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ const uint8_t ek79686_default_init_code[] {
4141
@param BUSY the busy pin to use
4242
*/
4343
/**************************************************************************/
44-
Adafruit_EK79686::Adafruit_EK79686(int width, int height, int8_t SID,
45-
int8_t SCLK, int8_t DC, int8_t RST,
46-
int8_t CS, int8_t SRCS, int8_t MISO,
47-
int8_t BUSY)
44+
Adafruit_EK79686::Adafruit_EK79686(int width, int height, int16_t SID,
45+
int16_t SCLK, int16_t DC, int16_t RST,
46+
int16_t CS, int16_t SRCS, int16_t MISO,
47+
int16_t BUSY)
4848
: Adafruit_EPD(width, height, SID, SCLK, DC, RST, CS, SRCS, MISO, BUSY) {
4949

5050
if ((width % 8) != 0) {
@@ -78,9 +78,9 @@ Adafruit_EK79686::Adafruit_EK79686(int width, int height, int8_t SID,
7878
@param BUSY the busy pin to use
7979
*/
8080
/**************************************************************************/
81-
Adafruit_EK79686::Adafruit_EK79686(int width, int height, int8_t DC, int8_t RST,
82-
int8_t CS, int8_t SRCS, int8_t BUSY,
83-
SPIClass *spi)
81+
Adafruit_EK79686::Adafruit_EK79686(int width, int height, int16_t DC,
82+
int16_t RST, int16_t CS, int16_t SRCS,
83+
int16_t BUSY, SPIClass *spi)
8484
: Adafruit_EPD(width, height, DC, RST, CS, SRCS, BUSY, spi) {
8585

8686
if ((height % 8) != 0) {

‎src/drivers/Adafruit_EK79686.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@
5858
/**************************************************************************/
5959
class Adafruit_EK79686 : public Adafruit_EPD {
6060
public:
61-
Adafruit_EK79686(int width, int height, int8_t SID, int8_t SCLK, int8_t DC,
62-
int8_t RST, int8_t CS, int8_t SRCS, int8_t MISO,
63-
int8_t BUSY = -1);
64-
Adafruit_EK79686(int width, int height, int8_t DC, int8_t RST, int8_t CS,
65-
int8_t SRCS, int8_t BUSY = -1, SPIClass *spi = &SPI);
61+
Adafruit_EK79686(int width, int height, int16_t SID, int16_t SCLK, int16_t DC,
62+
int16_t RST, int16_t CS, int16_t SRCS, int16_t MISO,
63+
int16_t BUSY = -1);
64+
Adafruit_EK79686(int width, int height, int16_t DC, int16_t RST, int16_t CS,
65+
int16_t SRCS, int16_t BUSY = -1, SPIClass *spi = &SPI);
6666

6767
void begin(bool reset = true);
6868
void powerUp();

‎src/drivers/Adafruit_IL0373.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,10 @@ const uint8_t il0373_default_init_code[] {
3737
@param BUSY the busy pin to use
3838
*/
3939
/**************************************************************************/
40-
Adafruit_IL0373::Adafruit_IL0373(int width, int height, int8_t SID, int8_t SCLK,
41-
int8_t DC, int8_t RST, int8_t CS, int8_t SRCS,
42-
int8_t MISO, int8_t BUSY)
40+
Adafruit_IL0373::Adafruit_IL0373(int width, int height, int16_t SID,
41+
int16_t SCLK, int16_t DC, int16_t RST,
42+
int16_t CS, int16_t SRCS, int16_t MISO,
43+
int16_t BUSY)
4344
: Adafruit_EPD(width, height, SID, SCLK, DC, RST, CS, SRCS, MISO, BUSY) {
4445

4546
buffer1_size = ((uint32_t)width * (uint32_t)height) / 8;
@@ -71,8 +72,8 @@ Adafruit_IL0373::Adafruit_IL0373(int width, int height, int8_t SID, int8_t SCLK,
7172
@param spi the SPI bus to use
7273
*/
7374
/**************************************************************************/
74-
Adafruit_IL0373::Adafruit_IL0373(int width, int height, int8_t DC, int8_t RST,
75-
int8_t CS, int8_t SRCS, int8_t BUSY,
75+
Adafruit_IL0373::Adafruit_IL0373(int width, int height, int16_t DC, int16_t RST,
76+
int16_t CS, int16_t SRCS, int16_t BUSY,
7677
SPIClass *spi)
7778
: Adafruit_EPD(width, height, DC, RST, CS, SRCS, BUSY, spi) {
7879
buffer1_size = ((uint32_t)width * (uint32_t)height) / 8;

‎src/drivers/Adafruit_IL0373.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@
4040
class Adafruit_IL0373 : public Adafruit_EPD {
4141
private:
4242
public:
43-
Adafruit_IL0373(int width, int height, int8_t SID, int8_t SCLK, int8_t DC,
44-
int8_t RST, int8_t CS, int8_t SRCS, int8_t MISO,
45-
int8_t BUSY = -1);
46-
Adafruit_IL0373(int width, int height, int8_t DC, int8_t RST, int8_t CS,
47-
int8_t SRCS, int8_t BUSY = -1, SPIClass *spi = &SPI);
43+
Adafruit_IL0373(int width, int height, int16_t SID, int16_t SCLK, int16_t DC,
44+
int16_t RST, int16_t CS, int16_t SRCS, int16_t MISO,
45+
int16_t BUSY = -1);
46+
Adafruit_IL0373(int width, int height, int16_t DC, int16_t RST, int16_t CS,
47+
int16_t SRCS, int16_t BUSY = -1, SPIClass *spi = &SPI);
4848

4949
void begin(bool reset = true);
5050
void powerUp();

0 commit comments

Comments
 (0)