From 05f4033a34a410d87e99f67ac9a120f5cdbcf60f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 23 Jul 2019 23:55:49 -0500
Subject: [PATCH] Prevent a name conflict in u8g impl file
---
.../dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/Marlin/src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp b/Marlin/src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp
index 72ed6c34de..dfd327e2a1 100644
--- a/Marlin/src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp
+++ b/Marlin/src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp
@@ -74,10 +74,10 @@
#define HEIGHT 64
#define PAGE_HEIGHT 8
-#define X_MIN 32
-#define Y_MIN 32
-#define X_MAX (X_MIN + 2 * WIDTH - 1)
-#define Y_MAX (Y_MIN + 2 * HEIGHT - 1)
+#define X_LO 32
+#define Y_LO 32
+#define X_HI (X_LO + 2 * WIDTH - 1)
+#define Y_HI (Y_LO + 2 * HEIGHT - 1)
#define LCD_COLUMN 0x2A /* Colomn address register */
#define LCD_ROW 0x2B /* Row address register */
@@ -112,8 +112,8 @@ static uint32_t lcd_id = 0;
#define U8G_ESC_DATA(x) (uint8_t)(x >> 8), (uint8_t)(x & 0xFF)
static const uint8_t page_first_sequence[] = {
- U8G_ESC_ADR(0), LCD_COLUMN, U8G_ESC_ADR(1), U8G_ESC_DATA(X_MIN), U8G_ESC_DATA(X_MAX),
- U8G_ESC_ADR(0), LCD_ROW, U8G_ESC_ADR(1), U8G_ESC_DATA(Y_MIN), U8G_ESC_DATA(Y_MAX),
+ U8G_ESC_ADR(0), LCD_COLUMN, U8G_ESC_ADR(1), U8G_ESC_DATA(X_LO), U8G_ESC_DATA(X_HI),
+ U8G_ESC_ADR(0), LCD_ROW, U8G_ESC_ADR(1), U8G_ESC_DATA(Y_LO), U8G_ESC_DATA(Y_HI),
U8G_ESC_ADR(0), LCD_WRITE_RAM, U8G_ESC_ADR(1),
U8G_ESC_END
};