Browse Source

Prevent a name conflict in u8g impl file

Scott Lahteine 6 years ago
parent
commit
05f4033a34
1 changed files with 6 additions and 6 deletions
  1. 6
    6
      Marlin/src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp

+ 6
- 6
Marlin/src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp View File

@@ -74,10 +74,10 @@
74 74
 #define HEIGHT 64
75 75
 #define PAGE_HEIGHT 8
76 76
 
77
-#define X_MIN 32
78
-#define Y_MIN 32
79
-#define X_MAX (X_MIN + 2 * WIDTH  - 1)
80
-#define Y_MAX (Y_MIN + 2 * HEIGHT - 1)
77
+#define X_LO 32
78
+#define Y_LO 32
79
+#define X_HI (X_LO + 2 * WIDTH  - 1)
80
+#define Y_HI (Y_LO + 2 * HEIGHT - 1)
81 81
 
82 82
 #define LCD_COLUMN      0x2A   /* Colomn address register */
83 83
 #define LCD_ROW         0x2B   /* Row address register */
@@ -112,8 +112,8 @@ static uint32_t lcd_id = 0;
112 112
 #define U8G_ESC_DATA(x) (uint8_t)(x >> 8), (uint8_t)(x & 0xFF)
113 113
 
114 114
 static const uint8_t page_first_sequence[] = {
115
-  U8G_ESC_ADR(0), LCD_COLUMN, U8G_ESC_ADR(1), U8G_ESC_DATA(X_MIN), U8G_ESC_DATA(X_MAX),
116
-  U8G_ESC_ADR(0), LCD_ROW,    U8G_ESC_ADR(1), U8G_ESC_DATA(Y_MIN), U8G_ESC_DATA(Y_MAX),
115
+  U8G_ESC_ADR(0), LCD_COLUMN, U8G_ESC_ADR(1), U8G_ESC_DATA(X_LO), U8G_ESC_DATA(X_HI),
116
+  U8G_ESC_ADR(0), LCD_ROW,    U8G_ESC_ADR(1), U8G_ESC_DATA(Y_LO), U8G_ESC_DATA(Y_HI),
117 117
   U8G_ESC_ADR(0), LCD_WRITE_RAM, U8G_ESC_ADR(1),
118 118
   U8G_ESC_END
119 119
 };

Loading…
Cancel
Save