fix: remove duplicate macros from variant.h

meshtastic · Feb 28, 2024 · 78e3b54 · 78e3b54
1 parent 87367b8
commit 78e3b54
Show file tree

Hide file tree

Showing 11 changed files with 1 addition and 97 deletions.
diff --git a/variants/Dongle_nRF52840-pca10059-v1/variant.h b/variants/Dongle_nRF52840-pca10059-v1/variant.h
@@ -122,10 +122,6 @@ static const uint8_t SCK = PIN_SPI_SCK;
 #define PIN_EINK_SCLK (9)   // EPD_SCLK
 #define PIN_EINK_MOSI (10)  // EPD_MOSI
 
-#define EINK_DISPLAY_MODEL GxEPD2_420_M01 // 4.2 inch 300x400
-#define EINK_WIDTH 300
-#define EINK_HEIGHT 400
-
 #define USE_EINK
 
 /*

diff --git a/variants/MakePython_nRF52840_eink/variant.h b/variants/MakePython_nRF52840_eink/variant.h
@@ -102,10 +102,6 @@ static const uint8_t SCK = PIN_SPI_SCK;
 #define PIN_EINK_SCLK (0 + 2)   // EPD_SCLK
 #define PIN_EINK_MOSI (0 + 28)  // EPD_MOSI
 
-#define EINK_DISPLAY_MODEL GxEPD2_290_T5D // 2.9 inch 296x128
-#define EINK_WIDTH 296
-#define EINK_HEIGHT 128
-
 #define USE_EINK
 
 /*

diff --git a/variants/heltec_wireless_paper/variant.h b/variants/heltec_wireless_paper/variant.h
@@ -15,10 +15,6 @@
 #define PIN_EINK_SCLK 3
 #define PIN_EINK_MOSI 2
 
-#define EINK_DISPLAY_MODEL GxEPD2_213_FC1
-#define EINK_WIDTH 250
-#define EINK_HEIGHT 122
-
 /*
  * SPI interfaces
  */

diff --git a/variants/heltec_wireless_paper_v1/variant.h b/variants/heltec_wireless_paper_v1/variant.h
@@ -16,10 +16,6 @@
 #define PIN_EINK_SCLK 3
 #define PIN_EINK_MOSI 2
 
-#define EINK_DISPLAY_MODEL GxEPD2_213_BN
-#define EINK_WIDTH 250
-#define EINK_HEIGHT 122
-
 /*
  * SPI interfaces
  */

diff --git a/variants/m5stack_coreink/variant.h b/variants/m5stack_coreink/variant.h
@@ -93,10 +93,6 @@
 #define PIN_EINK_SCLK 18 // EPD_SCLK
 #define PIN_EINK_MOSI 23 // EPD_MOSI
 
-#define EINK_DISPLAY_MODEL GxEPD2_154_M09 // 1.54 inch
-#define EINK_WIDTH 200
-#define EINK_HEIGHT 200
-
 #define BATTERY_PIN 35
 #define ADC_CHANNEL ADC1_GPIO35_CHANNEL
 // https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/schematic/Core/m5paper/M5_PAPER_SCH.pdf

diff --git a/variants/monteops_hw1/platformio.ini b/variants/monteops_hw1/platformio.ini
@@ -1,4 +1,4 @@
-; MonteOps M.Node/M.Backbone/M.Eagle hardware based on hardware variant #1 ( based)
+; MonteOps M.Node/M.Backbone/M.Eagle hardware based on hardware variant #1 (RAK4630 based)
 [env:monteops_hw1]
 extends = nrf52840_base
 board = wiscore_rak4631

diff --git a/variants/rak10701/variant.h b/variants/rak10701/variant.h
@@ -133,24 +133,6 @@ static const uint8_t SCK = PIN_SPI_SCK;
 #define PIN_EINK_SCLK (0 + 3)
 #define PIN_EINK_MOSI (0 + 30) // also called SDI
 
-// E-Ink model selection
-
-#define EINK_DISPLAY_MODEL GxEPD2_213_BN // 2.13 inch b/w 250x122
-#define EINK_WIDTH 250
-#define EINK_HEIGHT 122
-
-// #define EINK_DISPLAY_MODEL GxEPD2_420_M01 // 4.2 inch 300x400
-// #define EINK_WIDTH 300
-// #define EINK_HEIGHT 400
-
-// #define EINK_DISPLAY_MODEL GxEPD2_290_T5D // 2.9 inch 296x128
-// #define EINK_WIDTH 296
-// #define EINK_HEIGHT 128
-
-// #define EINK_DISPLAY_MODEL GxEPD2_154_M09 // 1.54 inch 200x200
-// #define EINK_WIDTH 200
-// #define EINK_HEIGHT 200
-
 // Controls power for the eink display - Board power is enabled either by VBUS from USB or the CPU asserting PWR_ON
 // FIXME - I think this is actually just the board power enable - it enables power to the CPU also
 // #define PIN_EINK_PWR_ON (-1)

diff --git a/variants/rak4631/variant.h b/variants/rak4631/variant.h
@@ -133,24 +133,6 @@ static const uint8_t SCK = PIN_SPI_SCK;
 #define PIN_EINK_SCLK (0 + 3)
 #define PIN_EINK_MOSI (0 + 30) // also called SDI
 
-// E-Ink model selection
-
-#define EINK_DISPLAY_MODEL GxEPD2_213_BN // 2.13 inch b/w 250x122
-#define EINK_WIDTH 250
-#define EINK_HEIGHT 122
-
-// #define EINK_DISPLAY_MODEL GxEPD2_420_M01 // 4.2 inch 300x400
-// #define EINK_WIDTH 300
-// #define EINK_HEIGHT 400
-
-// #define EINK_DISPLAY_MODEL GxEPD2_290_T5D // 2.9 inch 296x128
-// #define EINK_WIDTH 296
-// #define EINK_HEIGHT 128
-
-// #define EINK_DISPLAY_MODEL GxEPD2_154_M09 // 1.54 inch 200x200
-// #define EINK_WIDTH 200
-// #define EINK_HEIGHT 200
-
 // Controls power for the eink display - Board power is enabled either by VBUS from USB or the CPU asserting PWR_ON
 // FIXME - I think this is actually just the board power enable - it enables power to the CPU also
 // #define PIN_EINK_PWR_ON (-1)

diff --git a/variants/rak4631_epaper/variant.h b/variants/rak4631_epaper/variant.h
@@ -133,24 +133,6 @@ static const uint8_t SCK = PIN_SPI_SCK;
 #define PIN_EINK_SCLK (0 + 3)
 #define PIN_EINK_MOSI (0 + 30) // also called SDI
 
-// E-Ink model selection
-
-#define EINK_DISPLAY_MODEL GxEPD2_213_BN // 2.13 inch b/w 250x122
-#define EINK_WIDTH 250
-#define EINK_HEIGHT 122
-
-// #define EINK_DISPLAY_MODEL GxEPD2_420_M01 // 4.2 inch 300x400
-// #define EINK_WIDTH 300
-// #define EINK_HEIGHT 400
-
-// #define EINK_DISPLAY_MODEL GxEPD2_290_T5D // 2.9 inch 296x128
-// #define EINK_WIDTH 296
-// #define EINK_HEIGHT 128
-
-// #define EINK_DISPLAY_MODEL GxEPD2_154_M09 // 1.54 inch 200x200
-// #define EINK_WIDTH 200
-// #define EINK_HEIGHT 200
-
 // Controls power for the eink display - Board power is enabled either by VBUS from USB or the CPU asserting PWR_ON
 // FIXME - I think this is actually just the board power enable - it enables power to the CPU also
 // #define PIN_EINK_PWR_ON (-1)

diff --git a/variants/rak4631_epaper_onrxtx/variant.h b/variants/rak4631_epaper_onrxtx/variant.h
@@ -119,24 +119,6 @@ static const uint8_t SCK = PIN_SPI_SCK;
 #define PIN_EINK_SCLK (0 + 14) // SCL
 #define PIN_EINK_MOSI (0 + 13) // SDA
 
-// E-Ink model selection
-
-#define EINK_DISPLAY_MODEL GxEPD2_213_BN // 2.13 inch b/w 250x122
-#define EINK_WIDTH 250
-#define EINK_HEIGHT 122
-
-// #define EINK_DISPLAY_MODEL GxEPD2_420_M01 // 4.2 inch 300x400
-// #define EINK_WIDTH 300
-// #define EINK_HEIGHT 400
-
-// #define EINK_DISPLAY_MODEL GxEPD2_290_T5D // 2.9 inch 296x128
-// #define EINK_WIDTH 296
-// #define EINK_HEIGHT 128
-
-// #define EINK_DISPLAY_MODEL GxEPD2_154_M09 // 1.54 inch 200x200
-// #define EINK_WIDTH 200
-// #define EINK_HEIGHT 200
-
 // Controls power for the eink display - Board power is enabled either by VBUS from USB or the CPU asserting PWR_ON
 // FIXME - I think this is actually just the board power enable - it enables power to the CPU also
 // #define PIN_EINK_PWR_ON (-1)

diff --git a/variants/t-echo/variant.h b/variants/t-echo/variant.h
@@ -155,10 +155,6 @@ External serial flash WP25R1635FZUIL0
 #define PIN_EINK_SCLK (0 + 31)
 #define PIN_EINK_MOSI (0 + 29) // also called SDI
 
-#define EINK_DISPLAY_MODEL GxEPD2_154_D67
-#define EINK_WIDTH 200
-#define EINK_HEIGHT 200
-
 // Controls power for the eink display - Board power is enabled either by VBUS from USB or the CPU asserting PWR_ON
 // FIXME - I think this is actually just the board power enable - it enables power to the CPU also
 #define PIN_EINK_PWR_ON (0 + 12)