瀏覽代碼

FYSETC_242 OLED 12864 for S6 (#20767)

George Fu 4 年之前
父節點
當前提交
fec58157ac
沒有連結到貢獻者的電子郵件帳戶。

+ 13
- 0
Marlin/src/lcd/dogm/HAL_LCD_class_defines.h 查看文件

@@ -107,3 +107,16 @@ public:
107 107
     : U8GLIB(&u8g_dev_uc1701_mini12864_HAL_2x_hw_spi, cs, a0, reset)
108 108
     { }
109 109
 };
110
+
111
+extern u8g_dev_t u8g_dev_ssd1309_sw_spi;
112
+extern u8g_dev_t u8g_dev_ssd1309_hw_spi;
113
+
114
+class U8GLIB_SSD1309_128X64_HAL : public U8GLIB {
115
+public:
116
+  U8GLIB_SSD1309_128X64_HAL(pin_t sck, pin_t mosi, pin_t cs, pin_t a0, pin_t reset = U8G_PIN_NONE)
117
+    : U8GLIB(&u8g_dev_ssd1309_sw_spi, (uint8_t)sck, (uint8_t)mosi, (uint8_t)cs, (uint8_t)a0, (uint8_t)reset)
118
+    { }
119
+  U8GLIB_SSD1309_128X64_HAL(pin_t cs, pin_t a0, pin_t reset = U8G_PIN_NONE)
120
+    : U8GLIB(&u8g_dev_ssd1309_hw_spi, (uint8_t)cs, (uint8_t)a0, (uint8_t)reset)
121
+    { }
122
+};

+ 2
- 0
Marlin/src/lcd/dogm/HAL_LCD_com_defines.h 查看文件

@@ -52,7 +52,9 @@
52 52
 
53 53
   #elif defined(ARDUINO_ARCH_STM32)
54 54
 
55
+    uint8_t u8g_com_std_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
55 56
     uint8_t u8g_com_stm32duino_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
57
+    #define U8G_COM_HAL_SW_SPI_FN     u8g_com_std_sw_spi_fn
56 58
     #define U8G_COM_HAL_HW_SPI_FN     u8g_com_stm32duino_hw_spi_fn
57 59
 
58 60
   #elif defined(__AVR__)

+ 13
- 3
Marlin/src/lcd/dogm/marlinui_DOGM.h 查看文件

@@ -110,11 +110,9 @@
110 110
     #define U8G_CLASS U8GLIB_MINI12864_2X                       // 8 stripes (HW-SPI)
111 111
   #endif
112 112
 
113
-#elif EITHER(MKS_12864OLED_SSD1306, FYSETC_242_OLED_12864)
113
+#elif ENABLED(MKS_12864OLED_SSD1306)
114 114
 
115 115
   // MKS 128x64 (SSD1306) OLED I2C LCD
116
-  // - or -
117
-  // FYSETC OLED 2.42" 128 × 64 FULL GRAPHICS CONTROLLER
118 116
 
119 117
   #define FORCE_SOFT_SPI                                        // SW-SPI
120 118
 
@@ -124,6 +122,18 @@
124 122
     #define U8G_CLASS U8GLIB_SSD1306_128X64                     // 8 stripes
125 123
   #endif
126 124
 
125
+#elif ENABLED(FYSETC_242_OLED_12864)
126
+
127
+  // FYSETC OLED 2.42" 128 × 64 FULL GRAPHICS CONTROLLER
128
+
129
+  #define FORCE_SOFT_SPI                                        // SW-SPI
130
+
131
+  #if ENABLED(ALTERNATIVE_LCD)
132
+    #define U8G_CLASS U8GLIB_SSD1306_128X64_2X                  // 4 stripes
133
+  #else
134
+    #define U8G_CLASS U8GLIB_SSD1309_128X64_HAL
135
+  #endif
136
+
127 137
 #elif ENABLED(ZONESTAR_12864OLED_SSD1306)
128 138
 
129 139
   // Zonestar SSD1306 OLED SPI LCD

+ 128
- 0
Marlin/src/lcd/dogm/u8g_dev_ssd1309_12864.cpp 查看文件

@@ -0,0 +1,128 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
+ *
5
+ * Based on Sprinter and grbl.
6
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
7
+ *
8
+ * This program is free software: you can redistribute it and/or modify
9
+ * it under the terms of the GNU General Public License as published by
10
+ * the Free Software Foundation, either version 3 of the License, or
11
+ * (at your option) any later version.
12
+ *
13
+ * This program is distributed in the hope that it will be useful,
14
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
15
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
16
+ * GNU General Public License for more details.
17
+ *
18
+ * You should have received a copy of the GNU General Public License
19
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
20
+ *
21
+ */
22
+#include "../../inc/MarlinConfigPre.h"
23
+
24
+#if HAS_MARLINUI_U8GLIB
25
+
26
+#include "HAL_LCD_com_defines.h"
27
+#include <U8glib.h>
28
+
29
+#define WIDTH 128
30
+#define HEIGHT 64
31
+#define PAGE_HEIGHT 8
32
+
33
+// SSD1309 init sequence
34
+static const uint8_t u8g_dev_ssd1309_128x64_init_seq[] PROGMEM = {
35
+  U8G_ESC_CS(0),  // Disable chip
36
+  U8G_ESC_ADR(0), // Instruction mode
37
+  U8G_ESC_RST(1), // Do reset low pulse with (1*16)+2 milliseconds
38
+  U8G_ESC_CS(1),  // Enable chip
39
+
40
+  0xFD,0x12,      // Command Lock
41
+  0xAE,           // Set Display Off
42
+  0xD5,0xA0,      // Set Display Clock Divide Ratio/Oscillator Frequency
43
+  0xA8,0x3F,      // Set Multiplex Ratio
44
+  0x3D,0x00,      // Set Display Offset
45
+  0x40,           // Set Display Start Line
46
+  0xA1,           // Set Segment Re-Map
47
+  0xC8,           // Set COM Output Scan Direction
48
+  0xDA,0x12,      // Set COM Pins Hardware Configuration
49
+  0x81,0xDF,      // Set Current Control
50
+  0xD9,0x82,      // Set Pre-Charge Period
51
+  0xDB,0x34,      // Set VCOMH Deselect Level
52
+  0xA4,           // Set Entire Display On/Off
53
+  0xA6,           // Set Normal/Inverse Display
54
+  U8G_ESC_VCC(1), // Power up VCC & Stabilized
55
+  U8G_ESC_DLY(50),
56
+  0xAF,           // Set Display On
57
+  U8G_ESC_DLY(50),
58
+  U8G_ESC_CS(0),  // Disable chip
59
+  U8G_ESC_END     // End of sequence
60
+};
61
+
62
+// Select one init sequence here
63
+#define u8g_dev_ssd1309_128x64_init_seq u8g_dev_ssd1309_128x64_init_seq
64
+
65
+static const uint8_t u8g_dev_ssd1309_128x64_data_start[] PROGMEM = {
66
+  U8G_ESC_ADR(0),   // Instruction mode
67
+  U8G_ESC_CS(1),    // Enable chip
68
+  0x010,            // Set upper 4 bit of the col adr to 0
69
+  0x000,            // Set lower 4 bit of the col adr to 4
70
+  U8G_ESC_END       // End of sequence
71
+};
72
+
73
+static const uint8_t u8g_dev_ssd13xx_sleep_on[] PROGMEM = {
74
+  U8G_ESC_ADR(0),   // Instruction mode
75
+  U8G_ESC_CS(1),    // Enable chip
76
+  0x0AE,            // Display off
77
+  U8G_ESC_CS(0),    // Disable chip
78
+  U8G_ESC_END       // End of sequence
79
+};
80
+
81
+static const uint8_t u8g_dev_ssd13xx_sleep_off[] PROGMEM = {
82
+  U8G_ESC_ADR(0),   // Instruction mode
83
+  U8G_ESC_CS(1),    // Enable chip
84
+  0x0AF,            // Display on
85
+  U8G_ESC_DLY(50),  // Delay 50 ms
86
+  U8G_ESC_CS(0),    // Disable chip
87
+  U8G_ESC_END       // End of sequence
88
+};
89
+
90
+uint8_t u8g_dev_ssd1309_128x64_fn(u8g_t *u8g, u8g_dev_t *dev, uint8_t msg, void *arg) {
91
+  switch(msg) {
92
+    case U8G_DEV_MSG_INIT:
93
+      u8g_InitCom(u8g, dev, U8G_SPI_CLK_CYCLE_300NS);
94
+      u8g_WriteEscSeqP(u8g, dev, u8g_dev_ssd1309_128x64_init_seq);
95
+      break;
96
+    case U8G_DEV_MSG_STOP:
97
+      break;
98
+    case U8G_DEV_MSG_PAGE_NEXT: {
99
+      u8g_pb_t *pb = (u8g_pb_t *)(dev->dev_mem);
100
+      u8g_WriteEscSeqP(u8g, dev, u8g_dev_ssd1309_128x64_data_start);
101
+      u8g_WriteByte(u8g, dev, 0x0B0 | pb->p.page);  // Select current page (SSD1306)
102
+      u8g_SetAddress(u8g, dev, 1);                  // Data mode
103
+      if (u8g_pb_WriteBuffer(pb, u8g, dev) == 0) return 0;
104
+      u8g_SetChipSelect(u8g, dev, 0);
105
+    }
106
+    break;
107
+    case U8G_DEV_MSG_CONTRAST:
108
+      u8g_SetChipSelect(u8g, dev, 1);
109
+      u8g_SetAddress(u8g, dev, 0);                  // Instruction mode
110
+      u8g_WriteByte(u8g, dev, 0x081);
111
+      u8g_WriteByte(u8g, dev, (*(uint8_t *)arg) );  // 11 Jul 2015: fixed contrast calculation
112
+      u8g_SetChipSelect(u8g, dev, 0);
113
+      return 1;
114
+    case U8G_DEV_MSG_SLEEP_ON:
115
+      u8g_WriteEscSeqP(u8g, dev, u8g_dev_ssd13xx_sleep_on);
116
+      return 1;
117
+    case U8G_DEV_MSG_SLEEP_OFF:
118
+      u8g_WriteEscSeqP(u8g, dev, u8g_dev_ssd13xx_sleep_off);
119
+      return 1;
120
+  }
121
+  return u8g_dev_pb8v1_base_fn(u8g, dev, msg, arg);
122
+}
123
+
124
+uint8_t u8g_dev_ssd1309_buf[WIDTH*2] U8G_NOCOMMON ;
125
+u8g_pb_t u8g_dev_ssd1309_pb = { {8, HEIGHT, 0, 0, 0},  WIDTH, u8g_dev_ssd1309_buf};
126
+u8g_dev_t u8g_dev_ssd1309_sw_spi = { u8g_dev_ssd1309_128x64_fn, &u8g_dev_ssd1309_pb, U8G_COM_HAL_SW_SPI_FN };
127
+
128
+#endif // HAS_MARLINUI_U8GLIB

+ 36
- 23
Marlin/src/pins/stm32f4/pins_FYSETC_S6.h 查看文件

@@ -198,7 +198,27 @@
198 198
 //
199 199
 // LCD / Controller
200 200
 //
201
-#if HAS_WIRED_LCD
201
+#if ENABLED(FYSETC_242_OLED_12864)
202
+
203
+  #define BTN_EN1                           PC9
204
+  #define BTN_EN2                           PD1
205
+  #define BTN_ENC                           PA8
206
+
207
+  #define BEEPER_PIN                        PC6
208
+
209
+  #define LCD_PINS_DC                       PC12
210
+  #define LCD_PINS_RS                       PC7   // LCD_RST
211
+  #define DOGLCD_CS                         PD2
212
+  #define DOGLCD_MOSI                       PC10
213
+  #define DOGLCD_SCK                        PC11
214
+  #define DOGLCD_A0                  LCD_PINS_DC
215
+  #define FORCE_SOFT_SPI
216
+
217
+  #define KILL_PIN                          -1    // NC
218
+  #define NEOPIXEL_PIN                      PD0
219
+
220
+#elif HAS_WIRED_LCD
221
+
202 222
   #define BEEPER_PIN                        PC9
203 223
   #define BTN_ENC                           PA8
204 224
 
@@ -211,11 +231,6 @@
211 231
     #define LCD_PINS_ENABLE                 PD1
212 232
     #define LCD_PINS_D4                     PC12
213 233
 
214
-    // CR10_STOCKDISPLAY default timing is too fast
215
-    #undef BOARD_ST7920_DELAY_1
216
-    #undef BOARD_ST7920_DELAY_2
217
-    #undef BOARD_ST7920_DELAY_3
218
-
219 234
   #else
220 235
 
221 236
     #define LCD_PINS_RS                     PD2
@@ -229,7 +244,7 @@
229 244
     #define LCD_PINS_D4                     PC10
230 245
 
231 246
     #if ENABLED(FYSETC_MINI_12864)
232
-     // See https://wiki.fysetc.com/Mini12864_Panel
247
+      // See https://wiki.fysetc.com/Mini12864_Panel
233 248
       #define DOGLCD_CS                     PC11
234 249
       #define DOGLCD_A0                     PD2
235 250
       #if ENABLED(FYSETC_GENERIC_12864_1_1)
@@ -249,36 +264,34 @@
249 264
       #elif ENABLED(FYSETC_MINI_12864_2_1)
250 265
         #define NEOPIXEL_PIN                PC12
251 266
       #endif
252
-    #endif // !FYSETC_MINI_12864
267
+    #endif
253 268
 
254 269
     #if IS_ULTIPANEL
255 270
       #define LCD_PINS_D5                   PC12
256 271
       #define LCD_PINS_D6                   PD0
257 272
       #define LCD_PINS_D7                   PD1
258
-
259 273
       #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
260 274
         #define BTN_ENC_EN           LCD_PINS_D7  // Detect the presence of the encoder
261 275
       #endif
262
-
263 276
     #endif
264 277
 
265 278
   #endif
266 279
 
267
-  // Alter timing for graphical display
268
-  #if HAS_MARLINUI_U8GLIB
269
-    #ifndef BOARD_ST7920_DELAY_1
270
-      #define BOARD_ST7920_DELAY_1  DELAY_NS(96)
271
-    #endif
272
-    #ifndef BOARD_ST7920_DELAY_2
273
-      #define BOARD_ST7920_DELAY_2  DELAY_NS(48)
274
-    #endif
275
-    #ifndef BOARD_ST7920_DELAY_3
276
-      #define BOARD_ST7920_DELAY_3 DELAY_NS(640)
277
-    #endif
278
-  #endif
279
-
280 280
 #endif // HAS_WIRED_LCD
281 281
 
282
+// Alter timing for graphical display
283
+#if HAS_MARLINUI_U8GLIB
284
+  #ifndef BOARD_ST7920_DELAY_1
285
+    #define BOARD_ST7920_DELAY_1  DELAY_NS(96)
286
+  #endif
287
+  #ifndef BOARD_ST7920_DELAY_2
288
+    #define BOARD_ST7920_DELAY_2  DELAY_NS(48)
289
+  #endif
290
+  #ifndef BOARD_ST7920_DELAY_3
291
+    #define BOARD_ST7920_DELAY_3 DELAY_NS(640)
292
+  #endif
293
+#endif
294
+
282 295
 #ifndef RGB_LED_R_PIN
283 296
   #define RGB_LED_R_PIN                     PB6
284 297
 #endif

Loading…
取消
儲存