|
@@ -60,6 +60,7 @@
|
60
|
60
|
#if HAS_GRAPHICAL_LCD && PIN_EXISTS(FSMC_CS)
|
61
|
61
|
|
62
|
62
|
#include "HAL_LCD_com_defines.h"
|
|
63
|
+#include "ultralcd_DOGM.h"
|
63
|
64
|
|
64
|
65
|
#include <string.h>
|
65
|
66
|
|
|
@@ -70,12 +71,12 @@
|
70
|
71
|
extern void LCD_IO_WriteMultiple(uint16_t color, uint32_t count);
|
71
|
72
|
#endif
|
72
|
73
|
|
73
|
|
-#define WIDTH 128
|
74
|
|
-#define HEIGHT 64
|
|
74
|
+#define WIDTH LCD_PIXEL_WIDTH
|
|
75
|
+#define HEIGHT LCD_PIXEL_HEIGHT
|
75
|
76
|
#define PAGE_HEIGHT 8
|
76
|
77
|
|
77
|
|
-#define X_LO 32
|
78
|
|
-#define Y_LO 32
|
|
78
|
+#define X_LO LCD_PIXEL_OFFSET_X
|
|
79
|
+#define Y_LO LCD_PIXEL_OFFSET_Y
|
79
|
80
|
#define X_HI (X_LO + 2 * WIDTH - 1)
|
80
|
81
|
#define Y_HI (Y_LO + 2 * HEIGHT - 1)
|
81
|
82
|
|
|
@@ -142,8 +143,8 @@ static const uint8_t page_first_sequence[] = {
|
142
|
143
|
};
|
143
|
144
|
|
144
|
145
|
static const uint8_t clear_screen_sequence[] = {
|
145
|
|
- U8G_ESC_ADR(0), LCD_COLUMN, U8G_ESC_ADR(1), 0x00, 0x00, 0x01, 0x3F,
|
146
|
|
- U8G_ESC_ADR(0), LCD_ROW, U8G_ESC_ADR(1), 0x00, 0x00, 0x00, 0xEF,
|
|
146
|
+ U8G_ESC_ADR(0), LCD_COLUMN, U8G_ESC_ADR(1), 0x00, 0x00, U8G_ESC_DATA(LCD_FULL_PIXEL_WIDTH),
|
|
147
|
+ U8G_ESC_ADR(0), LCD_ROW, U8G_ESC_ADR(1), 0x00, 0x00, U8G_ESC_DATA(LCD_FULL_PIXEL_HEIGHT),
|
147
|
148
|
U8G_ESC_ADR(0), LCD_WRITE_RAM, U8G_ESC_ADR(1),
|
148
|
149
|
U8G_ESC_END
|
149
|
150
|
};
|