瀏覽代碼

Merge pull request #9188 from thinkyhead/bf2_creality_ender

[2.0.x] Add Creality Ender config/board
Scott Lahteine 6 年之前
父節點
當前提交
f4e4c7a7c8
沒有連結到貢獻者的電子郵件帳戶。

+ 3
- 0
Marlin/src/Makefile 查看文件

176
 else ifeq  ($(HARDWARE_MOTHERBOARD),69)
176
 else ifeq  ($(HARDWARE_MOTHERBOARD),69)
177
 HARDWARE_VARIANT ?= Sanguino
177
 HARDWARE_VARIANT ?= Sanguino
178
 MCU              ?= atmega1284p
178
 MCU              ?= atmega1284p
179
+else ifeq  ($(HARDWARE_MOTHERBOARD),601)
180
+HARDWARE_VARIANT ?= Sanguino
181
+MCU              ?= atmega1284p
179
 
182
 
180
 #Ultimaker
183
 #Ultimaker
181
 else ifeq  ($(HARDWARE_MOTHERBOARD),7)
184
 else ifeq  ($(HARDWARE_MOTHERBOARD),7)

+ 1781
- 0
Marlin/src/config/examples/Creality/Ender/Configuration.h
文件差異過大導致無法顯示
查看文件


+ 1597
- 0
Marlin/src/config/examples/Creality/Ender/Configuration_adv.h
文件差異過大導致無法顯示
查看文件


+ 18
- 0
Marlin/src/config/examples/Creality/Ender/README.md 查看文件

1
+# Creality Ender Support
2
+
3
+This branch is a reverse-engineered version based on the unpublished firmware from Creality. It is **not** the authoritative source, but has been carefully re-built by looking at their firmware and inferring the base version and configuration they used. The basis is the firmware version from "Jul 31 2017 10:16:30". It is based on Marlin 1.0.1, because
4
+
5
+* 1.0.0 had very different serial output in `setup()` and overall code structure.
6
+* 1.0.2 changed the `VERSION_STRING` to include a leading space, and `lcd_init` uses `SET_INPUT` instead of `pinMode`.
7
+
8
+Configurations were found by seeing what code was compiled into the firmware, and constants used there.
9
+
10
+For U8Glib, at least version 1.14 and at most 1.17 is used, because
11
+
12
+* 1.12 didn't have the extra speed argument to u8g_InitCom.
13
+* 1.13 didn't have the soft reset instruction for UC1701 initialization.
14
+* 1.18 has a new directory structure.
15
+
16
+## Bitmaps
17
+
18
+The bootscreen and custom status screens come from Creality's firmware.

+ 74
- 0
Marlin/src/config/examples/Creality/Ender/_Bootscreen.h 查看文件

1
+#ifndef BOOTSCREEN_H_
2
+#define BOOTSCREEN_H_
3
+
4
+#define CUSTOM_BOOTSCREEN_TIMEOUT 1000  // milliseconds
5
+#define CUSTOM_BOOTSCREEN_BMPWIDTH 128  // Width in pixels
6
+#define CUSTOM_BOOTSCREEN_BMPHEIGHT 64  // Height in pixels
7
+const unsigned char custom_start_bmp[] PROGMEM = {
8
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
9
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
10
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
11
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xEF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
12
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xEF,0xEF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
13
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE7,0xDF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
14
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE7,0xDF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
15
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE3,0xDF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
16
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF3,0xCF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
17
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE1,0xE1,0xCF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
18
+  0xFF,0xFF,0xFF,0xFF,0xFE,0x78,0x00,0x00,0x03,0xDD,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
19
+  0xFF,0xFF,0xFF,0xFE,0xFF,0x80,0x7E,0x00,0x01,0xEE,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
20
+  0xFF,0xFF,0xFF,0xFE,0x7D,0xCF,0xFC,0x00,0x00,0xF7,0x7F,0xFF,0xFF,0xFF,0xFF,0xFF,
21
+  0xFF,0xFF,0xFF,0xFF,0x8E,0x06,0x00,0x00,0x00,0x7B,0xBF,0xFF,0xFF,0xFF,0xFF,0xFF,
22
+  0xFF,0xFF,0xFF,0xFF,0xC0,0x00,0x00,0x00,0x00,0x7D,0xDF,0xFF,0xFF,0xFF,0xFF,0xFF,
23
+  0xFF,0xFF,0xFF,0xFF,0xFC,0x01,0xFE,0x00,0x00,0x3E,0xE7,0xFF,0xFF,0xFF,0xFF,0xFF,
24
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFC,0x00,0x03,0x1F,0x73,0xFF,0xFF,0xFF,0xFF,0xFF,
25
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF8,0x00,0x01,0x8F,0x81,0xFF,0xFF,0xFF,0xFF,0xFF,
26
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE0,0x00,0x00,0x83,0xF9,0xFF,0xFF,0xFF,0xFF,0xFF,
27
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x00,0xFC,0x00,0x00,0xF0,0xFF,0xFF,0xFF,0xFF,0xFF,
28
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xE0,0x0F,0xFF,0xC0,0x00,0x00,0xFF,0xFF,0xFF,0xFF,0xFF,
29
+  0xFF,0xFF,0xFF,0xFF,0xFE,0x03,0xFF,0xFF,0xC0,0x00,0x00,0xFF,0xFF,0xFF,0xFF,0xFF,
30
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF9,0x00,0x00,0x00,0xFF,0xFF,0xFF,0xFF,0xFF,
31
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFC,0x00,0x07,0xC0,0xFF,0xFF,0xFF,0xFF,0xFF,
32
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x00,0x07,0xE0,0xFF,0xFF,0xFF,0xFF,0xFF,
33
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE0,0x07,0xF1,0xFF,0xFF,0xFF,0xFF,0xFF,
34
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFC,0x07,0xF9,0xFF,0xFF,0xFF,0xFF,0xFF,
35
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x03,0xF9,0xFF,0xFF,0xFF,0xFF,0xFF,
36
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x83,0xF9,0xFF,0xFF,0xFF,0xFF,0xFF,
37
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
38
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE1,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
39
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0,0xBF,0xFF,0xFF,0xFF,0xFF,0xFF,
40
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFB,0xF8,0x3F,0xFF,0xFF,0xFF,0xFF,0xFF,
41
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF9,0xF8,0x3F,0xFF,0xFF,0xFF,0xFF,0xFF,
42
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x7E,0xF0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
43
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x8E,0x03,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
44
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE0,0x1F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
45
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
46
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
47
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x7F,0xFF,0xFF,0xFF,0xFF,0xFF,
48
+  0xFF,0xFF,0xFF,0xFF,0x00,0x00,0x7F,0xFF,0xFF,0xF8,0x7F,0xFF,0xFF,0xFF,0xFF,0xFF,
49
+  0xFF,0xFF,0xFF,0xFF,0x80,0x00,0x7F,0xFF,0xFF,0xE0,0x7F,0xFF,0xFF,0xFF,0xFF,0xFF,
50
+  0xFF,0xFF,0xFF,0xFF,0xC3,0xFC,0xFF,0xFF,0xFF,0xF8,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
51
+  0xFF,0xFF,0xFF,0xFF,0xC3,0xFC,0xFF,0xFF,0xFF,0xF8,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
52
+  0xFF,0xFF,0xFF,0xFF,0x87,0xFD,0xFF,0xFF,0xFF,0xF1,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
53
+  0xFF,0xFF,0xFF,0xFF,0x87,0xFF,0xFF,0xFF,0xFF,0xF1,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
54
+  0xFF,0xFF,0xFF,0xFF,0x0F,0xE7,0xF3,0x0F,0xFC,0x23,0xFC,0x3F,0xFF,0xFF,0xFF,0xFF,
55
+  0xFF,0xFF,0xFF,0xFF,0x0F,0xEF,0x80,0x07,0xF0,0x03,0xF0,0x1E,0x00,0x7F,0xFF,0xFF,
56
+  0xFF,0xFF,0xFF,0xFE,0x1F,0xCF,0x81,0x87,0xC7,0x87,0xC7,0x0C,0x00,0x7F,0xFF,0xFF,
57
+  0xFF,0xFF,0xFF,0xFE,0x00,0x1F,0xC7,0xC7,0x8F,0xC7,0x9F,0x0F,0x0C,0xFF,0xFF,0xFF,
58
+  0xFF,0xFF,0xFF,0xFE,0x00,0x1F,0x87,0x8F,0x1F,0x8F,0x1F,0x0F,0x1F,0xFF,0xFF,0xFF,
59
+  0xFF,0xFF,0xFF,0xFC,0x3F,0x9F,0x8F,0x8F,0x1F,0x8E,0x00,0x1E,0x3F,0xFF,0xFF,0xFF,
60
+  0xFF,0xFF,0xFF,0xFC,0x7F,0x3F,0x0F,0x1E,0x3F,0x1E,0x3F,0xFE,0x3F,0xFF,0xFF,0xFF,
61
+  0xFF,0xFF,0xFF,0xF8,0x7F,0xFF,0x1F,0x1C,0x3F,0x1C,0x7F,0xFC,0x7F,0xFF,0xFF,0xFF,
62
+  0xFF,0xFF,0xFF,0xF8,0xFF,0xFF,0x1E,0x1C,0x7E,0x1C,0x7F,0xFC,0x7F,0xFF,0xFF,0xFF,
63
+  0xFF,0xFF,0xFF,0xF0,0xFF,0xCE,0x3E,0x3C,0x7E,0x3C,0x7F,0xB8,0xFF,0xFF,0xFF,0xFF,
64
+  0xFF,0xFF,0xFF,0xF0,0xFF,0x9E,0x3C,0x38,0x7C,0x38,0x7E,0x78,0xFF,0xFF,0xFF,0xFF,
65
+  0xFF,0xFF,0xFF,0xE1,0xFF,0x3C,0x7C,0x78,0x7C,0x78,0x3C,0xF1,0xFF,0xFF,0xFF,0xFF,
66
+  0xFF,0xFF,0xFF,0xE1,0xF8,0x38,0x78,0x78,0x10,0x18,0x01,0xF1,0xFF,0xFF,0xFF,0xFF,
67
+  0xFF,0xFF,0xFF,0x00,0x00,0x60,0x20,0x3C,0x00,0x7C,0x07,0x80,0x7F,0xFF,0xFF,0xFF,
68
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFE,0x1F,0xFE,0x1F,0xFF,0xFF,0xFF,0xFF,0xFF,
69
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
70
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
71
+  0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF
72
+};
73
+
74
+#endif // BOOTSCREEN_H_

+ 54
- 0
Marlin/src/config/examples/Creality/Ender/_Statusscreen.h 查看文件

1
+#ifndef STATUSSCREEN_H_
2
+#define STATUSSCREEN_H_
3
+
4
+#define STATUS_SCREENWIDTH 128 // Width in pixels
5
+
6
+const unsigned char status_screen0_bmp[] PROGMEM = {
7
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0xFF,0xF0,
8
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x00,0x70,
9
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x33,0x87,0x30,
10
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x27,0x87,0x90,
11
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x2F,0x87,0xD0,
12
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x2F,0x87,0xD0,
13
+  0x00,0x00,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x2F,0x03,0xD0,
14
+  0xFE,0x00,0x02,0x00,0x00,0x1F,0xE0,0x00,0x00,0x08,0x20,0x80,0x00,0x20,0x30,0x10,
15
+  0x42,0x00,0x02,0x00,0x00,0x3F,0xF0,0x00,0x00,0x04,0x10,0x40,0x00,0x20,0x78,0x10,
16
+  0x48,0x00,0x02,0x00,0x00,0x3F,0xF0,0x00,0x00,0x04,0x10,0x40,0x00,0x20,0x78,0x10,
17
+  0x48,0xDC,0x3E,0x3C,0xEE,0x3F,0xF0,0x00,0x00,0x08,0x20,0x80,0x00,0x20,0x30,0x10,
18
+  0x78,0x62,0x42,0x42,0x32,0x1F,0xE0,0x00,0x00,0x10,0x41,0x00,0x00,0x2F,0x03,0xD0,
19
+  0x48,0x42,0x42,0x42,0x20,0x1F,0xE0,0x00,0x00,0x20,0x82,0x00,0x00,0x2F,0x87,0xD0,
20
+  0x48,0x42,0x42,0x7E,0x20,0x3F,0xF0,0x00,0x00,0x20,0x82,0x00,0x00,0x2F,0x87,0xD0,
21
+  0x40,0x42,0x42,0x40,0x20,0x3F,0xF0,0x00,0x00,0x10,0x41,0x00,0x00,0x27,0x87,0x90,
22
+  0x42,0x42,0x46,0x42,0x20,0x3F,0xF0,0x00,0x00,0x08,0x20,0x80,0x00,0x33,0x87,0x30,
23
+  0xFE,0xE7,0x3B,0x3C,0xF8,0x0F,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x00,0x70,
24
+  0x00,0x00,0x00,0x00,0x00,0x07,0x80,0x00,0x00,0xFF,0xFF,0xC0,0x00,0x3F,0xFF,0xF0,
25
+  0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0xFF,0xFF,0xC0,0x00,0x00,0x00,0x00
26
+};
27
+const unsigned char status_screen1_bmp[] PROGMEM = {
28
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0xFF,0xF0,
29
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x00,0x70,
30
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0xFC,0x30,
31
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0xFC,0x10,
32
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x78,0x10,
33
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x30,0x10,
34
+  0x00,0x00,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x2C,0x00,0xD0,
35
+  0xFE,0x00,0x02,0x00,0x00,0x1F,0xE0,0x00,0x00,0x10,0x41,0x00,0x00,0x2E,0x31,0xD0,
36
+  0x42,0x00,0x02,0x00,0x00,0x3F,0xF0,0x00,0x00,0x08,0x20,0x80,0x00,0x2F,0x7B,0xD0,
37
+  0x48,0x00,0x02,0x00,0x00,0x3F,0xF0,0x00,0x00,0x08,0x20,0x80,0x00,0x2F,0x7B,0xD0,
38
+  0x48,0xDC,0x3E,0x3C,0xEE,0x3F,0xF0,0x00,0x00,0x10,0x41,0x00,0x00,0x2E,0x31,0xD0,
39
+  0x78,0x62,0x42,0x42,0x32,0x1F,0xE0,0x00,0x00,0x20,0x82,0x00,0x00,0x2C,0x00,0xD0,
40
+  0x48,0x42,0x42,0x42,0x20,0x1F,0xE0,0x00,0x00,0x41,0x04,0x00,0x00,0x20,0x30,0x10,
41
+  0x48,0x42,0x42,0x7E,0x20,0x3F,0xF0,0x00,0x00,0x41,0x04,0x00,0x00,0x20,0x78,0x10,
42
+  0x40,0x42,0x42,0x40,0x20,0x3F,0xF0,0x00,0x00,0x20,0x82,0x00,0x00,0x20,0xFC,0x10,
43
+  0x42,0x42,0x46,0x42,0x20,0x3F,0xF0,0x00,0x00,0x10,0x41,0x00,0x00,0x30,0xFC,0x30,
44
+  0xFE,0xE7,0x3B,0x3C,0xF8,0x0F,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x00,0x70,
45
+  0x00,0x00,0x00,0x00,0x00,0x07,0x80,0x00,0x00,0xFF,0xFF,0xC0,0x00,0x3F,0xFF,0xF0,
46
+  0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0xFF,0xFF,0xC0,0x00,0x00,0x00,0x00
47
+};
48
+
49
+#define STATUS_SCREEN_X 0
50
+#define STATUS_SCREEN_HOTEND_TEXT_X(i) (39 + (i) * 25)
51
+#define STATUS_SCREEN_BED_TEXT_X 72
52
+#define STATUS_SCREEN_FAN_TEXT_X 103
53
+
54
+#endif // STATUSSCREEN_H_

+ 1
- 0
Marlin/src/core/boards.h 查看文件

115
 #define BOARD_MELZI_MAKR3D      66    // Melzi with ATmega1284 (MaKr3d version)
115
 #define BOARD_MELZI_MAKR3D      66    // Melzi with ATmega1284 (MaKr3d version)
116
 #define BOARD_MELZI_CREALITY    89    // Melzi Creality3D board (for CR-10 etc)
116
 #define BOARD_MELZI_CREALITY    89    // Melzi Creality3D board (for CR-10 etc)
117
 #define BOARD_MELZI_MALYAN      92    // Melzi Malyan M150 board
117
 #define BOARD_MELZI_MALYAN      92    // Melzi Malyan M150 board
118
+#define BOARD_CREALITY_ENDER    601   // Creality Ender
118
 #define BOARD_STB_11            64    // STB V1.1
119
 #define BOARD_STB_11            64    // STB V1.1
119
 #define BOARD_AZTEEG_X1         65    // Azteeg X1
120
 #define BOARD_AZTEEG_X1         65    // Azteeg X1
120
 
121
 

+ 21
- 1
Marlin/src/lcd/dogm/dogm_bitmaps.h 查看文件

115
 // When only one extruder is selected, the "1" on the symbol will not
115
 // When only one extruder is selected, the "1" on the symbol will not
116
 // be displayed.
116
 // be displayed.
117
 
117
 
118
-#if HAS_TEMP_BED
118
+#ifdef CUSTOM_STATUS_SCREEN_FILE
119
+  #undef STATUS_SCREENWIDTH
120
+
121
+  // This file must define STATUS_SCREENWIDTH and status_screen{0,1}_bmp.
122
+  // It can also define STATUS_SCREEN_X, STATUS_SCREEN_{BED,FAN}_TEXT_X and
123
+  // STATUS_SCREEN_HOTEND_TEXT_X(i) to modify draw locations.
124
+  #include CUSTOM_STATUS_SCREEN_FILE
125
+#elif HAS_TEMP_BED
119
   #if HOTENDS == 1
126
   #if HOTENDS == 1
120
     #define STATUS_SCREENWIDTH     115 //Width in pixels
127
     #define STATUS_SCREENWIDTH     115 //Width in pixels
121
     #define STATUS_SCREENHEIGHT     19 //Height in pixels
128
     #define STATUS_SCREENHEIGHT     19 //Height in pixels
513
   };
520
   };
514
 
521
 
515
 #endif // BABYSTEP_ZPROBE_GFX_OVERLAY || MESH_EDIT_GFX_OVERLAY
522
 #endif // BABYSTEP_ZPROBE_GFX_OVERLAY || MESH_EDIT_GFX_OVERLAY
523
+
524
+#ifndef STATUS_SCREEN_X
525
+  #define STATUS_SCREEN_X 9
526
+#endif
527
+#ifndef STATUS_SCREEN_HOTEND_TEXT_X
528
+  #define STATUS_SCREEN_HOTEND_TEXT_X(i) (5 + (i) * 25)
529
+#endif
530
+#ifndef STATUS_SCREEN_BED_TEXT_X
531
+  #define STATUS_SCREEN_BED_TEXT_X 81
532
+#endif
533
+#ifndef STATUS_SCREEN_FAN_TEXT_X
534
+  #define STATUS_SCREEN_FAN_TEXT_X 104
535
+#endif

+ 1
- 1
Marlin/src/lcd/language/language_en.h 查看文件

37
 #undef en
37
 #undef en
38
 
38
 
39
 #ifndef WELCOME_MSG
39
 #ifndef WELCOME_MSG
40
-  #define WELCOME_MSG                         MACHINE_NAME _UxGT(" ready.")
40
+  #define WELCOME_MSG                         MACHINE_NAME _UxGT(" Ready.")
41
 #endif
41
 #endif
42
 #ifndef MSG_BACK
42
 #ifndef MSG_BACK
43
   #define MSG_BACK                            _UxGT("Back")
43
   #define MSG_BACK                            _UxGT("Back")

+ 7
- 6
Marlin/src/lcd/ultralcd_impl_DOGM.h 查看文件

324
 
324
 
325
     u8g.firstPage();
325
     u8g.firstPage();
326
     do {
326
     do {
327
-      u8g.drawBitmapP(offx, offy, START_BMPBYTEWIDTH, START_BMPHEIGHT, start_bmp);
327
+      u8g.drawBitmapP(offx, offy, (START_BMPWIDTH + 7) / 8, START_BMPHEIGHT, start_bmp);
328
       lcd_setFont(FONT_MENU);
328
       lcd_setFont(FONT_MENU);
329
       #ifndef STRING_SPLASH_LINE2
329
       #ifndef STRING_SPLASH_LINE2
330
         u8g.drawStr(txt1X, u8g.getHeight() - (DOG_CHAR_HEIGHT), STRING_SPLASH_LINE1);
330
         u8g.drawStr(txt1X, u8g.getHeight() - (DOG_CHAR_HEIGHT), STRING_SPLASH_LINE1);
365
   #elif ENABLED(LCD_SCREEN_ROT_270)
365
   #elif ENABLED(LCD_SCREEN_ROT_270)
366
     u8g.setRot270();  // Rotate screen by 270°
366
     u8g.setRot270();  // Rotate screen by 270°
367
   #endif
367
   #endif
368
-
369
 }
368
 }
370
 
369
 
371
 // The kill screen is displayed for unrecoverable conditions
370
 // The kill screen is displayed for unrecoverable conditions
503
 
502
 
504
   if (PAGE_UNDER(STATUS_SCREENHEIGHT + 1)) {
503
   if (PAGE_UNDER(STATUS_SCREENHEIGHT + 1)) {
505
 
504
 
506
-    u8g.drawBitmapP(9, 1, STATUS_SCREENBYTEWIDTH, STATUS_SCREENHEIGHT,
505
+    u8g.drawBitmapP(
506
+      STATUS_SCREEN_X, 1,
507
+      (STATUS_SCREENWIDTH + 7) / 8, STATUS_SCREENHEIGHT,
507
       #if HAS_FAN0
508
       #if HAS_FAN0
508
         blink && fanSpeeds[0] ? status_screen0_bmp : status_screen1_bmp
509
         blink && fanSpeeds[0] ? status_screen0_bmp : status_screen1_bmp
509
       #else
510
       #else
519
 
520
 
520
   if (PAGE_UNDER(28)) {
521
   if (PAGE_UNDER(28)) {
521
     // Extruders
522
     // Extruders
522
-    HOTEND_LOOP() _draw_heater_status(5 + e * 25, e, blink);
523
+    HOTEND_LOOP() _draw_heater_status(STATUS_SCREEN_HOTEND_TEXT_X(e), e, blink);
523
 
524
 
524
     // Heated bed
525
     // Heated bed
525
     #if HOTENDS < 4 && HAS_TEMP_BED
526
     #if HOTENDS < 4 && HAS_TEMP_BED
526
-      _draw_heater_status(81, -1, blink);
527
+      _draw_heater_status(STATUS_SCREEN_BED_TEXT_X, -1, blink);
527
     #endif
528
     #endif
528
 
529
 
529
     #if HAS_FAN0
530
     #if HAS_FAN0
531
         // Fan
532
         // Fan
532
         const int16_t per = ((fanSpeeds[0] + 1) * 100) / 256;
533
         const int16_t per = ((fanSpeeds[0] + 1) * 100) / 256;
533
         if (per) {
534
         if (per) {
534
-          u8g.setPrintPos(104, 27);
535
+          u8g.setPrintPos(STATUS_SCREEN_FAN_TEXT_X, 27);
535
           lcd_print(itostr3(per));
536
           lcd_print(itostr3(per));
536
           u8g.print('%');
537
           u8g.print('%');
537
         }
538
         }

+ 2
- 0
Marlin/src/pins/pins.h 查看文件

195
   #include "pins_MELZI_CREALITY.h"    // ATmega644P, ATmega1284P
195
   #include "pins_MELZI_CREALITY.h"    // ATmega644P, ATmega1284P
196
 #elif MB(MELZI_MALYAN)
196
 #elif MB(MELZI_MALYAN)
197
   #include "pins_MELZI_MALYAN.h"      // ATmega644P, ATmega1284P
197
   #include "pins_MELZI_MALYAN.h"      // ATmega644P, ATmega1284P
198
+#elif MB(CREALITY_ENDER)
199
+  #include "pins_CREALITY_ENDER.h"    // ATmega1284P
198
 #elif MB(STB_11)
200
 #elif MB(STB_11)
199
   #include "pins_STB_11.h"            // ATmega644P, ATmega1284P
201
   #include "pins_STB_11.h"            // ATmega644P, ATmega1284P
200
 #elif MB(AZTEEG_X1)
202
 #elif MB(AZTEEG_X1)

+ 1
- 3
Marlin/src/pins/pins_BEAST.h 查看文件

21
  */
21
  */
22
 
22
 
23
 #if !defined(__STM32F1__) && !defined(__STM32F4__)
23
 #if !defined(__STM32F1__) && !defined(__STM32F4__)
24
-    #error "Oops!  Make sure you have an STM32F1/4 board selected from the 'Tools -> Boards' menu."
24
+  #error "Oops!  Make sure you have an STM32F1/4 board selected from the 'Tools -> Boards' menu."
25
 #endif
25
 #endif
26
 
26
 
27
 /**
27
 /**
31
 #define DEFAULT_MACHINE_NAME "STM32F103RET6"
31
 #define DEFAULT_MACHINE_NAME "STM32F103RET6"
32
 #define BOARD_NAME "Marlin for STM32"
32
 #define BOARD_NAME "Marlin for STM32"
33
 
33
 
34
-#define LARGE_FLASH true
35
-
36
 // Enable I2C_EEPROM for testing
34
 // Enable I2C_EEPROM for testing
37
 #define I2C_EEPROM
35
 #define I2C_EEPROM
38
 
36
 

+ 0
- 2
Marlin/src/pins/pins_CHITU3D.h 查看文件

31
 #define DEFAULT_MACHINE_NAME "STM32F103RET6"
31
 #define DEFAULT_MACHINE_NAME "STM32F103RET6"
32
 #define BOARD_NAME "Chitu3d Marlin"
32
 #define BOARD_NAME "Chitu3d Marlin"
33
 
33
 
34
-#define LARGE_FLASH true
35
-
36
 // Enable I2C_EEPROM for testing
34
 // Enable I2C_EEPROM for testing
37
 //#define I2C_EEPROM
35
 //#define I2C_EEPROM
38
 
36
 

+ 34
- 0
Marlin/src/pins/pins_CREALITY_ENDER.h 查看文件

1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (C) 2016 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 <http://www.gnu.org/licenses/>.
20
+ *
21
+ */
22
+
23
+/**
24
+ * Creality Ender pin assignments
25
+ *
26
+ * Applies to the following boards:
27
+ *
28
+ *  Creality Ender-2
29
+ *  Creality Ender-4
30
+ */
31
+
32
+#define BOARD_NAME "Creality Ender"
33
+
34
+#include "pins_SANGUINOLOLU_12.h"

+ 6
- 1
Marlin/src/pins/pins_SANGUINOLOLU_11.h 查看文件

114
 
114
 
115
 #endif
115
 #endif
116
 
116
 
117
-#if MB(AZTEEG_X1) || MB(STB_11) || ENABLED(IS_MELZI)
117
+#if MB(AZTEEG_X1) || MB(STB_11) || MB(CREALITY_ENDER) || ENABLED(IS_MELZI)
118
   #define FAN_PIN           4 // Works for Panelolu2 too
118
   #define FAN_PIN           4 // Works for Panelolu2 too
119
 #endif
119
 #endif
120
 
120
 
187
         #define DOGLCD_CS       17
187
         #define DOGLCD_CS       17
188
         #define LCD_BACKLIGHT_PIN 28 // PA3
188
         #define LCD_BACKLIGHT_PIN 28 // PA3
189
 
189
 
190
+      #elif MB(CREALITY_ENDER)
191
+
192
+        #define BEEPER_PIN      27
193
+        #define DOGLCD_CS       28
194
+
190
       #else // !MAKRPANEL
195
       #else // !MAKRPANEL
191
 
196
 
192
         #define DOGLCD_CS       29
197
         #define DOGLCD_CS       29

+ 0
- 2
Marlin/src/pins/pins_STM3R_MINI.h 查看文件

31
 #define DEFAULT_MACHINE_NAME "STM3R Mini"
31
 #define DEFAULT_MACHINE_NAME "STM3R Mini"
32
 #define BOARD_NAME "Marlin for STM32"
32
 #define BOARD_NAME "Marlin for STM32"
33
 
33
 
34
-#define LARGE_FLASH true
35
-
36
 // Enable I2C_EEPROM for testing
34
 // Enable I2C_EEPROM for testing
37
 #define I2C_EEPROM
35
 #define I2C_EEPROM
38
 
36
 

Loading…
取消
儲存