Browse Source

More featureful CR-10 configurations

See #7725
Scott Lahteine 7 years ago
parent
commit
46709ed7e0

+ 12
- 14
Marlin/src/config/examples/Creality/CR-10/Configuration.h View File

@@ -77,7 +77,7 @@
77 77
 #define STRING_CONFIG_H_AUTHOR "(Creality CR-10)" // Who made the changes.
78 78
 #define SHOW_BOOTSCREEN
79 79
 #define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
80
-//#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during bootup in line 2
80
+#define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during bootup in line 2
81 81
 
82 82
 //
83 83
 // *** VENDORS PLEASE READ *****************************************************
@@ -90,7 +90,7 @@
90 90
 // boot image unmodified. For an example have a look at the bq Hephestos 2
91 91
 // example configuration folder.
92 92
 //
93
-//#define SHOW_CUSTOM_BOOTSCREEN
93
+#define SHOW_CUSTOM_BOOTSCREEN
94 94
 
95 95
 // @section machine
96 96
 
@@ -703,7 +703,7 @@
703 703
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
704 704
 
705 705
 // Use double touch for probing
706
-#define PROBE_DOUBLE_TOUCH
706
+//#define PROBE_DOUBLE_TOUCH
707 707
 
708 708
 /**
709 709
  * Z probes require clearance when deploying, stowing, and moving between
@@ -789,7 +789,7 @@
789 789
 #define X_MIN_POS 0
790 790
 #define Y_MIN_POS 0
791 791
 #define Z_MIN_POS 0
792
-#define X_MAX_POS X_BED_SIZE
792
+#define X_MAX_POS X_BED_SIZE + 20
793 793
 #define Y_MAX_POS Y_BED_SIZE
794 794
 #define Z_MAX_POS 400
795 795
 
@@ -940,7 +940,7 @@
940 940
   #define UBL_PROBE_PT_3_X 180
941 941
   #define UBL_PROBE_PT_3_Y 20
942 942
 
943
-  #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
943
+  //#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
944 944
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
945 945
 
946 946
 #elif ENABLED(MESH_BED_LEVELING)
@@ -997,6 +997,7 @@
997 997
 // - If stepper drivers time out, it will need X and Y homing again before Z homing.
998 998
 // - Move the Z probe (or nozzle) to a defined XY point before Z Homing when homing all axes (G28).
999 999
 // - Prevent Z homing when the Z probe is outside bed area.
1000
+//
1000 1001
 //#define Z_SAFE_HOMING
1001 1002
 
1002 1003
 #if ENABLED(Z_SAFE_HOMING)
@@ -1021,13 +1022,10 @@
1021 1022
 // M500 - stores parameters in EEPROM
1022 1023
 // M501 - reads parameters from EEPROM (if you need reset them after you changed them temporarily).
1023 1024
 // M502 - reverts to the default "factory settings".  You still need to store them in EEPROM afterwards if you want to.
1024
-// Define this to enable EEPROM support
1025
-#define EEPROM_SETTINGS
1026
-
1027
-#if ENABLED(EEPROM_SETTINGS)
1028
-  //#define DISABLE_M503  // Saves ~2700 bytes of PROGMEM. Disable for release!
1029
-  #define EEPROM_CHITCHAT // Print a report on M500. Please keep turned on.
1030
-#endif
1025
+//
1026
+#define EEPROM_SETTINGS // Enable for M500 and M501 commands
1027
+//#define DISABLE_M503    // Saves ~2700 bytes of PROGMEM. Disable for release!
1028
+#define EEPROM_CHITCHAT   // Give feedback on EEPROM commands. Disable to save PROGMEM.
1031 1029
 
1032 1030
 //
1033 1031
 // Host Keepalive
@@ -1057,7 +1055,7 @@
1057 1055
 // @section temperature
1058 1056
 
1059 1057
 // Preheat Constants
1060
-#define PREHEAT_1_TEMP_HOTEND 200
1058
+#define PREHEAT_1_TEMP_HOTEND 190
1061 1059
 #define PREHEAT_1_TEMP_BED     70
1062 1060
 #define PREHEAT_1_FAN_SPEED     0 // Value from 0 to 255
1063 1061
 
@@ -1160,7 +1158,7 @@
1160 1158
  *   M76 - Pause the print job timer
1161 1159
  *   M77 - Stop the print job timer
1162 1160
  */
1163
-//#define PRINTJOB_TIMER_AUTOSTART
1161
+#define PRINTJOB_TIMER_AUTOSTART
1164 1162
 
1165 1163
 /**
1166 1164
  * Print Counter

+ 1413
- 0
Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h
File diff suppressed because it is too large
View File


+ 100
- 0
Marlin/src/config/examples/Creality/CR-10/_Bootscreen.h View File

@@ -0,0 +1,100 @@
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
+ * Tongue-in-cheek placeholder for a more Marlin-specific bitmap
25
+ * The joke is that every "CR-10" has different branding!
26
+ * Made using The Gimp and...
27
+ *  - http://www.digole.com/tools/PicturetoC_Hex_converter.php
28
+ */
29
+#include <avr/pgmspace.h>
30
+
31
+#define CUSTOM_BOOTSCREEN_TIMEOUT   2500
32
+#define CUSTOM_BOOTSCREEN_BMPWIDTH  54
33
+#define CUSTOM_BOOTSCREEN_BMPHEIGHT 64
34
+
35
+const unsigned char custom_start_bmp[] PROGMEM = {
36
+  0x00, 0x00, 0x00, 0x01, 0xE0, 0x00, 0x00,
37
+  0x00, 0x00, 0x00, 0x3F, 0xF8, 0x00, 0x00,
38
+  0x00, 0x00, 0x03, 0xFF, 0xFC, 0x00, 0x00,
39
+  0x00, 0x00, 0x0F, 0xFF, 0xFC, 0x00, 0x00,
40
+  0x00, 0x00, 0x3F, 0xFF, 0xFC, 0x00, 0x00,
41
+  0x00, 0x00, 0x7F, 0xFF, 0xFC, 0x00, 0x00,
42
+  0x00, 0x00, 0x7F, 0xFF, 0xFC, 0x00, 0x00,
43
+  0x00, 0x00, 0xFF, 0xFF, 0xFC, 0x00, 0x00,
44
+  0x00, 0x00, 0xFF, 0xFF, 0xFC, 0x00, 0x00,
45
+  0x00, 0x00, 0xFF, 0xFF, 0xFC, 0x00, 0x00,
46
+  0x00, 0x00, 0xFF, 0xFF, 0xFC, 0x0F, 0xF0,
47
+  0x00, 0x00, 0xFF, 0xFF, 0xFD, 0xFF, 0xF8,
48
+  0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC,
49
+  0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC,
50
+  0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC,
51
+  0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC,
52
+  0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC,
53
+  0x00, 0x1F, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8,
54
+  0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0,
55
+  0x07, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xC0,
56
+  0x1F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00,
57
+  0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0x00,
58
+  0x7F, 0xFF, 0xFF, 0xFF, 0xFC, 0x00, 0x00,
59
+  0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x00, 0x00,
60
+  0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x00, 0x00,
61
+  0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x00, 0x00,
62
+  0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x00, 0x00,
63
+  0x7F, 0xFC, 0xFF, 0xFF, 0xFC, 0x00, 0x00,
64
+  0x1F, 0x80, 0xFF, 0xFF, 0xFC, 0x00, 0x00,
65
+  0x00, 0x00, 0xFF, 0xFF, 0xFC, 0x00, 0x00,
66
+  0x00, 0x00, 0xFF, 0xFF, 0xFC, 0x00, 0x00,
67
+  0x00, 0x00, 0xFF, 0xFF, 0xFC, 0x00, 0x00,
68
+  0x00, 0x00, 0xFF, 0xFF, 0xFC, 0x00, 0x00,
69
+  0x00, 0x00, 0xFF, 0xFF, 0xFC, 0x00, 0x00,
70
+  0x00, 0x00, 0xFF, 0xFF, 0xFC, 0x00, 0x00,
71
+  0x00, 0x00, 0xFF, 0xFF, 0xFC, 0x00, 0x00,
72
+  0x00, 0x00, 0xFF, 0xFF, 0xFC, 0x00, 0x00,
73
+  0x00, 0x00, 0xFF, 0xFF, 0xFC, 0x00, 0x00,
74
+  0x00, 0x00, 0xFF, 0xFF, 0xFC, 0x00, 0x00,
75
+  0x00, 0x00, 0xFF, 0xFF, 0xFC, 0x00, 0x00,
76
+  0x00, 0x00, 0xFF, 0xFF, 0xFC, 0x00, 0x00,
77
+  0x00, 0x00, 0xFF, 0xFF, 0xFC, 0x00, 0x00,
78
+  0x00, 0x00, 0xFF, 0xFF, 0xFC, 0x00, 0x00,
79
+  0x00, 0x00, 0xFF, 0xFF, 0xFC, 0x00, 0x00,
80
+  0x00, 0x00, 0xFF, 0xFF, 0xFC, 0x00, 0x00,
81
+  0x00, 0x00, 0xFF, 0xFF, 0xFC, 0x00, 0x00,
82
+  0x00, 0x00, 0xFF, 0xFF, 0xFC, 0x00, 0x00,
83
+  0x00, 0x00, 0xFF, 0xFF, 0xFC, 0x00, 0x00,
84
+  0x00, 0x00, 0xFF, 0xFF, 0xFC, 0x00, 0x00,
85
+  0x00, 0x00, 0xFF, 0xFF, 0xFC, 0x00, 0x00,
86
+  0x00, 0x00, 0xFF, 0xFF, 0xFE, 0x3F, 0xF8,
87
+  0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC,
88
+  0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC,
89
+  0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC,
90
+  0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC,
91
+  0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC,
92
+  0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8,
93
+  0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8,
94
+  0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0,
95
+  0x00, 0x00, 0x7F, 0xFF, 0xFF, 0xFF, 0xC0,
96
+  0x00, 0x00, 0x3F, 0xFF, 0xFF, 0xFE, 0x00,
97
+  0x00, 0x00, 0x1F, 0xFF, 0xFF, 0xE0, 0x00,
98
+  0x00, 0x00, 0x07, 0xFF, 0xFC, 0x00, 0x00,
99
+  0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00
100
+};

Loading…
Cancel
Save