From e74d77dc44baac4aaa820d9cb08f319d8e309f8f Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Tue, 9 Jul 2024 15:11:11 -0500 Subject: [PATCH] Fix macros --- .../heltec_vision_master_e213/platformio.ini | 24 +++++++++---------- .../heltec_vision_master_e290/pins_arduino.h | 2 -- .../heltec_vision_master_e290/platformio.ini | 10 ++++---- .../heltec_vision_master_t190/pins_arduino.h | 2 -- .../heltec_vision_master_t190/platformio.ini | 4 ++-- 5 files changed, 19 insertions(+), 23 deletions(-) diff --git a/variants/heltec_vision_master_e213/platformio.ini b/variants/heltec_vision_master_e213/platformio.ini index 1044974c0..77cc65983 100644 --- a/variants/heltec_vision_master_e213/platformio.ini +++ b/variants/heltec_vision_master_e213/platformio.ini @@ -3,19 +3,19 @@ extends = esp32s3_base board = heltec_wifi_lora_32_V3 build_flags = ${esp32s3_base.build_flags} - -I variants/heltec_vision_master_e213 - -D HELTEC_VISION_MASTER_E213 - -D EINK_DISPLAY_MODEL=GxEPD2_213_FC1 - -D EINK_WIDTH=250 - -D EINK_HEIGHT=122 - -D USE_EINK_DYNAMICDISPLAY ; Enable Dynamic EInk - -D EINK_LIMIT_FASTREFRESH=10 ; How many consecutive fast-refreshes are permitted - -D EINK_LIMIT_RATE_BACKGROUND_SEC=30 ; Minimum interval between BACKGROUND updates - -D EINK_LIMIT_RATE_RESPONSIVE_SEC=1 ; Minimum interval between RESPONSIVE updates + -Ivariants/heltec_vision_master_e213 + -DHELTEC_VISION_MASTER_E213 + -DEINK_DISPLAY_MODEL=GxEPD2_213_FC1 + -DEINK_WIDTH=250 + -DEINK_HEIGHT=122 + -DUSE_EINK_DYNAMICDISPLAY ; Enable Dynamic EInk + -DEINK_LIMIT_FASTREFRESH=10 ; How many consecutive fast-refreshes are permitted + -DEINK_LIMIT_RATE_BACKGROUND_SEC=30 ; Minimum interval between BACKGROUND updates + -DEINK_LIMIT_RATE_RESPONSIVE_SEC=1 ; Minimum interval between RESPONSIVE updates ; -D EINK_LIMIT_GHOSTING_PX=2000 ; (Optional) How much image ghosting is tolerated - -D EINK_BACKGROUND_USES_FAST ; (Optional) Use FAST refresh for both BACKGROUND and RESPONSIVE, until a limit is reached. - -D EINK_HASQUIRK_GHOSTING ; Display model is identified as "prone to ghosting" - -D EINK_HASQUIRK_WEAKFASTREFRESH ; Pixels set with fast-refresh are easy to clear, disrupted by sunlight + -DEINK_BACKGROUND_USES_FAST ; (Optional) Use FAST refresh for both BACKGROUND and RESPONSIVE, until a limit is reached. + -DEINK_HASQUIRK_GHOSTING ; Display model is identified as "prone to ghosting" + -DEINK_HASQUIRK_WEAKFASTREFRESH ; Pixels set with fast-refresh are easy to clear, disrupted by sunlight lib_deps = ${esp32s3_base.lib_deps} https://github.com/meshtastic/GxEPD2#b202ebfec6a4821e098cf7a625ba0f6f2400292d diff --git a/variants/heltec_vision_master_e290/pins_arduino.h b/variants/heltec_vision_master_e290/pins_arduino.h index a9b474c31..e5d507846 100644 --- a/variants/heltec_vision_master_e290/pins_arduino.h +++ b/variants/heltec_vision_master_e290/pins_arduino.h @@ -3,8 +3,6 @@ #include -#define HELTEC_VISION_MASTER_E290 true - static const uint8_t LED_BUILTIN = 35; #define BUILTIN_LED LED_BUILTIN // backward compatibility #define LED_BUILTIN LED_BUILTIN diff --git a/variants/heltec_vision_master_e290/platformio.ini b/variants/heltec_vision_master_e290/platformio.ini index fa89af32b..8deecf628 100644 --- a/variants/heltec_vision_master_e290/platformio.ini +++ b/variants/heltec_vision_master_e290/platformio.ini @@ -3,11 +3,11 @@ extends = esp32s3_base board = heltec_wifi_lora_32_V3 build_flags = ${esp32s3_base.build_flags} - -I variants/heltec_vision_master_e290 - -D HELTEC_VISION_MASTER_E290 - -D EINK_DISPLAY_MODEL=GxEPD2_290_BS - -D EINK_WIDTH=296 - -D EINK_HEIGHT=128 + -Ivariants/heltec_vision_master_e290 + -DHELTEC_VISION_MASTER_E290 + -DEINK_DISPLAY_MODEL=GxEPD2_290_BS + -DEINK_WIDTH=296 + -DEINK_HEIGHT=128 ; -D USE_EINK_DYNAMICDISPLAY ; Enable Dynamic EInk ; -D EINK_LIMIT_FASTREFRESH=10 ; How many consecutive fast-refreshes are permitted ; -D EINK_LIMIT_RATE_BACKGROUND_SEC=1 ; Minimum interval between BACKGROUND updates diff --git a/variants/heltec_vision_master_t190/pins_arduino.h b/variants/heltec_vision_master_t190/pins_arduino.h index 473187a02..e5d507846 100644 --- a/variants/heltec_vision_master_t190/pins_arduino.h +++ b/variants/heltec_vision_master_t190/pins_arduino.h @@ -3,8 +3,6 @@ #include -#define HELTEC_VISION_MASTER_T190 true - static const uint8_t LED_BUILTIN = 35; #define BUILTIN_LED LED_BUILTIN // backward compatibility #define LED_BUILTIN LED_BUILTIN diff --git a/variants/heltec_vision_master_t190/platformio.ini b/variants/heltec_vision_master_t190/platformio.ini index 7ed64f5e0..bbaa0075c 100644 --- a/variants/heltec_vision_master_t190/platformio.ini +++ b/variants/heltec_vision_master_t190/platformio.ini @@ -3,8 +3,8 @@ extends = esp32s3_base board = heltec_wifi_lora_32_V3 build_flags = ${esp32s3_base.build_flags} - -I variants/heltec_vision_master_t190 - -D PRIVATE_HW + -Ivariants/heltec_vision_master_t190 + -DHELTEC_VISION_MASTER_T190 ; -D PRIVATE_HW lib_deps = ${esp32s3_base.lib_deps}