Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marlin into bugfix-2.0.x
This commit is contained in:
		| @@ -50,6 +50,19 @@ | ||||
|   #define HEATER_BED_INVERTING true | ||||
| #endif | ||||
|  | ||||
| /** | ||||
|  * Heated Chamber settings | ||||
|  */ | ||||
| #if TEMP_SENSOR_CHAMBER | ||||
|   #define CHAMBER_MINTEMP             5 | ||||
|   #define CHAMBER_MAXTEMP            60 | ||||
|   #define TEMP_CHAMBER_HYSTERESIS     1   // (°C) Temperature proximity considered "close enough" to the target | ||||
|   #define THERMAL_PROTECTION_CHAMBER      // Enable thermal protection for the heated chamber | ||||
|   //#define CHAMBER_LIMIT_SWITCHING | ||||
|   //#define HEATER_CHAMBER_PIN       44   // Chamber heater on/off pin | ||||
|   //#define HEATER_CHAMBER_INVERTING false | ||||
| #endif | ||||
|  | ||||
| #if DISABLED(PIDTEMPBED) | ||||
|   #define BED_CHECK_INTERVAL 5000 // ms between checks in bang-bang control | ||||
|   #if ENABLED(BED_LIMIT_SWITCHING) | ||||
| @@ -127,8 +140,8 @@ | ||||
| #endif | ||||
|  | ||||
| #if ENABLED(PIDTEMP) | ||||
|   // this adds an experimental additional term to the heating power, proportional to the extrusion speed. | ||||
|   // if Kc is chosen well, the additional required power due to increased melting should be compensated. | ||||
|   // Add an experimental additional term to the heater power, proportional to the extrusion speed. | ||||
|   // A well-chosen Kc value should add just enough power to melt the increased material volume. | ||||
|   //#define PID_EXTRUSION_SCALING | ||||
|   #if ENABLED(PID_EXTRUSION_SCALING) | ||||
|     #define DEFAULT_Kc (100) //heating power=Kc*(e_speed) | ||||
| @@ -456,6 +469,7 @@ | ||||
| #define Z_HOME_BUMP_MM 2 | ||||
| #define HOMING_BUMP_DIVISOR { 2, 2, 4 }  // Re-Bump Speed Divisor (Divides the Homing Feedrate) | ||||
| //#define QUICK_HOME                     // If homing includes X and Y, do a diagonal move initially | ||||
| //#define HOMING_BACKOFF_MM { 2, 2, 2 }  // (mm) Move away from the endstops after homing | ||||
|  | ||||
| // When G28 is called, this option will make Y home before X | ||||
| //#define HOME_Y_BEFORE_X | ||||
| @@ -773,8 +787,11 @@ | ||||
|   // Since the FAT gets out of order with usage, SDCARD_SORT_ALPHA is recommended. | ||||
|   #define SDCARD_RATHERRECENTFIRST | ||||
|  | ||||
|   // Add an option in the menu to run all auto#.g files | ||||
|   //#define MENU_ADDAUTOSTART | ||||
|   #define SD_MENU_CONFIRM_START             // Confirm the selected SD file before printing | ||||
|  | ||||
|   //#define MENU_ADDAUTOSTART               // Add a menu option to run auto#.g files | ||||
|  | ||||
|   #define EVENT_GCODE_SD_STOP "G28XY"       // G-code to run on Stop Print (e.g., "G28XY" or "G27") | ||||
|  | ||||
|   /** | ||||
|    * Continue after Power-Loss (Creality3D) | ||||
| @@ -962,6 +979,12 @@ | ||||
|   //#define STATUS_ALT_FAN_BITMAP     // Use the alternative fan bitmap | ||||
|   //#define STATUS_FAN_FRAMES 3       // :[0,1,2,3,4] Number of fan animation frames | ||||
|   //#define STATUS_HEAT_PERCENT       // Show heating in a progress bar | ||||
|   //#define BOOT_MARLIN_LOGO_SMALL    // Show a smaller Marlin logo on the Boot Screen (saving 399 bytes of flash) | ||||
|  | ||||
|   // Frivolous Game Options | ||||
|   //#define MARLIN_BRICKOUT | ||||
|   //#define MARLIN_INVADERS | ||||
|   //#define MARLIN_SNAKE | ||||
|  | ||||
|   // Frivolous Game Options | ||||
|   //#define MARLIN_BRICKOUT | ||||
| @@ -1010,6 +1033,8 @@ | ||||
|     #endif | ||||
|   #endif | ||||
|  | ||||
|   //#define BABYSTEP_DISPLAY_TOTAL          // Display total babysteps since last G28 | ||||
|  | ||||
|   //#define BABYSTEP_ZPROBE_OFFSET          // Combine M851 Z and Babystepping | ||||
|   #if ENABLED(BABYSTEP_ZPROBE_OFFSET) | ||||
|     //#define BABYSTEP_HOTEND_Z_OFFSET      // For multiple hotends, babystep relative Z offsets | ||||
|   | ||||
		Reference in New Issue
	
	Block a user