Skip to content

Commit 5440c36

Browse files
committed
move EPD_RAM_BW / EPD_RAM_RED into c file to prevent redefine warnings
1 parent 1cae7b8 commit 5440c36

22 files changed

+31
-31
lines changed

src/drivers/Adafruit_IL0373.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#include "Adafruit_IL0373.h"
22
#include "Adafruit_EPD.h"
33

4+
#define EPD_RAM_BW IL0373_DTM1
5+
#define EPD_RAM_RED IL0373_DTM2
6+
47
#define BUSY_WAIT 100
58

69
// clang-format off

src/drivers/Adafruit_IL0373.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@
3232
#define IL0373_PARTIAL_ENTER 0x91
3333
#define IL0373_PARTIAL_EXIT 0x92
3434

35-
#define EPD_RAM_BW IL0373_DTM1
36-
#define EPD_RAM_RED IL0373_DTM2
37-
3835
/**************************************************************************/
3936
/*!
4037
@brief Class for interfacing with IL0373 EPD drivers

src/drivers/Adafruit_IL0398.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#include "Adafruit_IL0398.h"
22
#include "Adafruit_EPD.h"
33

4+
#define EPD_RAM_BW 0x10
5+
#define EPD_RAM_RED 0x13
6+
47
#define BUSY_WAIT 500
58

69
// clang-format off

src/drivers/Adafruit_IL0398.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
#include "Adafruit_EPD.h"
55
#include <Arduino.h>
66

7-
#define EPD_RAM_BW 0x10
8-
#define EPD_RAM_RED 0x13
9-
107
#define IL0398_PANEL_SETTING 0x00
118
#define IL0398_POWER_SETTING 0x01
129
#define IL0398_POWER_OFF 0x02

src/drivers/Adafruit_IL91874.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#include "Adafruit_IL91874.h"
22
#include "Adafruit_EPD.h"
33

4+
#define EPD_RAM_BW 0x10
5+
#define EPD_RAM_RED 0x13
6+
47
#define BUSY_WAIT 500
58

69
// clang-format off

src/drivers/Adafruit_IL91874.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
#include "Adafruit_EPD.h"
55
#include <Arduino.h>
66

7-
#define EPD_RAM_BW 0x10
8-
#define EPD_RAM_RED 0x13
9-
107
#define IL91874_PANEL_SETTING 0x00
118
#define IL91874_POWER_SETTING 0x01
129
#define IL91874_POWER_OFF 0x02

src/drivers/Adafruit_SSD1608.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#include "Adafruit_SSD1608.h"
22
#include "Adafruit_EPD.h"
33

4+
#define EPD_RAM_BW 0x10
5+
46
#define BUSY_WAIT 500
57

68
const unsigned char LUT_DATA[30] = {

src/drivers/Adafruit_SSD1608.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
#include "Adafruit_EPD.h"
55
#include <Arduino.h>
66

7-
#define EPD_RAM_BW 0x10
8-
97
#define SSD1608_DRIVER_CONTROL 0x01
108
#define SSD1608_GATE_VOLTAGE 0x03
119
#define SSD1608_SOURCE_VOLTAGE 0x04

src/drivers/Adafruit_SSD1619.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#include "Adafruit_SSD1619.h"
22
#include "Adafruit_EPD.h"
33

4+
#define EPD_RAM_BW 0x10
5+
#define EPD_RAM_RED 0x13
6+
47
#define BUSY_WAIT 500
58

69
// clang-format off

src/drivers/Adafruit_SSD1619.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
#include "Adafruit_EPD.h"
55
#include <Arduino.h>
66

7-
#define EPD_RAM_BW 0x10
8-
#define EPD_RAM_RED 0x13
9-
107
#define SSD1619_DRIVER_CONTROL 0x01
118
#define SSD1619_GATE_VOLTAGE 0x03
129
#define SSD1619_SOURCE_VOLTAGE 0x04

0 commit comments

Comments
 (0)