|
@@ -1,6 +1,6 @@
|
1
|
1
|
/**
|
2
|
2
|
* Marlin 3D Printer Firmware
|
3
|
|
- * Copyright (C) 2016, 2017 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
|
3
|
+ * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
4
|
4
|
*
|
5
|
5
|
* Based on Sprinter and grbl.
|
6
|
6
|
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
|
|
@@ -54,15 +54,15 @@
|
54
|
54
|
#define CPU_ST7920_DELAY_1 DELAY_0_NOP
|
55
|
55
|
#define CPU_ST7920_DELAY_2 DELAY_0_NOP
|
56
|
56
|
#define CPU_ST7920_DELAY_3 DELAY_1_NOP
|
57
|
|
-#elif (MOTHERBOARD == BOARD_3DRAG) || (MOTHERBOARD == BOARD_K8200) || (MOTHERBOARD == BOARD_K8400)
|
|
57
|
+#elif MB(3DRAG) || MB(K8200) || MB(K8400) || MB(SILVER_GATE)
|
58
|
58
|
#define CPU_ST7920_DELAY_1 DELAY_0_NOP
|
59
|
59
|
#define CPU_ST7920_DELAY_2 DELAY_3_NOP
|
60
|
60
|
#define CPU_ST7920_DELAY_3 DELAY_0_NOP
|
61
|
|
-#elif (MOTHERBOARD == BOARD_MINIRAMBO)
|
|
61
|
+#elif MB(MINIRAMBO)
|
62
|
62
|
#define CPU_ST7920_DELAY_1 DELAY_0_NOP
|
63
|
63
|
#define CPU_ST7920_DELAY_2 DELAY_4_NOP
|
64
|
64
|
#define CPU_ST7920_DELAY_3 DELAY_0_NOP
|
65
|
|
-#elif (MOTHERBOARD == BOARD_RAMBO)
|
|
65
|
+#elif MB(RAMBO)
|
66
|
66
|
#define CPU_ST7920_DELAY_1 DELAY_0_NOP
|
67
|
67
|
#define CPU_ST7920_DELAY_2 DELAY_0_NOP
|
68
|
68
|
#define CPU_ST7920_DELAY_3 DELAY_0_NOP
|
|
@@ -101,7 +101,7 @@ static void ST7920_WRITE_BYTE(uint8_t val) {
|
101
|
101
|
|
102
|
102
|
#define ST7920_SET_CMD() { ST7920_WRITE_BYTE(0xF8); U8G_DELAY(); }
|
103
|
103
|
#define ST7920_SET_DAT() { ST7920_WRITE_BYTE(0xFA); U8G_DELAY(); }
|
104
|
|
-#define ST7920_WRITE_NIBBLES(a) { ST7920_WRITE_BYTE((uint8_t)((a)&0xF0u)); ST7920_WRITE_BYTE((uint8_t)((a)<<4u)); U8G_DELAY(); }
|
|
104
|
+#define ST7920_WRITE_NIBBLES(a) { ST7920_WRITE_BYTE((uint8_t)((a)&0xF0u)); ST7920_WRITE_BYTE((uint8_t)((a)<<4u)); U8G_DELAY(); }
|
105
|
105
|
#define ST7920_WRITE_NIBBLES_P(p,l) { for (uint8_t i = l + 1; --i;) { ST7920_WRITE_BYTE(*p&0xF0); ST7920_WRITE_BYTE(*p<<4); p++; } U8G_DELAY(); }
|
106
|
106
|
|
107
|
107
|
|
|
@@ -137,10 +137,10 @@ uint8_t u8g_dev_rrd_st7920_128x64_fn(u8g_t *u8g, u8g_dev_t *dev, uint8_t msg, vo
|
137
|
137
|
ST7920_NCS();
|
138
|
138
|
}
|
139
|
139
|
break;
|
140
|
|
- case U8G_DEV_MSG_STOP:
|
141
|
|
- break;
|
142
|
|
- case U8G_DEV_MSG_PAGE_NEXT: {
|
143
|
140
|
|
|
141
|
+ case U8G_DEV_MSG_STOP: break;
|
|
142
|
+
|
|
143
|
+ case U8G_DEV_MSG_PAGE_NEXT: {
|
144
|
144
|
uint8_t* ptr;
|
145
|
145
|
u8g_pb_t* pb = (u8g_pb_t*)(dev->dev_mem);
|
146
|
146
|
y = pb->p.page_y0;
|
|
@@ -161,7 +161,6 @@ uint8_t u8g_dev_rrd_st7920_128x64_fn(u8g_t *u8g, u8g_dev_t *dev, uint8_t msg, vo
|
161
|
161
|
ST7920_WRITE_NIBBLES_P(ptr, (LCD_PIXEL_WIDTH) / 8); //ptr is incremented inside of macro
|
162
|
162
|
y++;
|
163
|
163
|
}
|
164
|
|
-
|
165
|
164
|
ST7920_NCS();
|
166
|
165
|
}
|
167
|
166
|
break;
|