浏览代码

Merge pull request #7725 from thinkyhead/bf1_creality_fun

More featureful CR-10 configurations
Scott Lahteine 8 年前
父节点
当前提交
72e9534d11
共有 37 个文件被更改,包括 1610 次插入95 次删除
  1. 1
    1
      Marlin/Configuration.h
  2. 3
    3
      Marlin/Configuration_adv.h
  3. 3
    1
      Marlin/Marlin.h
  4. 1
    1
      Marlin/Marlin_main.cpp
  5. 2
    2
      Marlin/example_configurations/AlephObjects/TAZ4/Configuration_adv.h
  6. 2
    2
      Marlin/example_configurations/Anet/A6/Configuration_adv.h
  7. 2
    2
      Marlin/example_configurations/Anet/A8/Configuration_adv.h
  8. 2
    2
      Marlin/example_configurations/BQ/Hephestos/Configuration_adv.h
  9. 2
    2
      Marlin/example_configurations/BQ/Hephestos_2/Configuration_adv.h
  10. 2
    2
      Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h
  11. 2
    2
      Marlin/example_configurations/Cartesio/Configuration_adv.h
  12. 13
    15
      Marlin/example_configurations/Creality/CR-10/Configuration.h
  13. 1415
    0
      Marlin/example_configurations/Creality/CR-10/Configuration_adv.h
  14. 100
    0
      Marlin/example_configurations/Creality/CR-10/_Bootscreen.h
  15. 2
    2
      Marlin/example_configurations/Felix/Configuration_adv.h
  16. 2
    2
      Marlin/example_configurations/Folger Tech/i3-2020/Configuration_adv.h
  17. 2
    2
      Marlin/example_configurations/Infitary/i3-M508/Configuration_adv.h
  18. 2
    2
      Marlin/example_configurations/Malyan/M150/Configuration_adv.h
  19. 2
    2
      Marlin/example_configurations/RigidBot/Configuration_adv.h
  20. 2
    2
      Marlin/example_configurations/SCARA/Configuration_adv.h
  21. 1
    1
      Marlin/example_configurations/Sanguinololu/Configuration.h
  22. 2
    2
      Marlin/example_configurations/Sanguinololu/Configuration_adv.h
  23. 2
    2
      Marlin/example_configurations/TinyBoy2/Configuration_adv.h
  24. 2
    2
      Marlin/example_configurations/Velleman/K8200/Configuration_adv.h
  25. 2
    2
      Marlin/example_configurations/Velleman/K8400/Configuration_adv.h
  26. 1
    1
      Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h
  27. 2
    2
      Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h
  28. 2
    2
      Marlin/example_configurations/delta/generic/Configuration_adv.h
  29. 2
    2
      Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
  30. 2
    2
      Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
  31. 2
    2
      Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
  32. 5
    5
      Marlin/example_configurations/gCreate/gMax1.5+/Configuration_adv.h
  33. 2
    2
      Marlin/example_configurations/makibox/Configuration_adv.h
  34. 2
    2
      Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
  35. 2
    2
      Marlin/example_configurations/wt150/Configuration_adv.h
  36. 6
    6
      Marlin/serial.h
  37. 11
    11
      Marlin/ultralcd.cpp

+ 1
- 1
Marlin/Configuration.h 查看文件

@@ -181,7 +181,7 @@
181 181
  */
182 182
 //#define PARKING_EXTRUDER
183 183
 #if ENABLED(PARKING_EXTRUDER)
184
-  #define PARKING_EXTRUDER_SOLENOIDS_INVERT           // If enabled, the solenoid not magnetized with applied voltage
184
+  #define PARKING_EXTRUDER_SOLENOIDS_INVERT           // If enabled, the solenoid is NOT magnetized with applied voltage
185 185
   #define PARKING_EXTRUDER_SOLENOIDS_PINS_ACTIVE LOW  // LOW or HIGH pin signal energizes the coil
186 186
   #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250        // Delay (ms) for magnetic field. No delay if 0 or not defined.
187 187
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders

+ 3
- 3
Marlin/Configuration_adv.h 查看文件

@@ -222,7 +222,7 @@
222 222
 
223 223
 /**
224 224
  * Part-Cooling Fan Multiplexer
225
- * 
225
+ *
226 226
  * This feature allows you to digitally multiplex the fan output.
227 227
  * The multiplexer is automatically switched at tool-change.
228 228
  * Set FANMUX[012]_PINs below for up to 2, 4, or 8 multiplexed fans.
@@ -510,7 +510,7 @@
510 510
 
511 511
   // SD Card Sorting options
512 512
   #if ENABLED(SDCARD_SORT_ALPHA)
513
-    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256).
513
+    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256). Costs 27 bytes each.
514 514
     #define FOLDER_SORTING     -1     // -1=above  0=none  1=below
515 515
     #define SDSORT_GCODE       false  // Allow turning sorting on/off with LCD and M34 g-code.
516 516
     #define SDSORT_USES_RAM    false  // Pre-allocate a static array for faster pre-sorting.
@@ -601,7 +601,7 @@
601 601
  */
602 602
 //#define BABYSTEPPING
603 603
 #if ENABLED(BABYSTEPPING)
604
-  #define BABYSTEP_XY              // Also enable X/Y Babystepping. Not supported on DELTA!
604
+  //#define BABYSTEP_XY            // Also enable X/Y Babystepping. Not supported on DELTA!
605 605
   #define BABYSTEP_INVERT_Z false  // Change if Z babysteps should go the other way
606 606
   #define BABYSTEP_MULTIPLICATOR 1 // Babysteps are very small. Increase for faster motion.
607 607
   //#define BABYSTEP_ZPROBE_OFFSET // Enable to combine M851 and Babystepping

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

@@ -422,7 +422,9 @@ void do_blocking_move_to_x(const float &x, const float &fr_mm_s=0.0);
422 422
 void do_blocking_move_to_z(const float &z, const float &fr_mm_s=0.0);
423 423
 void do_blocking_move_to_xy(const float &x, const float &y, const float &fr_mm_s=0.0);
424 424
 
425
-#if ENABLED(Z_PROBE_ALLEN_KEY) || ENABLED(Z_PROBE_SLED) || HAS_PROBING_PROCEDURE || HOTENDS > 1 || ENABLED(NOZZLE_CLEAN_FEATURE) || ENABLED(NOZZLE_PARK_FEATURE)
425
+#define HAS_AXIS_UNHOMED_ERR (ENABLED(Z_PROBE_ALLEN_KEY) || ENABLED(Z_PROBE_SLED) || HAS_PROBING_PROCEDURE || HOTENDS > 1 || ENABLED(NOZZLE_CLEAN_FEATURE) || ENABLED(NOZZLE_PARK_FEATURE) || (ENABLED(ADVANCED_PAUSE_FEATURE) && ENABLED(HOME_BEFORE_FILAMENT_CHANGE)))
426
+
427
+#if HAS_AXIS_UNHOMED_ERR
426 428
   bool axis_unhomed_error(const bool x=true, const bool y=true, const bool z=true);
427 429
 #endif
428 430
 

+ 1
- 1
Marlin/Marlin_main.cpp 查看文件

@@ -1822,7 +1822,7 @@ static void clean_up_after_endstop_or_probe_move() {
1822 1822
 
1823 1823
 #endif // HAS_BED_PROBE
1824 1824
 
1825
-#if HAS_PROBING_PROCEDURE || HOTENDS > 1 || ENABLED(Z_PROBE_ALLEN_KEY) || ENABLED(Z_PROBE_SLED) || ENABLED(NOZZLE_CLEAN_FEATURE) || ENABLED(NOZZLE_PARK_FEATURE) || ENABLED(DELTA_AUTO_CALIBRATION)
1825
+#if HAS_AXIS_UNHOMED_ERR
1826 1826
 
1827 1827
   bool axis_unhomed_error(const bool x/*=true*/, const bool y/*=true*/, const bool z/*=true*/) {
1828 1828
     #if ENABLED(HOME_AFTER_DEACTIVATE)

+ 2
- 2
Marlin/example_configurations/AlephObjects/TAZ4/Configuration_adv.h 查看文件

@@ -510,7 +510,7 @@
510 510
 
511 511
   // SD Card Sorting options
512 512
   #if ENABLED(SDCARD_SORT_ALPHA)
513
-    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256).
513
+    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256). Costs 27 bytes each.
514 514
     #define FOLDER_SORTING     -1     // -1=above  0=none  1=below
515 515
     #define SDSORT_GCODE       false  // Allow turning sorting on/off with LCD and M34 g-code.
516 516
     #define SDSORT_USES_RAM    false  // Pre-allocate a static array for faster pre-sorting.
@@ -601,7 +601,7 @@
601 601
  */
602 602
 //#define BABYSTEPPING
603 603
 #if ENABLED(BABYSTEPPING)
604
-  #define BABYSTEP_XY              // Also enable X/Y Babystepping. Not supported on DELTA!
604
+  //#define BABYSTEP_XY            // Also enable X/Y Babystepping. Not supported on DELTA!
605 605
   #define BABYSTEP_INVERT_Z false  // Change if Z babysteps should go the other way
606 606
   #define BABYSTEP_MULTIPLICATOR 1 // Babysteps are very small. Increase for faster motion.
607 607
   //#define BABYSTEP_ZPROBE_OFFSET // Enable to combine M851 and Babystepping

+ 2
- 2
Marlin/example_configurations/Anet/A6/Configuration_adv.h 查看文件

@@ -510,7 +510,7 @@
510 510
 
511 511
   // SD Card Sorting options
512 512
   #if ENABLED(SDCARD_SORT_ALPHA)
513
-    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256).
513
+    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256). Costs 27 bytes each.
514 514
     #define FOLDER_SORTING     -1     // -1=above  0=none  1=below
515 515
     #define SDSORT_GCODE       false  // Allow turning sorting on/off with LCD and M34 g-code.
516 516
     #define SDSORT_USES_RAM    false  // Pre-allocate a static array for faster pre-sorting.
@@ -601,7 +601,7 @@
601 601
  */
602 602
 //#define BABYSTEPPING
603 603
 #if ENABLED(BABYSTEPPING)
604
-  #define BABYSTEP_XY              // Also enable X/Y Babystepping. Not supported on DELTA!
604
+  //#define BABYSTEP_XY            // Also enable X/Y Babystepping. Not supported on DELTA!
605 605
   #define BABYSTEP_INVERT_Z false  // Change if Z babysteps should go the other way
606 606
   #define BABYSTEP_MULTIPLICATOR 1 // Babysteps are very small. Increase for faster motion.
607 607
   //#define BABYSTEP_ZPROBE_OFFSET // Enable to combine M851 and Babystepping

+ 2
- 2
Marlin/example_configurations/Anet/A8/Configuration_adv.h 查看文件

@@ -510,7 +510,7 @@
510 510
 
511 511
   // SD Card Sorting options
512 512
   #if ENABLED(SDCARD_SORT_ALPHA)
513
-    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256).
513
+    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256). Costs 27 bytes each.
514 514
     #define FOLDER_SORTING     -1     // -1=above  0=none  1=below
515 515
     #define SDSORT_GCODE       false  // Allow turning sorting on/off with LCD and M34 g-code.
516 516
     #define SDSORT_USES_RAM    false  // Pre-allocate a static array for faster pre-sorting.
@@ -601,7 +601,7 @@
601 601
  */
602 602
 //#define BABYSTEPPING
603 603
 #if ENABLED(BABYSTEPPING)
604
-  #define BABYSTEP_XY              // Also enable X/Y Babystepping. Not supported on DELTA!
604
+  //#define BABYSTEP_XY            // Also enable X/Y Babystepping. Not supported on DELTA!
605 605
   #define BABYSTEP_INVERT_Z false  // Change if Z babysteps should go the other way
606 606
   #define BABYSTEP_MULTIPLICATOR 1 // Babysteps are very small. Increase for faster motion.
607 607
   //#define BABYSTEP_ZPROBE_OFFSET // Enable to combine M851 and Babystepping

+ 2
- 2
Marlin/example_configurations/BQ/Hephestos/Configuration_adv.h 查看文件

@@ -510,7 +510,7 @@
510 510
 
511 511
   // SD Card Sorting options
512 512
   #if ENABLED(SDCARD_SORT_ALPHA)
513
-    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256).
513
+    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256). Costs 27 bytes each.
514 514
     #define FOLDER_SORTING     -1     // -1=above  0=none  1=below
515 515
     #define SDSORT_GCODE       false  // Allow turning sorting on/off with LCD and M34 g-code.
516 516
     #define SDSORT_USES_RAM    false  // Pre-allocate a static array for faster pre-sorting.
@@ -601,7 +601,7 @@
601 601
  */
602 602
 //#define BABYSTEPPING
603 603
 #if ENABLED(BABYSTEPPING)
604
-  #define BABYSTEP_XY              // Also enable X/Y Babystepping. Not supported on DELTA!
604
+  //#define BABYSTEP_XY            // Also enable X/Y Babystepping. Not supported on DELTA!
605 605
   #define BABYSTEP_INVERT_Z false  // Change if Z babysteps should go the other way
606 606
   #define BABYSTEP_MULTIPLICATOR 1 // Babysteps are very small. Increase for faster motion.
607 607
   //#define BABYSTEP_ZPROBE_OFFSET // Enable to combine M851 and Babystepping

+ 2
- 2
Marlin/example_configurations/BQ/Hephestos_2/Configuration_adv.h 查看文件

@@ -510,7 +510,7 @@
510 510
 
511 511
   // SD Card Sorting options
512 512
   #if ENABLED(SDCARD_SORT_ALPHA)
513
-    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256).
513
+    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256). Costs 27 bytes each.
514 514
     #define FOLDER_SORTING     -1     // -1=above  0=none  1=below
515 515
     #define SDSORT_GCODE       false  // Allow turning sorting on/off with LCD and M34 g-code.
516 516
     #define SDSORT_USES_RAM    false  // Pre-allocate a static array for faster pre-sorting.
@@ -601,7 +601,7 @@
601 601
  */
602 602
 //#define BABYSTEPPING
603 603
 #if ENABLED(BABYSTEPPING)
604
-  #define BABYSTEP_XY              // Also enable X/Y Babystepping. Not supported on DELTA!
604
+  //#define BABYSTEP_XY            // Also enable X/Y Babystepping. Not supported on DELTA!
605 605
   #define BABYSTEP_INVERT_Z false  // Change if Z babysteps should go the other way
606 606
   #define BABYSTEP_MULTIPLICATOR 1 // Babysteps are very small. Increase for faster motion.
607 607
   //#define BABYSTEP_ZPROBE_OFFSET // Enable to combine M851 and Babystepping

+ 2
- 2
Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h 查看文件

@@ -510,7 +510,7 @@
510 510
 
511 511
   // SD Card Sorting options
512 512
   #if ENABLED(SDCARD_SORT_ALPHA)
513
-    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256).
513
+    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256). Costs 27 bytes each.
514 514
     #define FOLDER_SORTING     -1     // -1=above  0=none  1=below
515 515
     #define SDSORT_GCODE       false  // Allow turning sorting on/off with LCD and M34 g-code.
516 516
     #define SDSORT_USES_RAM    false  // Pre-allocate a static array for faster pre-sorting.
@@ -601,7 +601,7 @@
601 601
  */
602 602
 //#define BABYSTEPPING
603 603
 #if ENABLED(BABYSTEPPING)
604
-  #define BABYSTEP_XY              // Also enable X/Y Babystepping. Not supported on DELTA!
604
+  //#define BABYSTEP_XY            // Also enable X/Y Babystepping. Not supported on DELTA!
605 605
   #define BABYSTEP_INVERT_Z false  // Change if Z babysteps should go the other way
606 606
   #define BABYSTEP_MULTIPLICATOR 1 // Babysteps are very small. Increase for faster motion.
607 607
   //#define BABYSTEP_ZPROBE_OFFSET // Enable to combine M851 and Babystepping

+ 2
- 2
Marlin/example_configurations/Cartesio/Configuration_adv.h 查看文件

@@ -510,7 +510,7 @@
510 510
 
511 511
   // SD Card Sorting options
512 512
   #if ENABLED(SDCARD_SORT_ALPHA)
513
-    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256).
513
+    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256). Costs 27 bytes each.
514 514
     #define FOLDER_SORTING     -1     // -1=above  0=none  1=below
515 515
     #define SDSORT_GCODE       false  // Allow turning sorting on/off with LCD and M34 g-code.
516 516
     #define SDSORT_USES_RAM    false  // Pre-allocate a static array for faster pre-sorting.
@@ -601,7 +601,7 @@
601 601
  */
602 602
 //#define BABYSTEPPING
603 603
 #if ENABLED(BABYSTEPPING)
604
-  #define BABYSTEP_XY              // Also enable X/Y Babystepping. Not supported on DELTA!
604
+  //#define BABYSTEP_XY            // Also enable X/Y Babystepping. Not supported on DELTA!
605 605
   #define BABYSTEP_INVERT_Z false  // Change if Z babysteps should go the other way
606 606
   #define BABYSTEP_MULTIPLICATOR 1 // Babysteps are very small. Increase for faster motion.
607 607
   //#define BABYSTEP_ZPROBE_OFFSET // Enable to combine M851 and Babystepping

+ 13
- 15
Marlin/example_configurations/Creality/CR-10/Configuration.h 查看文件

@@ -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
 // @section machine
95 95
 
96 96
 /**
@@ -702,7 +702,7 @@
702 702
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
703 703
 
704 704
 // Use double touch for probing
705
-#define PROBE_DOUBLE_TOUCH
705
+//#define PROBE_DOUBLE_TOUCH
706 706
 
707 707
 /**
708 708
  * Z probes require clearance when deploying, stowing, and moving between
@@ -788,7 +788,7 @@
788 788
 #define X_MIN_POS 0
789 789
 #define Y_MIN_POS 0
790 790
 #define Z_MIN_POS 0
791
-#define X_MAX_POS X_BED_SIZE
791
+#define X_MAX_POS X_BED_SIZE + 20
792 792
 #define Y_MAX_POS Y_BED_SIZE
793 793
 #define Z_MAX_POS 400
794 794
 
@@ -939,7 +939,7 @@
939 939
   #define UBL_PROBE_PT_3_X 180
940 940
   #define UBL_PROBE_PT_3_Y 20
941 941
 
942
-  #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
942
+  //#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
943 943
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
944 944
 
945 945
 #elif ENABLED(MESH_BED_LEVELING)
@@ -968,7 +968,7 @@
968 968
 #endif
969 969
 
970 970
 // Add a menu item to move between bed corners for manual bed adjustment
971
-//#define LEVEL_BED_CORNERS
971
+#define LEVEL_BED_CORNERS
972 972
 
973 973
 /**
974 974
  * Commands to execute at the end of G29 probing.
@@ -996,6 +996,7 @@
996 996
 // - If stepper drivers time out, it will need X and Y homing again before Z homing.
997 997
 // - Move the Z probe (or nozzle) to a defined XY point before Z Homing when homing all axes (G28).
998 998
 // - Prevent Z homing when the Z probe is outside bed area.
999
+//
999 1000
 //#define Z_SAFE_HOMING
1000 1001
 
1001 1002
 #if ENABLED(Z_SAFE_HOMING)
@@ -1020,13 +1021,10 @@
1020 1021
 // M500 - stores parameters in EEPROM
1021 1022
 // M501 - reads parameters from EEPROM (if you need reset them after you changed them temporarily).
1022 1023
 // M502 - reverts to the default "factory settings".  You still need to store them in EEPROM afterwards if you want to.
1023
-// Define this to enable EEPROM support
1024
-#define EEPROM_SETTINGS
1025
-
1026
-#if ENABLED(EEPROM_SETTINGS)
1027
-  //#define DISABLE_M503  // Saves ~2700 bytes of PROGMEM. Disable for release!
1028
-  #define EEPROM_CHITCHAT // Print a report on M500. Please keep turned on.
1029
-#endif
1024
+//
1025
+#define EEPROM_SETTINGS // Enable for M500 and M501 commands
1026
+//#define DISABLE_M503    // Saves ~2700 bytes of PROGMEM. Disable for release!
1027
+#define EEPROM_CHITCHAT   // Give feedback on EEPROM commands. Disable to save PROGMEM.
1030 1028
 
1031 1029
 //
1032 1030
 // Host Keepalive
@@ -1056,7 +1054,7 @@
1056 1054
 // @section temperature
1057 1055
 
1058 1056
 // Preheat Constants
1059
-#define PREHEAT_1_TEMP_HOTEND 200
1057
+#define PREHEAT_1_TEMP_HOTEND 190
1060 1058
 #define PREHEAT_1_TEMP_BED     70
1061 1059
 #define PREHEAT_1_FAN_SPEED     0 // Value from 0 to 255
1062 1060
 
@@ -1159,7 +1157,7 @@
1159 1157
  *   M76 - Pause the print job timer
1160 1158
  *   M77 - Stop the print job timer
1161 1159
  */
1162
-//#define PRINTJOB_TIMER_AUTOSTART
1160
+#define PRINTJOB_TIMER_AUTOSTART
1163 1161
 
1164 1162
 /**
1165 1163
  * Print Counter

+ 1415
- 0
Marlin/example_configurations/Creality/CR-10/Configuration_adv.h
文件差异内容过多而无法显示
查看文件


+ 100
- 0
Marlin/example_configurations/Creality/CR-10/_Bootscreen.h 查看文件

@@ -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
+};

+ 2
- 2
Marlin/example_configurations/Felix/Configuration_adv.h 查看文件

@@ -510,7 +510,7 @@
510 510
 
511 511
   // SD Card Sorting options
512 512
   #if ENABLED(SDCARD_SORT_ALPHA)
513
-    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256).
513
+    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256). Costs 27 bytes each.
514 514
     #define FOLDER_SORTING     -1     // -1=above  0=none  1=below
515 515
     #define SDSORT_GCODE       false  // Allow turning sorting on/off with LCD and M34 g-code.
516 516
     #define SDSORT_USES_RAM    false  // Pre-allocate a static array for faster pre-sorting.
@@ -601,7 +601,7 @@
601 601
  */
602 602
 //#define BABYSTEPPING
603 603
 #if ENABLED(BABYSTEPPING)
604
-  #define BABYSTEP_XY              // Also enable X/Y Babystepping. Not supported on DELTA!
604
+  //#define BABYSTEP_XY            // Also enable X/Y Babystepping. Not supported on DELTA!
605 605
   #define BABYSTEP_INVERT_Z false  // Change if Z babysteps should go the other way
606 606
   #define BABYSTEP_MULTIPLICATOR 1 // Babysteps are very small. Increase for faster motion.
607 607
   //#define BABYSTEP_ZPROBE_OFFSET // Enable to combine M851 and Babystepping

+ 2
- 2
Marlin/example_configurations/Folger Tech/i3-2020/Configuration_adv.h 查看文件

@@ -510,7 +510,7 @@
510 510
 
511 511
   // SD Card Sorting options
512 512
   #if ENABLED(SDCARD_SORT_ALPHA)
513
-    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256).
513
+    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256). Costs 27 bytes each.
514 514
     #define FOLDER_SORTING     -1     // -1=above  0=none  1=below
515 515
     #define SDSORT_GCODE       false  // Allow turning sorting on/off with LCD and M34 g-code.
516 516
     #define SDSORT_USES_RAM    false  // Pre-allocate a static array for faster pre-sorting.
@@ -601,7 +601,7 @@
601 601
  */
602 602
 #define BABYSTEPPING
603 603
 #if ENABLED(BABYSTEPPING)
604
-  #define BABYSTEP_XY              // Also enable X/Y Babystepping. Not supported on DELTA!
604
+  //#define BABYSTEP_XY            // Also enable X/Y Babystepping. Not supported on DELTA!
605 605
   #define BABYSTEP_INVERT_Z false  // Change if Z babysteps should go the other way
606 606
   #define BABYSTEP_MULTIPLICATOR 2 // Babysteps are very small. Increase for faster motion.
607 607
   //#define BABYSTEP_ZPROBE_OFFSET // Enable to combine M851 and Babystepping

+ 2
- 2
Marlin/example_configurations/Infitary/i3-M508/Configuration_adv.h 查看文件

@@ -510,7 +510,7 @@
510 510
 
511 511
   // SD Card Sorting options
512 512
   #if ENABLED(SDCARD_SORT_ALPHA)
513
-    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256).
513
+    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256). Costs 27 bytes each.
514 514
     #define FOLDER_SORTING     -1     // -1=above  0=none  1=below
515 515
     #define SDSORT_GCODE       false  // Allow turning sorting on/off with LCD and M34 g-code.
516 516
     #define SDSORT_USES_RAM    false  // Pre-allocate a static array for faster pre-sorting.
@@ -601,7 +601,7 @@
601 601
  */
602 602
 //#define BABYSTEPPING
603 603
 #if ENABLED(BABYSTEPPING)
604
-  #define BABYSTEP_XY              // Also enable X/Y Babystepping. Not supported on DELTA!
604
+  //#define BABYSTEP_XY            // Also enable X/Y Babystepping. Not supported on DELTA!
605 605
   #define BABYSTEP_INVERT_Z false  // Change if Z babysteps should go the other way
606 606
   #define BABYSTEP_MULTIPLICATOR 1 // Babysteps are very small. Increase for faster motion.
607 607
   //#define BABYSTEP_ZPROBE_OFFSET // Enable to combine M851 and Babystepping

+ 2
- 2
Marlin/example_configurations/Malyan/M150/Configuration_adv.h 查看文件

@@ -510,7 +510,7 @@
510 510
 
511 511
   // SD Card Sorting options
512 512
   #if ENABLED(SDCARD_SORT_ALPHA)
513
-    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256).
513
+    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256). Costs 27 bytes each.
514 514
     #define FOLDER_SORTING     -1     // -1=above  0=none  1=below
515 515
     #define SDSORT_GCODE       false  // Allow turning sorting on/off with LCD and M34 g-code.
516 516
     #define SDSORT_USES_RAM    false  // Pre-allocate a static array for faster pre-sorting.
@@ -601,7 +601,7 @@
601 601
  */
602 602
 //#define BABYSTEPPING
603 603
 #if ENABLED(BABYSTEPPING)
604
-  #define BABYSTEP_XY              // Also enable X/Y Babystepping. Not supported on DELTA!
604
+  //#define BABYSTEP_XY            // Also enable X/Y Babystepping. Not supported on DELTA!
605 605
   #define BABYSTEP_INVERT_Z false  // Change if Z babysteps should go the other way
606 606
   #define BABYSTEP_MULTIPLICATOR 1 // Babysteps are very small. Increase for faster motion.
607 607
   //#define BABYSTEP_ZPROBE_OFFSET // Enable to combine M851 and Babystepping

+ 2
- 2
Marlin/example_configurations/RigidBot/Configuration_adv.h 查看文件

@@ -510,7 +510,7 @@
510 510
 
511 511
   // SD Card Sorting options
512 512
   #if ENABLED(SDCARD_SORT_ALPHA)
513
-    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256).
513
+    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256). Costs 27 bytes each.
514 514
     #define FOLDER_SORTING     -1     // -1=above  0=none  1=below
515 515
     #define SDSORT_GCODE       false  // Allow turning sorting on/off with LCD and M34 g-code.
516 516
     #define SDSORT_USES_RAM    false  // Pre-allocate a static array for faster pre-sorting.
@@ -601,7 +601,7 @@
601 601
  */
602 602
 //#define BABYSTEPPING
603 603
 #if ENABLED(BABYSTEPPING)
604
-  #define BABYSTEP_XY              // Also enable X/Y Babystepping. Not supported on DELTA!
604
+  //#define BABYSTEP_XY            // Also enable X/Y Babystepping. Not supported on DELTA!
605 605
   #define BABYSTEP_INVERT_Z false  // Change if Z babysteps should go the other way
606 606
   #define BABYSTEP_MULTIPLICATOR 1 // Babysteps are very small. Increase for faster motion.
607 607
   //#define BABYSTEP_ZPROBE_OFFSET // Enable to combine M851 and Babystepping

+ 2
- 2
Marlin/example_configurations/SCARA/Configuration_adv.h 查看文件

@@ -510,7 +510,7 @@
510 510
 
511 511
   // SD Card Sorting options
512 512
   #if ENABLED(SDCARD_SORT_ALPHA)
513
-    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256).
513
+    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256). Costs 27 bytes each.
514 514
     #define FOLDER_SORTING     -1     // -1=above  0=none  1=below
515 515
     #define SDSORT_GCODE       false  // Allow turning sorting on/off with LCD and M34 g-code.
516 516
     #define SDSORT_USES_RAM    false  // Pre-allocate a static array for faster pre-sorting.
@@ -601,7 +601,7 @@
601 601
  */
602 602
 //#define BABYSTEPPING
603 603
 #if ENABLED(BABYSTEPPING)
604
-  #define BABYSTEP_XY              // Also enable X/Y Babystepping. Not supported on DELTA!
604
+  //#define BABYSTEP_XY            // Also enable X/Y Babystepping. Not supported on DELTA!
605 605
   #define BABYSTEP_INVERT_Z false  // Change if Z babysteps should go the other way
606 606
   #define BABYSTEP_MULTIPLICATOR 1 // Babysteps are very small. Increase for faster motion.
607 607
   //#define BABYSTEP_ZPROBE_OFFSET // Enable to combine M851 and Babystepping

+ 1
- 1
Marlin/example_configurations/Sanguinololu/Configuration.h 查看文件

@@ -181,7 +181,7 @@
181 181
  */
182 182
 //#define PARKING_EXTRUDER
183 183
 #if ENABLED(PARKING_EXTRUDER)
184
-  #define PARKING_EXTRUDER_SOLENOIDS_INVERT           // If enabled, the solenoid not magnetized with applied voltage
184
+  #define PARKING_EXTRUDER_SOLENOIDS_INVERT           // If enabled, the solenoid is NOT magnetized with applied voltage
185 185
   #define PARKING_EXTRUDER_SOLENOIDS_PINS_ACTIVE LOW  // LOW or HIGH pin signal energizes the coil
186 186
   #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250        // Delay (ms) for magnetic field. No delay if 0 or not defined.
187 187
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders

+ 2
- 2
Marlin/example_configurations/Sanguinololu/Configuration_adv.h 查看文件

@@ -499,7 +499,7 @@
499 499
 
500 500
   // SD Card Sorting options
501 501
   #if ENABLED(SDCARD_SORT_ALPHA)
502
-    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256).
502
+    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256). Costs 27 bytes each.
503 503
     #define FOLDER_SORTING     -1     // -1=above  0=none  1=below
504 504
     #define SDSORT_GCODE       false  // Allow turning sorting on/off with LCD and M34 g-code.
505 505
     #define SDSORT_USES_RAM    false  // Pre-allocate a static array for faster pre-sorting.
@@ -590,7 +590,7 @@
590 590
  */
591 591
 //#define BABYSTEPPING
592 592
 #if ENABLED(BABYSTEPPING)
593
-  #define BABYSTEP_XY              // Also enable X/Y Babystepping. Not supported on DELTA!
593
+  //#define BABYSTEP_XY            // Also enable X/Y Babystepping. Not supported on DELTA!
594 594
   #define BABYSTEP_INVERT_Z false  // Change if Z babysteps should go the other way
595 595
   #define BABYSTEP_MULTIPLICATOR 1 // Babysteps are very small. Increase for faster motion.
596 596
   //#define BABYSTEP_ZPROBE_OFFSET // Enable to combine M851 and Babystepping

+ 2
- 2
Marlin/example_configurations/TinyBoy2/Configuration_adv.h 查看文件

@@ -510,7 +510,7 @@
510 510
 
511 511
   // SD Card Sorting options
512 512
   #if ENABLED(SDCARD_SORT_ALPHA)
513
-    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256).
513
+    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256). Costs 27 bytes each.
514 514
     #define FOLDER_SORTING     -1     // -1=above  0=none  1=below
515 515
     #define SDSORT_GCODE       false  // Allow turning sorting on/off with LCD and M34 g-code.
516 516
     #define SDSORT_USES_RAM    false  // Pre-allocate a static array for faster pre-sorting.
@@ -601,7 +601,7 @@
601 601
  */
602 602
 //#define BABYSTEPPING
603 603
 #if ENABLED(BABYSTEPPING)
604
-  #define BABYSTEP_XY              // Also enable X/Y Babystepping. Not supported on DELTA!
604
+  //#define BABYSTEP_XY            // Also enable X/Y Babystepping. Not supported on DELTA!
605 605
   #define BABYSTEP_INVERT_Z false  // Change if Z babysteps should go the other way
606 606
   #define BABYSTEP_MULTIPLICATOR 1 // Babysteps are very small. Increase for faster motion.
607 607
   //#define BABYSTEP_ZPROBE_OFFSET // Enable to combine M851 and Babystepping

+ 2
- 2
Marlin/example_configurations/Velleman/K8200/Configuration_adv.h 查看文件

@@ -523,7 +523,7 @@
523 523
 
524 524
   // SD Card Sorting options
525 525
   #if ENABLED(SDCARD_SORT_ALPHA)
526
-    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256).
526
+    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256). Costs 27 bytes each.
527 527
     #define FOLDER_SORTING     -1     // -1=above  0=none  1=below
528 528
     #define SDSORT_GCODE       false  // Allow turning sorting on/off with LCD and M34 g-code.
529 529
     #define SDSORT_USES_RAM    false  // Pre-allocate a static array for faster pre-sorting.
@@ -614,7 +614,7 @@
614 614
  */
615 615
 #define BABYSTEPPING
616 616
 #if ENABLED(BABYSTEPPING)
617
-  #define BABYSTEP_XY              // Also enable X/Y Babystepping. Not supported on DELTA!
617
+  //#define BABYSTEP_XY            // Also enable X/Y Babystepping. Not supported on DELTA!
618 618
   #define BABYSTEP_INVERT_Z false  // Change if Z babysteps should go the other way
619 619
   #define BABYSTEP_MULTIPLICATOR 1 // Babysteps are very small. Increase for faster motion.
620 620
   //#define BABYSTEP_ZPROBE_OFFSET // Enable to combine M851 and Babystepping

+ 2
- 2
Marlin/example_configurations/Velleman/K8400/Configuration_adv.h 查看文件

@@ -510,7 +510,7 @@
510 510
 
511 511
   // SD Card Sorting options
512 512
   #if ENABLED(SDCARD_SORT_ALPHA)
513
-    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256).
513
+    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256). Costs 27 bytes each.
514 514
     #define FOLDER_SORTING     -1     // -1=above  0=none  1=below
515 515
     #define SDSORT_GCODE       false  // Allow turning sorting on/off with LCD and M34 g-code.
516 516
     #define SDSORT_USES_RAM    false  // Pre-allocate a static array for faster pre-sorting.
@@ -601,7 +601,7 @@
601 601
  */
602 602
 //#define BABYSTEPPING
603 603
 #if ENABLED(BABYSTEPPING)
604
-  #define BABYSTEP_XY              // Also enable X/Y Babystepping. Not supported on DELTA!
604
+  //#define BABYSTEP_XY            // Also enable X/Y Babystepping. Not supported on DELTA!
605 605
   #define BABYSTEP_INVERT_Z false  // Change if Z babysteps should go the other way
606 606
   #define BABYSTEP_MULTIPLICATOR 1 // Babysteps are very small. Increase for faster motion.
607 607
   //#define BABYSTEP_ZPROBE_OFFSET // Enable to combine M851 and Babystepping

+ 1
- 1
Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h 查看文件

@@ -512,7 +512,7 @@
512 512
 
513 513
   // SD Card Sorting options
514 514
   #if ENABLED(SDCARD_SORT_ALPHA)
515
-    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256).
515
+    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256). Costs 27 bytes each.
516 516
     #define FOLDER_SORTING     -1     // -1=above  0=none  1=below
517 517
     #define SDSORT_GCODE       false  // Allow turning sorting on/off with LCD and M34 g-code.
518 518
     #define SDSORT_USES_RAM    false  // Pre-allocate a static array for faster pre-sorting.

+ 2
- 2
Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h 查看文件

@@ -512,7 +512,7 @@
512 512
 
513 513
   // SD Card Sorting options
514 514
   #if ENABLED(SDCARD_SORT_ALPHA)
515
-    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256).
515
+    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256). Costs 27 bytes each.
516 516
     #define FOLDER_SORTING     -1     // -1=above  0=none  1=below
517 517
     #define SDSORT_GCODE       false  // Allow turning sorting on/off with LCD and M34 g-code.
518 518
     #define SDSORT_USES_RAM    false  // Pre-allocate a static array for faster pre-sorting.
@@ -603,7 +603,7 @@
603 603
  */
604 604
 //#define BABYSTEPPING
605 605
 #if ENABLED(BABYSTEPPING)
606
-  #define BABYSTEP_XY              // Also enable X/Y Babystepping. Not supported on DELTA!
606
+  //#define BABYSTEP_XY            // Also enable X/Y Babystepping. Not supported on DELTA!
607 607
   #define BABYSTEP_INVERT_Z false  // Change if Z babysteps should go the other way
608 608
   #define BABYSTEP_MULTIPLICATOR 1 // Babysteps are very small. Increase for faster motion.
609 609
   //#define BABYSTEP_ZPROBE_OFFSET // Enable to combine M851 and Babystepping

+ 2
- 2
Marlin/example_configurations/delta/generic/Configuration_adv.h 查看文件

@@ -512,7 +512,7 @@
512 512
 
513 513
   // SD Card Sorting options
514 514
   #if ENABLED(SDCARD_SORT_ALPHA)
515
-    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256).
515
+    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256). Costs 27 bytes each.
516 516
     #define FOLDER_SORTING     -1     // -1=above  0=none  1=below
517 517
     #define SDSORT_GCODE       false  // Allow turning sorting on/off with LCD and M34 g-code.
518 518
     #define SDSORT_USES_RAM    false  // Pre-allocate a static array for faster pre-sorting.
@@ -603,7 +603,7 @@
603 603
  */
604 604
 //#define BABYSTEPPING
605 605
 #if ENABLED(BABYSTEPPING)
606
-  #define BABYSTEP_XY              // Also enable X/Y Babystepping. Not supported on DELTA!
606
+  //#define BABYSTEP_XY            // Also enable X/Y Babystepping. Not supported on DELTA!
607 607
   #define BABYSTEP_INVERT_Z false  // Change if Z babysteps should go the other way
608 608
   #define BABYSTEP_MULTIPLICATOR 1 // Babysteps are very small. Increase for faster motion.
609 609
   //#define BABYSTEP_ZPROBE_OFFSET // Enable to combine M851 and Babystepping

+ 2
- 2
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h 查看文件

@@ -512,7 +512,7 @@
512 512
 
513 513
   // SD Card Sorting options
514 514
   #if ENABLED(SDCARD_SORT_ALPHA)
515
-    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256).
515
+    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256). Costs 27 bytes each.
516 516
     #define FOLDER_SORTING     -1     // -1=above  0=none  1=below
517 517
     #define SDSORT_GCODE       false  // Allow turning sorting on/off with LCD and M34 g-code.
518 518
     #define SDSORT_USES_RAM    false  // Pre-allocate a static array for faster pre-sorting.
@@ -603,7 +603,7 @@
603 603
  */
604 604
 //#define BABYSTEPPING
605 605
 #if ENABLED(BABYSTEPPING)
606
-  #define BABYSTEP_XY              // Also enable X/Y Babystepping. Not supported on DELTA!
606
+  //#define BABYSTEP_XY            // Also enable X/Y Babystepping. Not supported on DELTA!
607 607
   #define BABYSTEP_INVERT_Z false  // Change if Z babysteps should go the other way
608 608
   #define BABYSTEP_MULTIPLICATOR 1 // Babysteps are very small. Increase for faster motion.
609 609
   //#define BABYSTEP_ZPROBE_OFFSET // Enable to combine M851 and Babystepping

+ 2
- 2
Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h 查看文件

@@ -517,7 +517,7 @@
517 517
 
518 518
   // SD Card Sorting options
519 519
   #if ENABLED(SDCARD_SORT_ALPHA)
520
-    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256).
520
+    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256). Costs 27 bytes each.
521 521
     #define FOLDER_SORTING     -1     // -1=above  0=none  1=below
522 522
     #define SDSORT_GCODE       false  // Allow turning sorting on/off with LCD and M34 g-code.
523 523
     #define SDSORT_USES_RAM    false  // Pre-allocate a static array for faster pre-sorting.
@@ -608,7 +608,7 @@
608 608
  */
609 609
 //#define BABYSTEPPING
610 610
 #if ENABLED(BABYSTEPPING)
611
-  #define BABYSTEP_XY              // Also enable X/Y Babystepping. Not supported on DELTA!
611
+  //#define BABYSTEP_XY            // Also enable X/Y Babystepping. Not supported on DELTA!
612 612
   #define BABYSTEP_INVERT_Z false  // Change if Z babysteps should go the other way
613 613
   #define BABYSTEP_MULTIPLICATOR 1 // Babysteps are very small. Increase for faster motion.
614 614
   //#define BABYSTEP_ZPROBE_OFFSET // Enable to combine M851 and Babystepping

+ 2
- 2
Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h 查看文件

@@ -512,7 +512,7 @@
512 512
 
513 513
   // SD Card Sorting options
514 514
   #if ENABLED(SDCARD_SORT_ALPHA)
515
-    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256).
515
+    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256). Costs 27 bytes each.
516 516
     #define FOLDER_SORTING     -1     // -1=above  0=none  1=below
517 517
     #define SDSORT_GCODE       false  // Allow turning sorting on/off with LCD and M34 g-code.
518 518
     #define SDSORT_USES_RAM    false  // Pre-allocate a static array for faster pre-sorting.
@@ -603,7 +603,7 @@
603 603
  */
604 604
 //#define BABYSTEPPING
605 605
 #if ENABLED(BABYSTEPPING)
606
-  #define BABYSTEP_XY              // Also enable X/Y Babystepping. Not supported on DELTA!
606
+  //#define BABYSTEP_XY            // Also enable X/Y Babystepping. Not supported on DELTA!
607 607
   #define BABYSTEP_INVERT_Z false  // Change if Z babysteps should go the other way
608 608
   #define BABYSTEP_MULTIPLICATOR 1 // Babysteps are very small. Increase for faster motion.
609 609
   //#define BABYSTEP_ZPROBE_OFFSET // Enable to combine M851 and Babystepping

+ 5
- 5
Marlin/example_configurations/gCreate/gMax1.5+/Configuration_adv.h 查看文件

@@ -510,7 +510,7 @@
510 510
 
511 511
   // SD Card Sorting options
512 512
   #if ENABLED(SDCARD_SORT_ALPHA)
513
-    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256).
513
+    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256). Costs 27 bytes each.
514 514
     #define FOLDER_SORTING     -1     // -1=above  0=none  1=below
515 515
     #define SDSORT_GCODE       false  // Allow turning sorting on/off with LCD and M34 g-code.
516 516
     #define SDSORT_USES_RAM    false  // Pre-allocate a static array for faster pre-sorting.
@@ -601,7 +601,7 @@
601 601
  */
602 602
 #define BABYSTEPPING
603 603
 #if ENABLED(BABYSTEPPING)
604
-  #define BABYSTEP_XY              // Also enable X/Y Babystepping. Not supported on DELTA!
604
+  //#define BABYSTEP_XY            // Also enable X/Y Babystepping. Not supported on DELTA!
605 605
   #define BABYSTEP_INVERT_Z false  // Change if Z babysteps should go the other way
606 606
   #define BABYSTEP_MULTIPLICATOR 1 // Babysteps are very small. Increase for faster motion.
607 607
   //#define BABYSTEP_ZPROBE_OFFSET // Enable to combine M851 and Babystepping
@@ -1396,9 +1396,9 @@
1396 1396
 
1397 1397
 #define MAX7219_DEBUG
1398 1398
 #if ENABLED(MAX7219_DEBUG)
1399
-  #define MAX7219_CLK_PIN   64  // 77 on Re-ARM       // Configuration of the 3 pins to control the display 
1400
-  #define MAX7219_DIN_PIN 57  // 78 on Re-ARM
1401
-  #define MAX7219_LOAD_PIN    44  // 79 on Re-ARM
1399
+  #define MAX7219_CLK_PIN   64  // 77 on Re-ARM       // Configuration of the 3 pins to control the display
1400
+  #define MAX7219_DIN_PIN   57  // 78 on Re-ARM
1401
+  #define MAX7219_LOAD_PIN  44  // 79 on Re-ARM
1402 1402
 
1403 1403
   /**
1404 1404
    * Sample debug features

+ 2
- 2
Marlin/example_configurations/makibox/Configuration_adv.h 查看文件

@@ -510,7 +510,7 @@
510 510
 
511 511
   // SD Card Sorting options
512 512
   #if ENABLED(SDCARD_SORT_ALPHA)
513
-    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256).
513
+    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256). Costs 27 bytes each.
514 514
     #define FOLDER_SORTING     -1     // -1=above  0=none  1=below
515 515
     #define SDSORT_GCODE       false  // Allow turning sorting on/off with LCD and M34 g-code.
516 516
     #define SDSORT_USES_RAM    false  // Pre-allocate a static array for faster pre-sorting.
@@ -601,7 +601,7 @@
601 601
  */
602 602
 //#define BABYSTEPPING
603 603
 #if ENABLED(BABYSTEPPING)
604
-  #define BABYSTEP_XY              // Also enable X/Y Babystepping. Not supported on DELTA!
604
+  //#define BABYSTEP_XY            // Also enable X/Y Babystepping. Not supported on DELTA!
605 605
   #define BABYSTEP_INVERT_Z false  // Change if Z babysteps should go the other way
606 606
   #define BABYSTEP_MULTIPLICATOR 1 // Babysteps are very small. Increase for faster motion.
607 607
   //#define BABYSTEP_ZPROBE_OFFSET // Enable to combine M851 and Babystepping

+ 2
- 2
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h 查看文件

@@ -510,7 +510,7 @@
510 510
 
511 511
   // SD Card Sorting options
512 512
   #if ENABLED(SDCARD_SORT_ALPHA)
513
-    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256).
513
+    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256). Costs 27 bytes each.
514 514
     #define FOLDER_SORTING     -1     // -1=above  0=none  1=below
515 515
     #define SDSORT_GCODE       false  // Allow turning sorting on/off with LCD and M34 g-code.
516 516
     #define SDSORT_USES_RAM    false  // Pre-allocate a static array for faster pre-sorting.
@@ -601,7 +601,7 @@
601 601
  */
602 602
 //#define BABYSTEPPING
603 603
 #if ENABLED(BABYSTEPPING)
604
-  #define BABYSTEP_XY              // Also enable X/Y Babystepping. Not supported on DELTA!
604
+  //#define BABYSTEP_XY            // Also enable X/Y Babystepping. Not supported on DELTA!
605 605
   #define BABYSTEP_INVERT_Z false  // Change if Z babysteps should go the other way
606 606
   #define BABYSTEP_MULTIPLICATOR 1 // Babysteps are very small. Increase for faster motion.
607 607
   //#define BABYSTEP_ZPROBE_OFFSET // Enable to combine M851 and Babystepping

+ 2
- 2
Marlin/example_configurations/wt150/Configuration_adv.h 查看文件

@@ -510,7 +510,7 @@
510 510
 
511 511
   // SD Card Sorting options
512 512
   #if ENABLED(SDCARD_SORT_ALPHA)
513
-    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256).
513
+    #define SDSORT_LIMIT       40     // Maximum number of sorted items (10-256). Costs 27 bytes each.
514 514
     #define FOLDER_SORTING     -1     // -1=above  0=none  1=below
515 515
     #define SDSORT_GCODE       false  // Allow turning sorting on/off with LCD and M34 g-code.
516 516
     #define SDSORT_USES_RAM    false  // Pre-allocate a static array for faster pre-sorting.
@@ -601,7 +601,7 @@
601 601
  */
602 602
 //#define BABYSTEPPING
603 603
 #if ENABLED(BABYSTEPPING)
604
-  #define BABYSTEP_XY              // Also enable X/Y Babystepping. Not supported on DELTA!
604
+  //#define BABYSTEP_XY            // Also enable X/Y Babystepping. Not supported on DELTA!
605 605
   #define BABYSTEP_INVERT_Z false  // Change if Z babysteps should go the other way
606 606
   #define BABYSTEP_MULTIPLICATOR 1 // Babysteps are very small. Increase for faster motion.
607 607
   //#define BABYSTEP_ZPROBE_OFFSET // Enable to combine M851 and Babystepping

+ 6
- 6
Marlin/serial.h 查看文件

@@ -57,8 +57,8 @@ extern const char errormagic[] PROGMEM;
57 57
 #define SERIAL_ECHOPGM(x)              SERIAL_PROTOCOLPGM(x)
58 58
 #define SERIAL_ECHOLN(x)               SERIAL_PROTOCOLLN(x)
59 59
 #define SERIAL_ECHOLNPGM(x)            SERIAL_PROTOCOLLNPGM(x)
60
-#define SERIAL_ECHOPAIR(name,value)    SERIAL_PROTOCOLPAIR(name, value)
61
-#define SERIAL_ECHOLNPAIR(name, value) SERIAL_PROTOCOLLNPAIR(name, value)
60
+#define SERIAL_ECHOPAIR(pre,value)     SERIAL_PROTOCOLPAIR(pre, value)
61
+#define SERIAL_ECHOLNPAIR(pre,value)   SERIAL_PROTOCOLLNPAIR(pre, value)
62 62
 #define SERIAL_ECHO_F(x,y)             SERIAL_PROTOCOL_F(x,y)
63 63
 
64 64
 #define SERIAL_ERROR_START()           (serialprintPGM(errormagic))
@@ -68,10 +68,10 @@ extern const char errormagic[] PROGMEM;
68 68
 #define SERIAL_ERRORLNPGM(x)           SERIAL_PROTOCOLLNPGM(x)
69 69
 
70 70
 // These macros compensate for float imprecision
71
-#define SERIAL_PROTOCOLPAIR_F(name, value)    SERIAL_PROTOCOLPAIR(name, FIXFLOAT(value))
72
-#define SERIAL_PROTOCOLLNPAIR_F(name, value)  SERIAL_PROTOCOLLNPAIR(name, FIXFLOAT(value))
73
-#define SERIAL_ECHOPAIR_F(name,value)         SERIAL_ECHOPAIR(name, FIXFLOAT(value))
74
-#define SERIAL_ECHOLNPAIR_F(name, value)      SERIAL_ECHOLNPAIR(name, FIXFLOAT(value))
71
+#define SERIAL_PROTOCOLPAIR_F(pre, value)    SERIAL_PROTOCOLPAIR(pre, FIXFLOAT(value))
72
+#define SERIAL_PROTOCOLLNPAIR_F(pre, value)  SERIAL_PROTOCOLLNPAIR(pre, FIXFLOAT(value))
73
+#define SERIAL_ECHOPAIR_F(pre,value)         SERIAL_ECHOPAIR(pre, FIXFLOAT(value))
74
+#define SERIAL_ECHOLNPAIR_F(pre, value)      SERIAL_ECHOLNPAIR(pre, FIXFLOAT(value))
75 75
 
76 76
 void serial_echopair_P(const char* s_P, const char *v);
77 77
 void serial_echopair_P(const char* s_P, char v);

+ 11
- 11
Marlin/ultralcd.cpp 查看文件

@@ -1029,11 +1029,11 @@ void kill_screen(const char* lcd_msg) {
1029 1029
     #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
1030 1030
 
1031 1031
       #if ENABLED(BABYSTEP_ZPROBE_GFX_OVERLAY)
1032
-        void _lcd_babystep_zoffset_overlay(float zprobe_zoffset) {
1032
+        void _lcd_babystep_zoffset_overlay(const float zprobe_zoffset) {
1033 1033
           // Determine whether the user is raising or lowering the nozzle.
1034 1034
           static int dir = 0;
1035 1035
           static float old_zprobe_zoffset = 0;
1036
-          if(zprobe_zoffset != old_zprobe_zoffset) {
1036
+          if (zprobe_zoffset != old_zprobe_zoffset) {
1037 1037
             dir = (zprobe_zoffset > old_zprobe_zoffset) ? 1 : -1;
1038 1038
             old_zprobe_zoffset = zprobe_zoffset;
1039 1039
           }
@@ -1047,21 +1047,21 @@ void kill_screen(const char* lcd_msg) {
1047 1047
           #endif
1048 1048
 
1049 1049
           #if ENABLED(USE_BIG_EDIT_FONT)
1050
-            const int left   = 0;
1051
-            const int right  = 45;
1052
-            const int nozzle = 95;
1050
+            const int left   = 0,
1051
+                      right  = 45,
1052
+                      nozzle = 95;
1053 1053
           #else
1054
-            const int left   = 5;
1055
-            const int right  = 90;
1056
-            const int nozzle = 60;
1054
+            const int left   = 5,
1055
+                      right  = 90,
1056
+                      nozzle = 60;
1057 1057
           #endif
1058 1058
 
1059 1059
           // Draw a representation of the nozzle
1060
-          if(PAGE_CONTAINS(3,16))  u8g.drawBitmapP(nozzle + 6, 4 - dir,2,12,nozzle_bmp);
1061
-          if(PAGE_CONTAINS(20,20)) u8g.drawBitmapP(nozzle + 0,20,3,1,offset_bedline_bmp);
1060
+          if (PAGE_CONTAINS(3, 16))  u8g.drawBitmapP(nozzle + 6, 4 - dir, 2, 12, nozzle_bmp);
1061
+          if (PAGE_CONTAINS(20, 20)) u8g.drawBitmapP(nozzle + 0, 20, 3, 1, offset_bedline_bmp);
1062 1062
 
1063 1063
           // Draw cw/ccw indicator and up/down arrows.
1064
-          if(PAGE_CONTAINS(47,62)) {
1064
+          if (PAGE_CONTAINS(47, 62)) {
1065 1065
             u8g.drawBitmapP(left  + 0, 47, 3, 16, rot_down);
1066 1066
             u8g.drawBitmapP(right + 0, 47, 3, 16, rot_up);
1067 1067
             u8g.drawBitmapP(right + 20, 48 - dir, 2, 13, up_arrow_bmp);

正在加载...
取消
保存