|
137 | 137 | * THERMAL_PROTECTION_HYSTERESIS and/or THERMAL_PROTECTION_PERIOD
|
138 | 138 | */
|
139 | 139 | #if ENABLED(THERMAL_PROTECTION_HOTENDS)
|
140 |
| - #define THERMAL_PROTECTION_PERIOD 40 // Seconds |
141 |
| - #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius |
| 140 | + #define THERMAL_PROTECTION_PERIOD 60 // Seconds |
| 141 | + #define THERMAL_PROTECTION_HYSTERESIS 10 // Degrees Celsius |
142 | 142 |
|
143 | 143 | //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops
|
144 | 144 | #if BOTH(ADAPTIVE_FAN_SLOWING, PIDTEMP)
|
|
157 | 157 | * and/or decrease WATCH_TEMP_INCREASE. WATCH_TEMP_INCREASE should not be set
|
158 | 158 | * below 2.
|
159 | 159 | */
|
160 |
| - #define WATCH_TEMP_PERIOD 20 // Seconds |
| 160 | + #define WATCH_TEMP_PERIOD 60 // Seconds |
161 | 161 | #define WATCH_TEMP_INCREASE 2 // Degrees Celsius
|
162 | 162 | #endif
|
163 | 163 |
|
|
518 | 518 | #define X_HOME_BUMP_MM 5
|
519 | 519 | #define Y_HOME_BUMP_MM 5
|
520 | 520 | #define Z_HOME_BUMP_MM 2
|
521 |
| -#define HOMING_BUMP_DIVISOR { 2, 2, 4 } // Re-Bump Speed Divisor (Divides the Homing Feedrate) |
| 521 | +#define HOMING_BUMP_DIVISOR { 4, 4, 4 } // Re-Bump Speed Divisor (Divides the Homing Feedrate) |
522 | 522 | //#define QUICK_HOME // If homing includes X and Y, do a diagonal move initially
|
523 | 523 | //#define HOMING_BACKOFF_MM { 2, 2, 2 } // (mm) Move away from the endstops after homing
|
524 | 524 |
|
|
543 | 543 | *
|
544 | 544 | * Settings for all BLTouch and clone probes:
|
545 | 545 | */
|
| 546 | + #undef PROBE_MANUALLY |
546 | 547 |
|
547 | 548 | // Safety: The probe needs time to recognize the command.
|
548 | 549 | // Minimum command delay (ms). Enable and increase if needed.
|
|
591 | 592 | //#define BLTOUCH_HS_MODE
|
592 | 593 |
|
593 | 594 | // Safety: Enable voltage mode settings in the LCD menu.
|
594 |
| - //#define BLTOUCH_LCD_VOLTAGE_MENU |
| 595 | + #define BLTOUCH_LCD_VOLTAGE_MENU |
595 | 596 |
|
596 | 597 | #endif // BLTOUCH
|
597 | 598 |
|
|
854 | 855 | #if HAS_LCD_MENU
|
855 | 856 |
|
856 | 857 | // Include a page of printer information in the LCD Main Menu
|
857 |
| - //#define LCD_INFO_MENU |
| 858 | + #define LCD_INFO_MENU |
858 | 859 | #if ENABLED(LCD_INFO_MENU)
|
859 | 860 | //#define LCD_PRINTER_INFO_IS_BOOTSCREEN // Show bootscreen(s) instead of Printer Info pages
|
860 | 861 | #endif
|
|
891 | 892 | //#define LCD_TIMEOUT_TO_STATUS 15000
|
892 | 893 |
|
893 | 894 | // Add an 'M73' G-code to set the current percentage
|
894 |
| -//#define LCD_SET_PROGRESS_MANUALLY |
| 895 | +#define LCD_SET_PROGRESS_MANUALLY |
895 | 896 |
|
896 | 897 | #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS
|
897 | 898 | //#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
|
922 | 923 |
|
923 | 924 | #define SD_MENU_CONFIRM_START // Confirm the selected SD file before printing
|
924 | 925 |
|
925 |
| - //#define MENU_ADDAUTOSTART // Add a menu option to run auto#.g files |
| 926 | + #define MENU_ADDAUTOSTART // Add a menu option to run auto#.g files |
926 | 927 |
|
927 | 928 | #define EVENT_GCODE_SD_STOP "G28XY" // G-code to run on Stop Print (e.g., "G28XY" or "G27")
|
928 | 929 |
|
|
934 | 935 | * an option on the LCD screen to continue the print from the last-known
|
935 | 936 | * point in the file.
|
936 | 937 | */
|
937 |
| - //#define POWER_LOSS_RECOVERY |
| 938 | + #define POWER_LOSS_RECOVERY |
938 | 939 | #if ENABLED(POWER_LOSS_RECOVERY)
|
939 | 940 | //#define POWER_LOSS_PIN 44 // Pin to detect power loss
|
940 | 941 | //#define POWER_LOSS_STATE HIGH // State of pin indicating power loss
|
|
945 | 946 | // Without a POWER_LOSS_PIN the following option helps reduce wear on the SD card,
|
946 | 947 | // especially with "vase mode" printing. Set too high and vases cannot be continued.
|
947 | 948 | #define POWER_LOSS_MIN_Z_CHANGE 0.05 // (mm) Minimum Z change before saving power-loss data
|
| 949 | + |
| 950 | + //#define DEBUG_POWER_LOSS_RECOVERY // Debug informations on serial output |
| 951 | + //#define SAVE_INFO_INTERVAL_MS 0 // Force SD recov. write interval, on each layer start if 0 |
948 | 952 | #endif
|
949 | 953 |
|
950 | 954 | /**
|
|
970 | 974 | * - SDSORT_CACHE_NAMES will retain the sorted file listing in RAM. (Expensive!)
|
971 | 975 | * - SDSORT_DYNAMIC_RAM only uses RAM when the SD menu is visible. (Use with caution!)
|
972 | 976 | */
|
973 |
| - //#define SDCARD_SORT_ALPHA |
| 977 | + #define SDCARD_SORT_ALPHA |
974 | 978 |
|
975 | 979 | // SD Card Sorting options
|
976 | 980 | #if ENABLED(SDCARD_SORT_ALPHA)
|
|
986 | 990 | #endif
|
987 | 991 |
|
988 | 992 | // This allows hosts to request long names for files and folders with M33
|
989 |
| - //#define LONG_FILENAME_HOST_SUPPORT |
| 993 | + #define LONG_FILENAME_HOST_SUPPORT |
990 | 994 |
|
991 | 995 | // Enable this option to scroll long filenames in the SD card menu
|
992 | 996 | //#define SCROLL_LONG_FILENAMES
|
|
1006 | 1010 | * On print completion the LCD Menu will open with the file selected.
|
1007 | 1011 | * You can just click to start the print, or navigate elsewhere.
|
1008 | 1012 | */
|
1009 |
| - //#define SD_REPRINT_LAST_SELECTED_FILE |
| 1013 | + #define SD_REPRINT_LAST_SELECTED_FILE |
1010 | 1014 |
|
1011 | 1015 | /**
|
1012 | 1016 | * Auto-report SdCard status with M27 S<seconds>
|
|
1099 | 1103 | */
|
1100 | 1104 | #if HAS_GRAPHICAL_LCD
|
1101 | 1105 | // Show SD percentage next to the progress bar
|
1102 |
| - //#define DOGM_SD_PERCENT |
| 1106 | + #define DOGM_SD_PERCENT |
1103 | 1107 |
|
1104 | 1108 | // Enable to save many cycles by drawing a hollow frame on the Info Screen
|
1105 | 1109 | #define XYZ_HOLLOW_FRAME
|
|
1155 | 1159 | //#define STATUS_ALT_BED_BITMAP // Use the alternative bed bitmap
|
1156 | 1160 | //#define STATUS_ALT_FAN_BITMAP // Use the alternative fan bitmap
|
1157 | 1161 | //#define STATUS_FAN_FRAMES 3 // :[0,1,2,3,4] Number of fan animation frames
|
1158 |
| - //#define STATUS_HEAT_PERCENT // Show heating in a progress bar |
| 1162 | + #define STATUS_HEAT_PERCENT // Show heating in a progress bar |
1159 | 1163 | //#define BOOT_MARLIN_LOGO_SMALL // Show a smaller Marlin logo on the Boot Screen (saving 399 bytes of flash)
|
1160 | 1164 | //#define BOOT_MARLIN_LOGO_ANIMATED // Animated Marlin logo. Costs ~3260 (or ~940) bytes of PROGMEM.
|
1161 | 1165 |
|
|
1218 | 1222 | // FSMC Graphical TFT
|
1219 | 1223 | //
|
1220 | 1224 | #if ENABLED(FSMC_GRAPHICAL_TFT)
|
1221 |
| - //#define TFT_MARLINUI_COLOR 0xFFFF // White |
1222 |
| - //#define TFT_MARLINBG_COLOR 0x0000 // Black |
1223 |
| - //#define TFT_DISABLED_COLOR 0x0003 // Almost black |
1224 |
| - //#define TFT_BTCANCEL_COLOR 0xF800 // Red |
1225 |
| - //#define TFT_BTARROWS_COLOR 0xDEE6 // 11011 110111 00110 Yellow |
1226 |
| - //#define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan |
| 1225 | + // see https://ee-programming-notepad.blogspot.com/2016/10/16-bit-color-generator-picker.html |
| 1226 | + #define TFT_MARLINUI_COLOR COLOR_WHITE |
| 1227 | + #define TFT_MARLINBG_COLOR COLOR_BLACK |
| 1228 | + #define TFT_DISABLED_COLOR 0x10A2 // almost black |
| 1229 | + #define TFT_BTCANCEL_COLOR COLOR_RED |
| 1230 | + #define TFT_BTARROWS_COLOR COLOR_WHITE |
| 1231 | + #define TFT_BTOKMENU_COLOR COLOR_BLUE |
1227 | 1232 | #endif
|
1228 | 1233 |
|
1229 | 1234 | // @section safety
|
|
1420 | 1425 | // The number of linear motions that can be in the plan at any give time.
|
1421 | 1426 | // THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2 (e.g. 8, 16, 32) because shifts and ors are used to do the ring-buffering.
|
1422 | 1427 | #if ENABLED(SDSUPPORT)
|
1423 |
| - #define BLOCK_BUFFER_SIZE 16 // SD,LCD,Buttons take more memory, block buffer needs to be smaller |
| 1428 | + #define BLOCK_BUFFER_SIZE 32 |
1424 | 1429 | #else
|
1425 |
| - #define BLOCK_BUFFER_SIZE 16 // maximize block buffer |
| 1430 | + #define BLOCK_BUFFER_SIZE 16 // Marlin default |
1426 | 1431 | #endif
|
1427 | 1432 |
|
1428 | 1433 | // @section serial
|
1429 | 1434 |
|
1430 | 1435 | // The ASCII buffer for serial input
|
1431 | 1436 | #define MAX_CMD_SIZE 96
|
1432 |
| -#define BUFSIZE 4 |
| 1437 | +#define BUFSIZE 8 |
1433 | 1438 |
|
1434 | 1439 | // Transmission to Host Buffer Size
|
1435 | 1440 | // To save 386 bytes of PROGMEM (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0.
|
|
1569 | 1574 | * Requires NOZZLE_PARK_FEATURE.
|
1570 | 1575 | * This feature is required for the default FILAMENT_RUNOUT_SCRIPT.
|
1571 | 1576 | */
|
1572 |
| -//#define ADVANCED_PAUSE_FEATURE |
| 1577 | +#define ADVANCED_PAUSE_FEATURE |
1573 | 1578 | #if ENABLED(ADVANCED_PAUSE_FEATURE)
|
1574 | 1579 | #define PAUSE_PARK_RETRACT_FEEDRATE 60 // (mm/s) Initial retract feedrate.
|
1575 | 1580 | #define PAUSE_PARK_RETRACT_LENGTH 2 // (mm) Initial retract.
|
|
1590 | 1595 | // For direct drive, the full length of the nozzle.
|
1591 | 1596 | //#define ADVANCED_PAUSE_CONTINUOUS_PURGE // Purge continuously up to the purge length until interrupted.
|
1592 | 1597 | #define ADVANCED_PAUSE_PURGE_FEEDRATE 3 // (mm/s) Extrude feedrate (after loading). Should be slower than load feedrate.
|
1593 |
| - #define ADVANCED_PAUSE_PURGE_LENGTH 50 // (mm) Length to extrude after loading. |
| 1598 | + #define ADVANCED_PAUSE_PURGE_LENGTH 25 // (mm) Length to extrude after loading. |
1594 | 1599 | // Set to 0 for manual extrusion.
|
1595 | 1600 | // Filament can be extruded repeatedly from the Filament Change menu
|
1596 | 1601 | // until extrusion is consistent, and to purge old filament.
|
|
1609 | 1614 | //#define PARK_HEAD_ON_PAUSE // Park the nozzle during pause and filament change.
|
1610 | 1615 | //#define HOME_BEFORE_FILAMENT_CHANGE // Ensure homing has been completed prior to parking for filament change
|
1611 | 1616 |
|
1612 |
| - //#define FILAMENT_LOAD_UNLOAD_GCODES // Add M701/M702 Load/Unload G-codes, plus Load/Unload in the LCD Prepare menu. |
| 1617 | + #define FILAMENT_LOAD_UNLOAD_GCODES // Add M701/M702 Load/Unload G-codes, plus Load/Unload in the LCD Prepare menu. |
1613 | 1618 | //#define FILAMENT_UNLOAD_ALL_EXTRUDERS // Allow M702 to unload all extruders above a minimum target temp (as set by M302)
|
1614 | 1619 | #endif
|
1615 | 1620 |
|
|
0 commit comments