Browse Source

Added modified Ender-3 config

Thomas Buck 4 years ago
parent
commit
a2fe0244a2
4 changed files with 240 additions and 75 deletions
  1. 46
    42
      Marlin/Configuration.h
  2. 35
    33
      Marlin/Configuration_adv.h
  3. 97
    0
      Marlin/_Bootscreen.h
  4. 62
    0
      Marlin/_Statusscreen.h

+ 46
- 42
Marlin/Configuration.h View File

@@ -71,7 +71,7 @@
71 71
 // @section info
72 72
 
73 73
 // Author info of this build printed to the host during boot and M115
74
-#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.
74
+#define STRING_CONFIG_H_AUTHOR "(xythobuz, Ender-3)" // Who made the changes.
75 75
 //#define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes)
76 76
 
77 77
 /**
@@ -89,10 +89,10 @@
89 89
 #define SHOW_BOOTSCREEN
90 90
 
91 91
 // Show the bitmap in Marlin/_Bootscreen.h on startup.
92
-//#define SHOW_CUSTOM_BOOTSCREEN
92
+#define SHOW_CUSTOM_BOOTSCREEN
93 93
 
94 94
 // Show the bitmap in Marlin/_Statusscreen.h on the status screen.
95
-//#define CUSTOM_STATUS_SCREEN_IMAGE
95
+#define CUSTOM_STATUS_SCREEN_IMAGE
96 96
 
97 97
 // @section machine
98 98
 
@@ -123,18 +123,18 @@
123 123
  *
124 124
  * :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000]
125 125
  */
126
-#define BAUDRATE 250000
126
+#define BAUDRATE 115200
127 127
 
128 128
 // Enable the Bluetooth serial interface on AT90USB devices
129 129
 //#define BLUETOOTH
130 130
 
131 131
 // Choose the name from boards.h that matches your setup
132 132
 #ifndef MOTHERBOARD
133
-  #define MOTHERBOARD BOARD_RAMPS_14_EFB
133
+  #define MOTHERBOARD BOARD_MELZI_CREALITY
134 134
 #endif
135 135
 
136 136
 // Name displayed in the LCD "Ready" message and Info menu
137
-//#define CUSTOM_MACHINE_NAME "3D Printer"
137
+#define CUSTOM_MACHINE_NAME "Ender-3"
138 138
 
139 139
 // Printer's unique ID, used by some programs to differentiate between machines.
140 140
 // Choose your own or use a service like http://www.uuidgenerator.net/version4
@@ -147,7 +147,7 @@
147 147
 #define EXTRUDERS 1
148 148
 
149 149
 // Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
150
-#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0
150
+#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75
151 151
 
152 152
 // For Cyclops or any "multi-extruder" that shares a single nozzle.
153 153
 //#define SINGLENOZZLE
@@ -415,7 +415,7 @@
415 415
 #define TEMP_SENSOR_5 0
416 416
 #define TEMP_SENSOR_6 0
417 417
 #define TEMP_SENSOR_7 0
418
-#define TEMP_SENSOR_BED 0
418
+#define TEMP_SENSOR_BED 1
419 419
 #define TEMP_SENSOR_PROBE 0
420 420
 #define TEMP_SENSOR_CHAMBER 0
421 421
 
@@ -459,7 +459,7 @@
459 459
 #define HEATER_5_MAXTEMP 275
460 460
 #define HEATER_6_MAXTEMP 275
461 461
 #define HEATER_7_MAXTEMP 275
462
-#define BED_MAXTEMP      150
462
+#define BED_MAXTEMP      125
463 463
 
464 464
 //===========================================================================
465 465
 //============================= PID Settings ================================
@@ -472,8 +472,8 @@
472 472
 #define PID_MAX BANG_MAX // Limits current to nozzle while PID is active (see PID_FUNCTIONAL_RANGE below); 255=full current
473 473
 #define PID_K1 0.95      // Smoothing factor within any PID loop
474 474
 #if ENABLED(PIDTEMP)
475
-  //#define PID_EDIT_MENU         // Add PID editing to the "Advanced Settings" menu. (~700 bytes of PROGMEM)
476
-  //#define PID_AUTOTUNE_MENU     // Add PID auto-tuning to the "Advanced Settings" menu. (~250 bytes of PROGMEM)
475
+  #define PID_EDIT_MENU           // Add PID editing to the "Advanced Settings" menu. (~700 bytes of PROGMEM)
476
+  #define PID_AUTOTUNE_MENU       // Add PID auto-tuning to the "Advanced Settings" menu. (~250 bytes of PROGMEM)
477 477
   //#define PID_DEBUG             // Sends debug data to the serial port.
478 478
   //#define PID_OPENLOOP 1        // Puts PID in open loop. M104/M140 sets the output power from 0 to PID_MAX
479 479
   //#define SLOW_PWM_HEATERS      // PWM with very low frequency (roughly 0.125Hz=8s) and minimum state time of approximately 1s useful for heaters driven by a relay
@@ -483,11 +483,15 @@
483 483
                                   // is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
484 484
 
485 485
   // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
486
+  // Creality Ender-3
487
+  #define DEFAULT_Kp 21.73
488
+  #define DEFAULT_Ki 1.54
489
+  #define DEFAULT_Kd 76.55
486 490
 
487 491
   // Ultimaker
488
-  #define DEFAULT_Kp 22.2
489
-  #define DEFAULT_Ki 1.08
490
-  #define DEFAULT_Kd 114
492
+  //#define DEFAULT_Kp 22.2
493
+  //#define DEFAULT_Ki 1.08
494
+  //#define DEFAULT_Kd 114
491 495
 
492 496
   // MakerGear
493 497
   //#define DEFAULT_Kp 7.0
@@ -731,14 +735,14 @@
731 735
  * Override with M92
732 736
  *                                      X, Y, Z, E0 [, E1[, E2...]]
733 737
  */
734
-#define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 4000, 500 }
738
+#define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 400, 93 }
735 739
 
736 740
 /**
737 741
  * Default Max Feed Rate (mm/s)
738 742
  * Override with M203
739 743
  *                                      X, Y, Z, E0 [, E1[, E2...]]
740 744
  */
741
-#define DEFAULT_MAX_FEEDRATE          { 300, 300, 5, 25 }
745
+#define DEFAULT_MAX_FEEDRATE          { 500, 500, 5, 25 }
742 746
 
743 747
 //#define LIMITED_MAX_FR_EDITING        // Limit edit via M203 or LCD to DEFAULT_MAX_FEEDRATE * 2
744 748
 #if ENABLED(LIMITED_MAX_FR_EDITING)
@@ -751,7 +755,7 @@
751 755
  * Override with M201
752 756
  *                                      X, Y, Z, E0 [, E1[, E2...]]
753 757
  */
754
-#define DEFAULT_MAX_ACCELERATION      { 3000, 3000, 100, 10000 }
758
+#define DEFAULT_MAX_ACCELERATION      { 500, 500, 100, 5000 }
755 759
 
756 760
 //#define LIMITED_MAX_ACCEL_EDITING     // Limit edit via M201 or LCD to DEFAULT_MAX_ACCELERATION * 2
757 761
 #if ENABLED(LIMITED_MAX_ACCEL_EDITING)
@@ -766,9 +770,9 @@
766 770
  *   M204 R    Retract Acceleration
767 771
  *   M204 T    Travel Acceleration
768 772
  */
769
-#define DEFAULT_ACCELERATION          3000    // X, Y, Z and E acceleration for printing moves
770
-#define DEFAULT_RETRACT_ACCELERATION  3000    // E acceleration for retracts
771
-#define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
773
+#define DEFAULT_ACCELERATION          500    // X, Y, Z and E acceleration for printing moves
774
+#define DEFAULT_RETRACT_ACCELERATION  500    // E acceleration for retracts
775
+#define DEFAULT_TRAVEL_ACCELERATION   500    // X, Y, Z acceleration for travel (non printing) moves
772 776
 
773 777
 /**
774 778
  * Default Jerk limits (mm/s)
@@ -802,7 +806,7 @@
802 806
  *   http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
803 807
  */
804 808
 #if DISABLED(CLASSIC_JERK)
805
-  #define JUNCTION_DEVIATION_MM 0.013 // (mm) Distance from real junction edge
809
+  #define JUNCTION_DEVIATION_MM 0.08  // (mm) Distance from real junction edge
806 810
 #endif
807 811
 
808 812
 /**
@@ -1052,19 +1056,19 @@
1052 1056
 // @section extruder
1053 1057
 
1054 1058
 #define DISABLE_E false             // For all extruders
1055
-#define DISABLE_INACTIVE_EXTRUDER   // Keep only the active extruder enabled
1059
+//#define DISABLE_INACTIVE_EXTRUDER // Keep only the active extruder enabled
1056 1060
 
1057 1061
 // @section machine
1058 1062
 
1059 1063
 // Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way.
1060
-#define INVERT_X_DIR false
1064
+#define INVERT_X_DIR true
1061 1065
 #define INVERT_Y_DIR true
1062 1066
 #define INVERT_Z_DIR false
1063 1067
 
1064 1068
 // @section extruder
1065 1069
 
1066 1070
 // For direct drive extruder v9 set to true, for geared extruder set to false.
1067
-#define INVERT_E0_DIR false
1071
+#define INVERT_E0_DIR true
1068 1072
 #define INVERT_E1_DIR false
1069 1073
 #define INVERT_E2_DIR false
1070 1074
 #define INVERT_E3_DIR false
@@ -1093,8 +1097,8 @@
1093 1097
 // @section machine
1094 1098
 
1095 1099
 // The size of the print bed
1096
-#define X_BED_SIZE 200
1097
-#define Y_BED_SIZE 200
1100
+#define X_BED_SIZE 235
1101
+#define Y_BED_SIZE 235
1098 1102
 
1099 1103
 // Travel limits (mm) after homing, corresponding to endstop positions.
1100 1104
 #define X_MIN_POS 0
@@ -1102,7 +1106,7 @@
1102 1106
 #define Z_MIN_POS 0
1103 1107
 #define X_MAX_POS X_BED_SIZE
1104 1108
 #define Y_MAX_POS Y_BED_SIZE
1105
-#define Z_MAX_POS 200
1109
+#define Z_MAX_POS 250
1106 1110
 
1107 1111
 /**
1108 1112
  * Software Endstops
@@ -1365,7 +1369,7 @@
1365 1369
 #endif
1366 1370
 
1367 1371
 // Homing speeds (mm/m)
1368
-#define HOMING_FEEDRATE_XY (50*60)
1372
+#define HOMING_FEEDRATE_XY (20*60)
1369 1373
 #define HOMING_FEEDRATE_Z  (4*60)
1370 1374
 
1371 1375
 // Validate that endstops are triggered on homing moves
@@ -1443,11 +1447,11 @@
1443 1447
  *   M501 - Read settings from EEPROM. (i.e., Throw away unsaved changes)
1444 1448
  *   M502 - Revert settings to "factory" defaults. (Follow with M500 to init the EEPROM.)
1445 1449
  */
1446
-//#define EEPROM_SETTINGS     // Persistent storage with M500 and M501
1450
+#define EEPROM_SETTINGS       // Persistent storage with M500 and M501
1447 1451
 //#define DISABLE_M503        // Saves ~2700 bytes of PROGMEM. Disable for release!
1448 1452
 #define EEPROM_CHITCHAT       // Give feedback on EEPROM commands. Disable to save PROGMEM.
1449 1453
 #if ENABLED(EEPROM_SETTINGS)
1450
-  //#define EEPROM_AUTO_INIT  // Init EEPROM automatically on any errors.
1454
+  #define EEPROM_AUTO_INIT  // Init EEPROM automatically on any errors.
1451 1455
 #endif
1452 1456
 
1453 1457
 //
@@ -1474,14 +1478,14 @@
1474 1478
 
1475 1479
 // Preheat Constants
1476 1480
 #define PREHEAT_1_LABEL       "PLA"
1477
-#define PREHEAT_1_TEMP_HOTEND 180
1478
-#define PREHEAT_1_TEMP_BED     70
1479
-#define PREHEAT_1_FAN_SPEED     0 // Value from 0 to 255
1481
+#define PREHEAT_1_TEMP_HOTEND 185
1482
+#define PREHEAT_1_TEMP_BED     45
1483
+#define PREHEAT_1_FAN_SPEED   255 // Value from 0 to 255
1480 1484
 
1481 1485
 #define PREHEAT_2_LABEL       "ABS"
1482 1486
 #define PREHEAT_2_TEMP_HOTEND 240
1483
-#define PREHEAT_2_TEMP_BED    110
1484
-#define PREHEAT_2_FAN_SPEED     0 // Value from 0 to 255
1487
+#define PREHEAT_2_TEMP_BED      0
1488
+#define PREHEAT_2_FAN_SPEED   255 // Value from 0 to 255
1485 1489
 
1486 1490
 /**
1487 1491
  * Nozzle Park
@@ -1598,7 +1602,7 @@
1598 1602
  *
1599 1603
  * View the current statistics with M78.
1600 1604
  */
1601
-//#define PRINTCOUNTER
1605
+#define PRINTCOUNTER
1602 1606
 
1603 1607
 //=============================================================================
1604 1608
 //============================= LCD and SD support ============================
@@ -1616,7 +1620,7 @@
1616 1620
  *
1617 1621
  * :{ 'en':'English', 'an':'Aragonese', 'bg':'Bulgarian', 'ca':'Catalan', 'cz':'Czech', 'da':'Danish', 'de':'German', 'el':'Greek', 'el_gr':'Greek (Greece)', 'es':'Spanish', 'eu':'Basque-Euskera', 'fi':'Finnish', 'fr':'French', 'gl':'Galician', 'hr':'Croatian', 'it':'Italian', 'jp_kana':'Japanese', 'ko_KR':'Korean (South Korea)', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt_br':'Portuguese (Brazilian)', 'ru':'Russian', 'sk':'Slovak', 'tr':'Turkish', 'uk':'Ukrainian', 'vi':'Vietnamese', 'zh_CN':'Chinese (Simplified)', 'zh_TW':'Chinese (Traditional)', 'test':'TEST' }
1618 1622
  */
1619
-#define LCD_LANGUAGE en
1623
+#define LCD_LANGUAGE de
1620 1624
 
1621 1625
 /**
1622 1626
  * LCD Character Set
@@ -1640,7 +1644,7 @@
1640 1644
  *
1641 1645
  * :['JAPANESE', 'WESTERN', 'CYRILLIC']
1642 1646
  */
1643
-#define DISPLAY_CHARSET_HD44780 JAPANESE
1647
+#define DISPLAY_CHARSET_HD44780 WESTERN
1644 1648
 
1645 1649
 /**
1646 1650
  * Info Screen Style (0:Classic, 1:Prusa)
@@ -1656,7 +1660,7 @@
1656 1660
  * you must uncomment the following option or it won't work.
1657 1661
  *
1658 1662
  */
1659
-//#define SDSUPPORT
1663
+#define SDSUPPORT
1660 1664
 
1661 1665
 /**
1662 1666
  * SD CARD: SPI SPEED
@@ -1736,7 +1740,7 @@
1736 1740
 //
1737 1741
 // Add individual axis homing items (Home X, Home Y, and Home Z) to the LCD menu.
1738 1742
 //
1739
-//#define INDIVIDUAL_AXIS_HOMING_MENU
1743
+#define INDIVIDUAL_AXIS_HOMING_MENU
1740 1744
 
1741 1745
 //
1742 1746
 // SPEAKER/BUZZER
@@ -1744,7 +1748,7 @@
1744 1748
 // If you have a speaker that can produce tones, enable it here.
1745 1749
 // By default Marlin assumes you have a buzzer with a fixed frequency.
1746 1750
 //
1747
-//#define SPEAKER
1751
+#define SPEAKER
1748 1752
 
1749 1753
 //
1750 1754
 // The duration and frequency for the UI feedback sound.
@@ -1987,7 +1991,7 @@
1987 1991
 // This is RAMPS-compatible using a single 10-pin connector.
1988 1992
 // (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
1989 1993
 //
1990
-//#define CR10_STOCKDISPLAY
1994
+#define CR10_STOCKDISPLAY
1991 1995
 
1992 1996
 //
1993 1997
 // Ender-2 OEM display, a variant of the MKS_MINI_12864

+ 35
- 33
Marlin/Configuration_adv.h View File

@@ -588,7 +588,7 @@
588 588
 #define Y_HOME_BUMP_MM 5
589 589
 #define Z_HOME_BUMP_MM 2
590 590
 #define HOMING_BUMP_DIVISOR { 2, 2, 4 }  // Re-Bump Speed Divisor (Divides the Homing Feedrate)
591
-//#define QUICK_HOME                     // If homing includes X and Y, do a diagonal move initially
591
+#define QUICK_HOME                       // If homing includes X and Y, do a diagonal move initially
592 592
 //#define HOMING_BACKOFF_MM { 2, 2, 2 }  // (mm) Move away from the endstops after homing
593 593
 
594 594
 // When G28 is called, this option will make Y home before X
@@ -641,7 +641,7 @@
641 641
    * differs, a mode set eeprom write will be completed at initialization.
642 642
    * Use the option below to force an eeprom write to a V3.1 probe regardless.
643 643
    */
644
-  //#define BLTOUCH_SET_5V_MODE
644
+  #define BLTOUCH_SET_5V_MODE
645 645
 
646 646
   /**
647 647
    * Safety: Activate if connecting a probe with an unknown voltage mode.
@@ -708,14 +708,14 @@
708 708
     // Define one position per Z stepper in stepper driver order.
709 709
     #define Z_STEPPER_ALIGN_STEPPER_XY { { 210.7, 102.5 }, { 152.6, 220.0 }, { 94.5, 102.5 } }
710 710
   #else
711
-    // Amplification factor. Used to scale the correction step up or down in case
712
-    // the stepper (spindle) position is farther out than the test point.
713
-    #define Z_STEPPER_ALIGN_AMP 1.0       // Use a value > 1.0 NOTE: This may cause instability!
711
+    // Amplification factor. Used to scale the correction step up or down.
712
+    // In case the stepper (spindle) position is further out than the test point.
713
+    // Use a value > 1. NOTE: This may cause instability
714
+    #define Z_STEPPER_ALIGN_AMP 1.0
714 715
   #endif
715 716
 
716
-  // On a 300mm bed a 5% grade would give a misalignment of ~1.5cm
717 717
   #define G34_MAX_GRADE              5    // (%) Maximum incline that G34 will handle
718
-  #define Z_STEPPER_ALIGN_ITERATIONS 5    // Number of iterations to apply during alignment
718
+  #define Z_STEPPER_ALIGN_ITERATIONS 3    // Number of iterations to apply during alignment
719 719
   #define Z_STEPPER_ALIGN_ACC        0.02 // Stop iterating early if the accuracy is better than this
720 720
   #define RESTORE_LEVELING_AFTER_G34      // Restore leveling after G34 is done?
721 721
   // After G34, re-home Z (G28 Z) or just calculate it from the last probe heights?
@@ -754,7 +754,12 @@
754 754
 #define DEFAULT_MINSEGMENTTIME        20000   // (ms)
755 755
 
756 756
 // If defined the movements slow down when the look ahead buffer is only half full
757
+// Slow down the machine if the look ahead buffer is (by default) half full.
758
+// Increase the slowdown divisor for larger buffer sizes.
757 759
 #define SLOWDOWN
760
+#if ENABLED(SLOWDOWN)
761
+  #define SLOWDOWN_DIVISOR 2
762
+#endif
758 763
 
759 764
 // Frequency limit
760 765
 // See nophead's blog for more info
@@ -928,7 +933,7 @@
928 933
 // @section lcd
929 934
 
930 935
 #if EITHER(ULTIPANEL, EXTENSIBLE_UI)
931
-  #define MANUAL_FEEDRATE { 50*60, 50*60, 4*60, 60 } // Feedrates for manual moves along X, Y, Z, E from panel
936
+  #define MANUAL_FEEDRATE { 50*60, 50*60, 4*60, 2*60 } // Feedrates for manual moves along X, Y, Z, E from panel
932 937
   #define SHORT_MANUAL_Z_MOVE 0.025 // (mm) Smallest manual Z move (< 0.1mm)
933 938
   #if ENABLED(ULTIPANEL)
934 939
     #define MANUAL_E_MOVES_RELATIVE // Display extruder move distance rather than "position"
@@ -953,7 +958,7 @@
953 958
 #if HAS_LCD_MENU
954 959
 
955 960
   // Include a page of printer information in the LCD Main Menu
956
-  //#define LCD_INFO_MENU
961
+  #define LCD_INFO_MENU
957 962
   #if ENABLED(LCD_INFO_MENU)
958 963
     //#define LCD_PRINTER_INFO_IS_BOOTSCREEN // Show bootscreen(s) instead of Printer Info pages
959 964
   #endif
@@ -981,7 +986,7 @@
981 986
 #endif // HAS_LCD_MENU
982 987
 
983 988
 // Scroll a longer status message into view
984
-//#define STATUS_MESSAGE_SCROLLING
989
+#define STATUS_MESSAGE_SCROLLING
985 990
 
986 991
 // On the Info Screen, display XY with one decimal place when possible
987 992
 //#define LCD_DECIMAL_SMALL_XY
@@ -990,7 +995,7 @@
990 995
 //#define LCD_TIMEOUT_TO_STATUS 15000
991 996
 
992 997
 // Add an 'M73' G-code to set the current percentage
993
-//#define LCD_SET_PROGRESS_MANUALLY
998
+#define LCD_SET_PROGRESS_MANUALLY
994 999
 
995 1000
 // Show the E position (filament used) during printing
996 1001
 //#define LCD_SHOW_E_TOTAL
@@ -999,7 +1004,7 @@
999 1004
   #define BOOTSCREEN_TIMEOUT 4000        // (ms) Total Duration to display the boot screen(s)
1000 1005
 #endif
1001 1006
 
1002
-#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS
1007
+#if HAS_GRAPHICAL_LCD && EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
1003 1008
   //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
1004 1009
   //#define SHOW_REMAINING_TIME          // Display estimated time to completion
1005 1010
   #if ENABLED(SHOW_REMAINING_TIME)
@@ -1008,7 +1013,7 @@
1008 1013
   #endif
1009 1014
 #endif
1010 1015
 
1011
-#if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
1016
+#if HAS_CHARACTER_LCD && EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
1012 1017
   //#define LCD_PROGRESS_BAR              // Show a progress bar on HD44780 LCDs for SD printing
1013 1018
   #if ENABLED(LCD_PROGRESS_BAR)
1014 1019
     #define PROGRESS_BAR_BAR_TIME 2000    // (ms) Amount of time to show the bar
@@ -1045,9 +1050,6 @@
1045 1050
    * during SD printing. If the recovery file is found at boot time, present
1046 1051
    * an option on the LCD screen to continue the print from the last-known
1047 1052
    * point in the file.
1048
-   *
1049
-   * If the machine reboots when resuming a print you may need to replace or
1050
-   * reformat the SD card. (Bad sectors delay startup triggering the watchdog.)
1051 1053
    */
1052 1054
   //#define POWER_LOSS_RECOVERY
1053 1055
   #if ENABLED(POWER_LOSS_RECOVERY)
@@ -1104,10 +1106,10 @@
1104 1106
   #endif
1105 1107
 
1106 1108
   // This allows hosts to request long names for files and folders with M33
1107
-  //#define LONG_FILENAME_HOST_SUPPORT
1109
+  #define LONG_FILENAME_HOST_SUPPORT
1108 1110
 
1109 1111
   // Enable this option to scroll long filenames in the SD card menu
1110
-  //#define SCROLL_LONG_FILENAMES
1112
+  #define SCROLL_LONG_FILENAMES
1111 1113
 
1112 1114
   // Leave the heaters on after Stop Print (not recommended!)
1113 1115
   //#define SD_ABORT_NO_COOLDOWN
@@ -1117,7 +1119,7 @@
1117 1119
    * This feature must be enabled with "M540 S1" or from the LCD menu.
1118 1120
    * To have any effect, endstops must be enabled during SD printing.
1119 1121
    */
1120
-  //#define SD_ABORT_ON_ENDSTOP_HIT
1122
+  #define SD_ABORT_ON_ENDSTOP_HIT
1121 1123
 
1122 1124
   /**
1123 1125
    * This option makes it easier to print the same SD Card file again.
@@ -1453,27 +1455,27 @@
1453 1455
  *
1454 1456
  * Warning: Does not respect endstops!
1455 1457
  */
1456
-//#define BABYSTEPPING
1458
+#define BABYSTEPPING
1457 1459
 #if ENABLED(BABYSTEPPING)
1458 1460
   //#define INTEGRATED_BABYSTEPPING         // EXPERIMENTAL integration of babystepping into the Stepper ISR
1459
-  //#define BABYSTEP_WITHOUT_HOMING
1460
-  //#define BABYSTEP_XY                     // Also enable X/Y Babystepping. Not supported on DELTA!
1461
+  #define BABYSTEP_WITHOUT_HOMING
1462
+  #define BABYSTEP_XY                     // Also enable X/Y Babystepping. Not supported on DELTA!
1461 1463
   #define BABYSTEP_INVERT_Z false           // Change if Z babysteps should go the other way
1462
-  #define BABYSTEP_MULTIPLICATOR_Z  1       // Babysteps are very small. Increase for faster motion.
1463
-  #define BABYSTEP_MULTIPLICATOR_XY 1
1464
+  #define BABYSTEP_MULTIPLICATOR_Z  25       // Babysteps are very small. Increase for faster motion.
1465
+  #define BABYSTEP_MULTIPLICATOR_XY 25
1464 1466
 
1465
-  //#define DOUBLECLICK_FOR_Z_BABYSTEPPING  // Double-click on the Status Screen for Z Babystepping.
1467
+  #define DOUBLECLICK_FOR_Z_BABYSTEPPING    // Double-click on the Status Screen for Z Babystepping.
1466 1468
   #if ENABLED(DOUBLECLICK_FOR_Z_BABYSTEPPING)
1467 1469
     #define DOUBLECLICK_MAX_INTERVAL 1250   // Maximum interval between clicks, in milliseconds.
1468 1470
                                             // Note: Extra time may be added to mitigate controller latency.
1469
-    //#define BABYSTEP_ALWAYS_AVAILABLE     // Allow babystepping at all times (not just during movement).
1471
+    #define BABYSTEP_ALWAYS_AVAILABLE     // Allow babystepping at all times (not just during movement).
1470 1472
     //#define MOVE_Z_WHEN_IDLE              // Jump to the move Z menu on doubleclick when printer is idle.
1471 1473
     #if ENABLED(MOVE_Z_WHEN_IDLE)
1472 1474
       #define MOVE_Z_IDLE_MULTIPLICATOR 1   // Multiply 1mm by this factor for the move step size.
1473 1475
     #endif
1474 1476
   #endif
1475 1477
 
1476
-  //#define BABYSTEP_DISPLAY_TOTAL          // Display total babysteps since last G28
1478
+  #define BABYSTEP_DISPLAY_TOTAL          // Display total babysteps since last G28
1477 1479
 
1478 1480
   //#define BABYSTEP_ZPROBE_OFFSET          // Combine M851 Z and Babystepping
1479 1481
   #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
@@ -1614,7 +1616,7 @@
1614 1616
 //
1615 1617
 // G2/G3 Arc Support
1616 1618
 //
1617
-#define ARC_SUPPORT                 // Disable this feature to save ~3226 bytes
1619
+//#define ARC_SUPPORT                 // Disable this feature to save ~3226 bytes
1618 1620
 #if ENABLED(ARC_SUPPORT)
1619 1621
   #define MM_PER_ARC_SEGMENT      1 // (mm) Length (or minimum length) of each arc segment
1620 1622
   //#define ARC_SEGMENTS_PER_R    1 // Max segment length, MM_PER = Min
@@ -2030,7 +2032,7 @@
2030 2032
   #define INTERPOLATE       true  // Interpolate X/Y/Z_MICROSTEPS to 256
2031 2033
 
2032 2034
   #if AXIS_IS_TMC(X)
2033
-    #define X_CURRENT       800        // (mA) RMS current. Multiply by 1.414 for peak current.
2035
+    #define X_CURRENT       580        // (mA) RMS current. Multiply by 1.414 for peak current.
2034 2036
     #define X_CURRENT_HOME  X_CURRENT  // (mA) RMS current for sensorless homing
2035 2037
     #define X_MICROSTEPS     16    // 0..256
2036 2038
     #define X_RSENSE          0.11
@@ -2046,7 +2048,7 @@
2046 2048
   #endif
2047 2049
 
2048 2050
   #if AXIS_IS_TMC(Y)
2049
-    #define Y_CURRENT       800
2051
+    #define Y_CURRENT       580
2050 2052
     #define Y_CURRENT_HOME  Y_CURRENT
2051 2053
     #define Y_MICROSTEPS     16
2052 2054
     #define Y_RSENSE          0.11
@@ -2062,7 +2064,7 @@
2062 2064
   #endif
2063 2065
 
2064 2066
   #if AXIS_IS_TMC(Z)
2065
-    #define Z_CURRENT       800
2067
+    #define Z_CURRENT       580
2066 2068
     #define Z_CURRENT_HOME  Z_CURRENT
2067 2069
     #define Z_MICROSTEPS     16
2068 2070
     #define Z_RSENSE          0.11
@@ -2094,7 +2096,7 @@
2094 2096
   #endif
2095 2097
 
2096 2098
   #if AXIS_IS_TMC(E0)
2097
-    #define E0_CURRENT      800
2099
+    #define E0_CURRENT      650
2098 2100
     #define E0_MICROSTEPS    16
2099 2101
     #define E0_RSENSE         0.11
2100 2102
     #define E0_CHAIN_POS     -1
@@ -2239,7 +2241,7 @@
2239 2241
    * Define you own with
2240 2242
    * { <off_time[1..15]>, <hysteresis_end[-3..12]>, hysteresis_start[1..8] }
2241 2243
    */
2242
-  #define CHOPPER_TIMING CHOPPER_DEFAULT_12V
2244
+  #define CHOPPER_TIMING CHOPPER_DEFAULT_24V
2243 2245
 
2244 2246
   /**
2245 2247
    * Monitor Trinamic drivers for error conditions,

+ 97
- 0
Marlin/_Bootscreen.h View File

@@ -0,0 +1,97 @@
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 <http://www.gnu.org/licenses/>.
20
+ *
21
+ */
22
+#pragma once
23
+
24
+/**
25
+ * Custom Boot Screen bitmap
26
+ *
27
+ * Place this file in the root with your configuration files
28
+ * and enable SHOW_CUSTOM_BOOTSCREEN in Configuration.h.
29
+ *
30
+ * Use the Marlin Bitmap Converter to make your own:
31
+ * http://marlinfw.org/tools/u8glib/converter.html
32
+ */
33
+
34
+#define CUSTOM_BOOTSCREEN_TIMEOUT 1000
35
+#define CUSTOM_BOOTSCREEN_BMPWIDTH 81
36
+#define CUSTOM_BOOTSCREEN_INVERTED
37
+
38
+const unsigned char custom_start_bmp[] PROGMEM = {
39
+  B11111111,B11111111,B11111111,B11111111,B11101111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
40
+  B11111111,B11111111,B11111111,B11111111,B11101111,B11101111,B11111111,B11111111,B11111111,B11111111,B11111111,
41
+  B11111111,B11111111,B11111111,B11111111,B11100111,B11011111,B11111111,B11111111,B11111111,B11111111,B11111111,
42
+  B11111111,B11111111,B11111111,B11111111,B11100111,B11011111,B11111111,B11111111,B11111111,B11111111,B11111111,
43
+  B11111111,B11111111,B11111111,B11111111,B11100011,B11011111,B11111111,B11111111,B11111111,B11111111,B11111111,
44
+  B11111111,B11111111,B11111111,B11111111,B11110011,B11001111,B11111111,B11111111,B11111111,B11111111,B11111111,
45
+  B11111111,B11111111,B11111111,B11100001,B11100001,B11001111,B11111111,B11111111,B11111111,B11111111,B11111111,
46
+  B11111111,B11111110,B01111000,B00000000,B00000000,B00000011,B11011101,B11111111,B11111111,B11111111,B11111111,
47
+  B11111110,B11111111,B10000000,B01111110,B00000000,B00000001,B11101110,B11111111,B11111111,B11111111,B11111111,
48
+  B11111110,B01111101,B11001111,B11111100,B00000000,B00000000,B11110111,B01111111,B11111111,B11111111,B11111111,
49
+  B11111111,B10001110,B00000110,B00000000,B00000000,B00000000,B01111011,B10111111,B11111111,B11111111,B11111111,
50
+  B11111111,B11000000,B00000000,B00000000,B00000000,B00000000,B01111101,B11011111,B11111111,B11111111,B11111111,
51
+  B11111111,B11111100,B00000001,B11111110,B00000000,B00000000,B00111110,B11100111,B11111111,B11111111,B11111111,
52
+  B11111111,B11111111,B11111111,B11111100,B00000000,B00000011,B00011111,B01110011,B11111111,B11111111,B11111111,
53
+  B11111111,B11111111,B11111111,B11111000,B00000000,B00000001,B10001111,B10000001,B11111111,B11111111,B11111111,
54
+  B11111111,B11111111,B11111111,B11100000,B00000000,B00000000,B10000011,B11111001,B11111111,B11111111,B11111111,
55
+  B11111111,B11111111,B11111111,B00000000,B11111100,B00000000,B00000000,B11110000,B11111111,B11111111,B11111111,
56
+  B11111111,B11111111,B11100000,B00001111,B11111111,B11000000,B00000000,B00000000,B11111111,B11111111,B11111111,
57
+  B11111111,B11111110,B00000011,B11111111,B11111111,B11000000,B00000000,B00000000,B11111111,B11111111,B11111111,
58
+  B11111111,B11111111,B11111111,B11111111,B11111001,B00000000,B00000000,B00000000,B11111111,B11111111,B11111111,
59
+  B11111111,B11111111,B11111111,B11111111,B11111100,B00000000,B00000111,B11000000,B11111111,B11111111,B11111111,
60
+  B11111111,B11111111,B11111111,B11111111,B11111111,B00000000,B00000111,B11100000,B11111111,B11111111,B11111111,
61
+  B11111111,B11111111,B11111111,B11111111,B11111111,B11100000,B00000111,B11110001,B11111111,B11111111,B11111111,
62
+  B11111111,B11111111,B11111111,B11111111,B11111111,B11111100,B00000111,B11111001,B11111111,B11111111,B11111111,
63
+  B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B00000011,B11111001,B11111111,B11111111,B11111111,
64
+  B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B10000011,B11111001,B11111111,B11111111,B11111111,
65
+  B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11000011,B11111111,B11111111,B11111111,B11111111,
66
+  B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11100001,B11111111,B11111111,B11111111,B11111111,
67
+  B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11110000,B10111111,B11111111,B11111111,B11111111,
68
+  B11111111,B11111111,B11111111,B11111111,B11111111,B11111011,B11111000,B00111111,B11111111,B11111111,B11111111,
69
+  B11111111,B11111111,B11111111,B11111111,B11111111,B11111001,B11111000,B00111111,B11111111,B11111111,B11111111,
70
+  B11111111,B11111111,B11111111,B11111111,B11111111,B01111110,B11110000,B11111111,B11111111,B11111111,B11111111,
71
+  B11111111,B11111111,B11111111,B11111111,B11111111,B10001110,B00000011,B11111111,B11111111,B11111111,B11111111,
72
+  B11111111,B11111111,B11111111,B11111111,B11111111,B11100000,B00011111,B11111111,B11111111,B11111111,B11111111,
73
+  B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
74
+  B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
75
+  B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B01111111,B11111111,B11111111,B11111111,
76
+  B11111111,B00000000,B00000000,B01111111,B11111111,B11111111,B11111000,B01111111,B11111111,B11111111,B11111111,
77
+  B11111111,B10000000,B00000000,B01111111,B11111111,B11111111,B11100000,B01111111,B11111111,B11111111,B11111111,
78
+  B11111111,B11000011,B11111100,B11111111,B11111111,B11111111,B11111000,B11111111,B11111111,B11111111,B11111111,
79
+  B11111111,B11000011,B11111100,B11111111,B11111111,B11111111,B11111000,B11111111,B11111111,B11111111,B11111111,
80
+  B11111111,B10000111,B11111101,B11111111,B11111111,B11111111,B11110001,B11111111,B11111111,B11111111,B11111111,
81
+  B11111111,B10000111,B11111111,B11111111,B11111111,B11111111,B11110001,B11111111,B11111111,B11111111,B11111111,
82
+  B11111111,B00001111,B11100111,B11110011,B00001111,B11111100,B00100011,B11111100,B00111111,B11111111,B11111111,
83
+  B11111111,B00001111,B11101111,B10000000,B00000111,B11110000,B00000011,B11110000,B00011110,B00000000,B01111111,
84
+  B11111110,B00011111,B11001111,B10000001,B10000111,B11000111,B10000111,B11000111,B00001100,B00000000,B01111111,
85
+  B11111110,B00000000,B00011111,B11000111,B11000111,B10001111,B11000111,B10011111,B00001111,B00001100,B11111111,
86
+  B11111110,B00000000,B00011111,B10000111,B10001111,B00011111,B10001111,B00011111,B00001111,B00011111,B11111111,
87
+  B11111100,B00111111,B10011111,B10001111,B10001111,B00011111,B10001110,B00000000,B00011110,B00111111,B11111111,
88
+  B11111100,B01111111,B00111111,B00001111,B00011110,B00111111,B00011110,B00111111,B11111110,B00111111,B11111111,
89
+  B11111000,B01111111,B11111111,B00011111,B00011100,B00111111,B00011100,B01111111,B11111100,B01111111,B11111111,
90
+  B11111000,B11111111,B11111111,B00011110,B00011100,B01111110,B00011100,B01111111,B11111100,B01111111,B11111111,
91
+  B11110000,B11111111,B11001110,B00111110,B00111100,B01111110,B00111100,B01111111,B10111000,B11111111,B11111111,
92
+  B11110000,B11111111,B10011110,B00111100,B00111000,B01111100,B00111000,B01111110,B01111000,B11111111,B11111111,
93
+  B11100001,B11111111,B00111100,B01111100,B01111000,B01111100,B01111000,B00111100,B11110001,B11111111,B11111111,
94
+  B11100001,B11111000,B00111000,B01111000,B01111000,B00010000,B00011000,B00000001,B11110001,B11111111,B11111111,
95
+  B00000000,B00000000,B01100000,B00100000,B00111100,B00000000,B01111100,B00000111,B10000000,B01111111,B11111111,
96
+  B11111111,B11111111,B11111111,B11111111,B11111110,B00011111,B11111110,B00011111,B11111111,B11111111,B11111111
97
+};

+ 62
- 0
Marlin/_Statusscreen.h View File

@@ -0,0 +1,62 @@
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 <http://www.gnu.org/licenses/>.
20
+ *
21
+ */
22
+#pragma once
23
+
24
+/**
25
+ * Custom Status Screen bitmap
26
+ *
27
+ * Place this file in the root with your configuration files
28
+ * and enable CUSTOM_STATUS_SCREEN_IMAGE in Configuration.h.
29
+ *
30
+ * Use the Marlin Bitmap Converter to make your own:
31
+ * http://marlinfw.org/tools/u8glib/converter.html
32
+ */
33
+
34
+//
35
+// Status Screen Logo bitmap
36
+//
37
+#define STATUS_LOGO_Y            8
38
+#define STATUS_LOGO_WIDTH       39
39
+
40
+const unsigned char status_logo_bmp[] PROGMEM = {
41
+  B11111000,B00000001,B10000000,B00000000,B00001100,
42
+  B01001000,B00000000,B10000000,B00000000,B00010010,
43
+  B01000011,B11000011,B10001100,B11010000,B00000010,
44
+  B01110001,B00100100,B10010010,B01100111,B11001100,
45
+  B01000001,B00100100,B10011110,B01000000,B00000010,
46
+  B01001001,B00100100,B10010000,B01000000,B00010010,
47
+  B11111011,B10110011,B11001110,B11100000,B00001100
48
+};
49
+
50
+//
51
+// Use default bitmaps
52
+//
53
+#define STATUS_HOTEND_ANIM
54
+#define STATUS_BED_ANIM
55
+#define STATUS_HEATERS_XSPACE   20
56
+#if HOTENDS < 2
57
+  #define STATUS_HEATERS_X      48
58
+  #define STATUS_BED_X          72
59
+#else
60
+  #define STATUS_HEATERS_X      40
61
+  #define STATUS_BED_X          80
62
+#endif

Loading…
Cancel
Save