Last active
July 31, 2020 07:58
-
-
Save cab404/09ae2db0d52df49ead473d5ebeae3bc4 to your computer and use it in GitHub Desktop.
Diff on bugfix-2.0.* branch of Marlin for X5SA. It stops extruding for some reason.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h | |
index 9d1f7862b..f131371f5 100644 | |
--- a/Marlin/Configuration.h | |
+++ b/Marlin/Configuration.h | |
@@ -21,6 +21,8 @@ | |
*/ | |
#pragma once | |
+#define CONFIG_EXAMPLES_DIR "Tronxy/X5SA" | |
+ | |
/** | |
* Configuration.h | |
* | |
@@ -71,7 +73,7 @@ | |
// @section info | |
// Author info of this build printed to the host during boot and M115 | |
-#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. | |
+#define STRING_CONFIG_H_AUTHOR "cab404" // Who made the changes. | |
//#define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes) | |
/** | |
@@ -104,13 +106,13 @@ | |
* | |
* :[-1, 0, 1, 2, 3, 4, 5, 6, 7] | |
*/ | |
-#define SERIAL_PORT 0 | |
+#define SERIAL_PORT 1 | |
/** | |
* Select a secondary serial port on the board to use for communication with the host. | |
* :[-1, 0, 1, 2, 3, 4, 5, 6, 7] | |
*/ | |
-//#define SERIAL_PORT_2 -1 | |
+#define SERIAL_PORT_2 3 | |
/** | |
* This setting determines the communication speed of the printer. | |
@@ -128,11 +130,11 @@ | |
// Choose the name from boards.h that matches your setup | |
#ifndef MOTHERBOARD | |
- #define MOTHERBOARD BOARD_RAMPS_14_EFB | |
+ #define MOTHERBOARD BOARD_CHITU3D_V6 | |
#endif | |
// Name displayed in the LCD "Ready" message and Info menu | |
-//#define CUSTOM_MACHINE_NAME "3D Printer" | |
+#define CUSTOM_MACHINE_NAME "GreenCube" | |
// Printer's unique ID, used by some programs to differentiate between machines. | |
// Choose your own or use a service like https://www.uuidgenerator.net/version4 | |
@@ -424,7 +426,7 @@ | |
#define TEMP_SENSOR_5 0 | |
#define TEMP_SENSOR_6 0 | |
#define TEMP_SENSOR_7 0 | |
-#define TEMP_SENSOR_BED 0 | |
+#define TEMP_SENSOR_BED 1 | |
#define TEMP_SENSOR_PROBE 0 | |
#define TEMP_SENSOR_CHAMBER 0 | |
@@ -610,7 +612,7 @@ | |
// Uncomment one of these options to enable CoreXY, CoreXZ, or CoreYZ kinematics | |
// either in the usual order or reversed | |
-//#define COREXY | |
+#define COREXY | |
//#define COREXZ | |
//#define COREYZ | |
//#define COREYX | |
@@ -634,7 +636,7 @@ | |
//#define USE_ZMAX_PLUG | |
// Enable pullup for all endstops to prevent a floating state | |
-#define ENDSTOPPULLUPS | |
+//#define ENDSTOPPULLUPS | |
#if DISABLED(ENDSTOPPULLUPS) | |
// Disable ENDSTOPPULLUPS to set pullups individually | |
//#define ENDSTOPPULLUP_XMAX | |
@@ -660,13 +662,13 @@ | |
#endif | |
// Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup). | |
-#define X_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. | |
-#define Y_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. | |
-#define Z_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. | |
+#define X_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop. | |
+#define Y_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop. | |
+#define Z_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop. | |
#define X_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. | |
#define Y_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. | |
#define Z_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. | |
-#define Z_MIN_PROBE_ENDSTOP_INVERTING false // Set to true to invert the logic of the probe. | |
+#define Z_MIN_PROBE_ENDSTOP_INVERTING true // Set to true to invert the logic of the probe. | |
/** | |
* Stepper Drivers | |
@@ -684,15 +686,15 @@ | |
* TMC5130, TMC5130_STANDALONE, TMC5160, TMC5160_STANDALONE | |
* :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', 'L6474', 'POWERSTEP01', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE'] | |
*/ | |
-//#define X_DRIVER_TYPE A4988 | |
-//#define Y_DRIVER_TYPE A4988 | |
-//#define Z_DRIVER_TYPE A4988 | |
+#define X_DRIVER_TYPE TMC2208_STANDALONE | |
+#define Y_DRIVER_TYPE TMC2208_STANDALONE | |
+#define Z_DRIVER_TYPE TMC2208_STANDALONE | |
//#define X2_DRIVER_TYPE A4988 | |
//#define Y2_DRIVER_TYPE A4988 | |
//#define Z2_DRIVER_TYPE A4988 | |
//#define Z3_DRIVER_TYPE A4988 | |
//#define Z4_DRIVER_TYPE A4988 | |
-//#define E0_DRIVER_TYPE A4988 | |
+#define E0_DRIVER_TYPE TMC2208_STANDALONE | |
//#define E1_DRIVER_TYPE A4988 | |
//#define E2_DRIVER_TYPE A4988 | |
//#define E3_DRIVER_TYPE A4988 | |
@@ -747,7 +749,9 @@ | |
* Override with M92 | |
* X, Y, Z, E0 [, E1[, E2...]] | |
*/ | |
-#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 4000, 500 } | |
+#define DEFAULT_AXIS_STEPS_PER_UNIT { 160, 160, 800, 185.22 } | |
+//TITAN EXTRUDER: | |
+//#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 92.6 } | |
/** | |
* Default Max Feed Rate (mm/s) | |
@@ -767,7 +771,7 @@ | |
* Override with M201 | |
* X, Y, Z, E0 [, E1[, E2...]] | |
*/ | |
-#define DEFAULT_MAX_ACCELERATION { 3000, 3000, 100, 10000 } | |
+#define DEFAULT_MAX_ACCELERATION { 1500, 1500, 100, 5000 } | |
//#define LIMITED_MAX_ACCEL_EDITING // Limit edit via M201 or LCD to DEFAULT_MAX_ACCELERATION * 2 | |
#if ENABLED(LIMITED_MAX_ACCEL_EDITING) | |
@@ -782,9 +786,9 @@ | |
* M204 R Retract Acceleration | |
* M204 T Travel Acceleration | |
*/ | |
-#define DEFAULT_ACCELERATION 3000 // X, Y, Z and E acceleration for printing moves | |
-#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts | |
-#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves | |
+#define DEFAULT_ACCELERATION 1500 // X, Y, Z and E acceleration for printing moves | |
+#define DEFAULT_RETRACT_ACCELERATION 1500 // E acceleration for retracts | |
+#define DEFAULT_TRAVEL_ACCELERATION 1500 // X, Y, Z acceleration for travel (non printing) moves | |
/** | |
* Default Jerk limits (mm/s) | |
@@ -831,7 +835,7 @@ | |
* | |
* See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained | |
*/ | |
-//#define S_CURVE_ACCELERATION | |
+// #define S_CURVE_ACCELERATION | |
//=========================================================================== | |
//============================= Z Probe Options ============================= | |
@@ -889,7 +893,7 @@ | |
* A Fix-Mounted Probe either doesn't deploy or needs manual deployment. | |
* (e.g., an inductive probe or a nozzle-based probe-switch.) | |
*/ | |
-//#define FIX_MOUNTED_PROBE | |
+#define FIX_MOUNTED_PROBE | |
/** | |
* Use the nozzle as the probe, as with a conductive | |
@@ -993,11 +997,11 @@ | |
* | [-] | | |
* O-- FRONT --+ | |
*/ | |
-#define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 } | |
+#define NOZZLE_TO_PROBE_OFFSET { -40, 0, 0 } | |
// Most probes should stay away from the edges of the bed, but | |
// with NOZZLE_AS_PROBE this can be negative for a wider probing area. | |
-#define PROBING_MARGIN 10 | |
+#define PROBING_MARGIN 50 | |
// X and Y axis travel speed (mm/m) between probes | |
#define XY_PROBE_SPEED 8000 | |
@@ -1046,7 +1050,7 @@ | |
#define Z_PROBE_OFFSET_RANGE_MAX 20 | |
// Enable the M48 repeatability test to test probe accuracy | |
-//#define Z_MIN_PROBE_REPEATABILITY_TEST | |
+#define Z_MIN_PROBE_REPEATABILITY_TEST | |
// Before deploy/stow pause for user confirmation | |
//#define PAUSE_BEFORE_DEPLOY_STOW | |
@@ -1093,7 +1097,7 @@ | |
// @section machine | |
// Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way. | |
-#define INVERT_X_DIR false | |
+#define INVERT_X_DIR true | |
#define INVERT_Y_DIR true | |
#define INVERT_Z_DIR false | |
@@ -1115,7 +1119,7 @@ | |
//#define UNKNOWN_Z_NO_RAISE // Don't raise Z (lower the bed) if Z is "unknown." For beds that fall when Z is powered off. | |
-//#define Z_HOMING_HEIGHT 4 // (mm) Minimal Z height before homing (G28) for Z clearance above the bed, clamps, ... | |
+#define Z_HOMING_HEIGHT 10 // (mm) Minimal Z height before homing (G28) for Z clearance above the bed, clamps, ... | |
// Be sure to have this much clearance over your Z_MAX_POS to prevent grinding. | |
//#define Z_AFTER_HOMING 10 // (mm) Height to move to after homing Z | |
@@ -1129,8 +1133,8 @@ | |
// @section machine | |
// The size of the print bed | |
-#define X_BED_SIZE 200 | |
-#define Y_BED_SIZE 200 | |
+#define X_BED_SIZE 330 | |
+#define Y_BED_SIZE 330 | |
// Travel limits (mm) after homing, corresponding to endstop positions. | |
#define X_MIN_POS 0 | |
@@ -1138,7 +1142,7 @@ | |
#define Z_MIN_POS 0 | |
#define X_MAX_POS X_BED_SIZE | |
#define Y_MAX_POS Y_BED_SIZE | |
-#define Z_MAX_POS 200 | |
+#define Z_MAX_POS 400 | |
/** | |
* Software Endstops | |
@@ -1176,11 +1180,11 @@ | |
* RAMPS-based boards use SERVO3_PIN for the first runout sensor. | |
* For other boards you may need to define FIL_RUNOUT_PIN, FIL_RUNOUT2_PIN, etc. | |
*/ | |
-//#define FILAMENT_RUNOUT_SENSOR | |
+#define FILAMENT_RUNOUT_SENSOR | |
#if ENABLED(FILAMENT_RUNOUT_SENSOR) | |
#define NUM_RUNOUT_SENSORS 1 // Number of sensors, up to one per extruder. Define a FIL_RUNOUT#_PIN for each. | |
- #define FIL_RUNOUT_STATE LOW // Pin state indicating that filament is NOT present. | |
- #define FIL_RUNOUT_PULLUP // Use internal pullup for filament runout pins. | |
+ #define FIL_RUNOUT_STATE HIGH // Pin state indicating that filament is NOT present. | |
+ //#define FIL_RUNOUT_PULLUP // Use internal pullup for filament runout pins. | |
//#define FIL_RUNOUT_PULLDOWN // Use internal pulldown for filament runout pins. | |
// Set one or more commands to execute on filament runout. | |
@@ -1241,14 +1245,14 @@ | |
//#define AUTO_BED_LEVELING_3POINT | |
//#define AUTO_BED_LEVELING_LINEAR | |
//#define AUTO_BED_LEVELING_BILINEAR | |
-//#define AUTO_BED_LEVELING_UBL | |
+#define AUTO_BED_LEVELING_UBL | |
//#define MESH_BED_LEVELING | |
/** | |
* Normally G28 leaves leveling disabled on completion. Enable | |
* this option to have G28 restore the prior leveling state. | |
*/ | |
-//#define RESTORE_LEVELING_AFTER_G28 | |
+#define RESTORE_LEVELING_AFTER_G28 | |
/** | |
* Enable detailed logging of G28, G29, M48, etc. | |
@@ -1287,7 +1291,7 @@ | |
#if EITHER(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_BILINEAR) | |
// Set the number of grid points per dimension. | |
- #define GRID_MAX_POINTS_X 3 | |
+ #define GRID_MAX_POINTS_X 4 | |
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X | |
// Probe along the Y axis, advancing X after each column | |
@@ -1317,10 +1321,10 @@ | |
//========================= Unified Bed Leveling ============================ | |
//=========================================================================== | |
- //#define MESH_EDIT_GFX_OVERLAY // Display a graphics overlay while editing the mesh | |
+ #define MESH_EDIT_GFX_OVERLAY // Display a graphics overlay while editing the mesh | |
#define MESH_INSET 1 // Set Mesh bounds as an inset region of the bed | |
- #define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited. | |
+ #define GRID_MAX_POINTS_X 4 // Don't use more than 15 points per axis, implementation limited. | |
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X | |
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle | |
@@ -1336,7 +1340,7 @@ | |
//=========================================================================== | |
#define MESH_INSET 10 // Set Mesh bounds as an inset region of the bed | |
- #define GRID_MAX_POINTS_X 3 // Don't use more than 7 points per axis, implementation limited. | |
+ #define GRID_MAX_POINTS_X 10 // Don't use more than 7 points per axis, implementation limited. | |
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X | |
//#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS | |
@@ -1347,7 +1351,7 @@ | |
* Add a bed leveling sub-menu for ABL or MBL. | |
* Include a guided procedure if manual probing is enabled. | |
*/ | |
-//#define LCD_BED_LEVELING | |
+#define LCD_BED_LEVELING | |
#if ENABLED(LCD_BED_LEVELING) | |
#define MESH_EDIT_Z_STEP 0.025 // (mm) Step size while manually probing Z axis. | |
@@ -1356,7 +1360,7 @@ | |
#endif | |
// Add a menu item to move between bed corners for manual bed adjustment | |
-//#define LEVEL_BED_CORNERS | |
+#define LEVEL_BED_CORNERS | |
#if ENABLED(LEVEL_BED_CORNERS) | |
#define LEVEL_CORNERS_INSET_LFRB { 30, 30, 30, 30 } // (mm) Left, Front, Right, Back insets | |
@@ -1391,7 +1395,7 @@ | |
// - Move the Z probe (or nozzle) to a defined XY point before Z Homing. | |
// - Prevent Z homing when the Z probe is outside bed area. | |
// | |
-//#define Z_SAFE_HOMING | |
+#define Z_SAFE_HOMING | |
#if ENABLED(Z_SAFE_HOMING) | |
#define Z_SAFE_HOMING_X_POINT X_CENTER // X point for Z homing | |
@@ -1477,12 +1481,12 @@ | |
* M501 - Read settings from EEPROM. (i.e., Throw away unsaved changes) | |
* M502 - Revert settings to "factory" defaults. (Follow with M500 to init the EEPROM.) | |
*/ | |
-//#define EEPROM_SETTINGS // Persistent storage with M500 and M501 | |
+#define EEPROM_SETTINGS // Persistent storage with M500 and M501 | |
//#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! | |
#define EEPROM_CHITCHAT // Give feedback on EEPROM commands. Disable to save PROGMEM. | |
#define EEPROM_BOOT_SILENT // Keep M503 quiet and only give errors during first load | |
#if ENABLED(EEPROM_SETTINGS) | |
- //#define EEPROM_AUTO_INIT // Init EEPROM automatically on any errors. | |
+ #define EEPROM_AUTO_INIT // Init EEPROM automatically on any errors. | |
#endif | |
// | |
@@ -1510,12 +1514,12 @@ | |
// Preheat Constants | |
#define PREHEAT_1_LABEL "PLA" | |
#define PREHEAT_1_TEMP_HOTEND 180 | |
-#define PREHEAT_1_TEMP_BED 70 | |
+#define PREHEAT_1_TEMP_BED 50 | |
#define PREHEAT_1_FAN_SPEED 0 // Value from 0 to 255 | |
#define PREHEAT_2_LABEL "ABS" | |
#define PREHEAT_2_TEMP_HOTEND 240 | |
-#define PREHEAT_2_TEMP_BED 110 | |
+#define PREHEAT_2_TEMP_BED 90 | |
#define PREHEAT_2_FAN_SPEED 0 // Value from 0 to 255 | |
/** | |
@@ -1529,7 +1533,7 @@ | |
* P1 Raise the nozzle always to Z-park height. | |
* P2 Raise the nozzle by Z-park amount, limited to Z_MAX_POS. | |
*/ | |
-//#define NOZZLE_PARK_FEATURE | |
+#define NOZZLE_PARK_FEATURE | |
#if ENABLED(NOZZLE_PARK_FEATURE) | |
// Specify a park position as { X, Y, Z_raise } | |
@@ -1605,10 +1609,6 @@ | |
// Enable for a purge/clean station that's always at the gantry height (thus no Z move) | |
//#define NOZZLE_CLEAN_NO_Z | |
- | |
- // Explicit wipe G-code script applies to a G12 with no arguments. | |
- //#define WIPE_SEQUENCE_COMMANDS "G1 X-17 Y25 Z10 F4000\nG1 Z1\nM114\nG1 X-17 Y25\nG1 X-17 Y95\nG1 X-17 Y25\nG1 X-17 Y95\nG1 X-17 Y25\nG1 X-17 Y95\nG1 X-17 Y25\nG1 X-17 Y95\nG1 X-17 Y25\nG1 X-17 Y95\nG1 X-17 Y25\nG1 X-17 Y95\nG1 Z15\nM400\nG0 X-10.0 Y-9.0" | |
- | |
#endif | |
/** | |
@@ -1682,7 +1682,7 @@ | |
* | |
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] | |
*/ | |
-#define DISPLAY_CHARSET_HD44780 JAPANESE | |
+#define DISPLAY_CHARSET_HD44780 CYRILLIC | |
/** | |
* Info Screen Style (0:Classic, 1:Prusa) | |
@@ -1698,7 +1698,7 @@ | |
* you must uncomment the following option or it won't work. | |
* | |
*/ | |
-//#define SDSUPPORT | |
+#define SDSUPPORT | |
/** | |
* SD CARD: SPI SPEED | |
@@ -1715,7 +1715,7 @@ | |
* | |
* Use CRC checks and retries on the SD communication. | |
*/ | |
-//#define SD_CHECK_AND_RETRY | |
+#define SD_CHECK_AND_RETRY | |
/** | |
* LCD Menu Items | |
@@ -1786,7 +1786,7 @@ | |
// If you have a speaker that can produce tones, enable it here. | |
// By default Marlin assumes you have a buzzer with a fixed frequency. | |
// | |
-//#define SPEAKER | |
+#define SPEAKER | |
// | |
// The duration and frequency for the UI feedback sound. | |
@@ -2176,7 +2176,7 @@ | |
// FSMC display (MKS Robin, Alfawise U20, JGAurora A5S, REXYZ A1, etc.) | |
// Upscaled 128x64 Marlin UI | |
// | |
-//#define FSMC_GRAPHICAL_TFT | |
+#define FSMC_GRAPHICAL_TFT | |
// | |
// TFT LVGL UI | |
@@ -2206,19 +2206,30 @@ | |
// | |
// ADS7843/XPT2046 ADC Touchscreen such as ILI9341 2.8 | |
// | |
-//#define TOUCH_SCREEN | |
+ | |
+#define TOUCH_SCREEN | |
+//DONE BY CHITU BOARD | |
#if ENABLED(TOUCH_SCREEN) | |
+ #define TOUCH_SCREEN_CALIBRATION | |
#define BUTTON_DELAY_EDIT 50 // (ms) Button repeat delay for edit screens | |
#define BUTTON_DELAY_MENU 250 // (ms) Button repeat delay for menus | |
- #define TOUCH_SCREEN_CALIBRATION | |
- | |
- //#define XPT2046_X_CALIBRATION 12316 | |
- //#define XPT2046_Y_CALIBRATION -8981 | |
- //#define XPT2046_X_OFFSET -43 | |
- //#define XPT2046_Y_OFFSET 257 | |
+ #define XPT2046_X_CALIBRATION -12316 | |
+ #define XPT2046_Y_CALIBRATION 8981 | |
+ #define XPT2046_X_OFFSET 340 | |
+ #define XPT2046_Y_OFFSET -20 | |
#endif | |
+// Change colors | |
+// some colors are predefined, see /src/lcd/dogm/u8g_dev_tft_480~.cpp Line 160 | |
+// or use 16bit color (e.g. 0x0000 = black, 0xFFE0 = yellow) | |
+// see https://ee-programming-notepad.blogspot.com/2016/10/16-bit-color-generator-picker.html | |
+#define TFT_MARLINUI_COLOR COLOR_WHITE // main foreground color | |
+#define TFT_MARLINBG_COLOR COLOR_BLACK // background color | |
+#define TFT_BTCANCEL_COLOR COLOR_RED // cancel button | |
+#define TFT_BTARROWS_COLOR COLOR_WHITE // arrows up/down | |
+#define TFT_BTOKMENU_COLOR COLOR_GREEN // enter button | |
+ | |
// | |
// RepRapWorld REPRAPWORLD_KEYPAD v1.1 | |
// https://reprapworld.com/products/electronics/ramps/keypad_v1_0_fully_assembled/ | |
@@ -2238,7 +2249,7 @@ | |
// Use software PWM to drive the fan, as for the heaters. This uses a very low frequency | |
// which is not as annoying as with the hardware PWM. On the other hand, if this frequency | |
// is too low, you should also increment SOFT_PWM_SCALE. | |
-//#define FAN_SOFT_PWM | |
+#define FAN_SOFT_PWM | |
// Incrementing this by 1 will double the software PWM frequency, | |
// affecting heaters, and the fan if FAN_SOFT_PWM is enabled. | |
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h | |
index 37c997977..c26d5bbc5 100644 | |
--- a/Marlin/Configuration_adv.h | |
+++ b/Marlin/Configuration_adv.h | |
@@ -21,6 +21,8 @@ | |
*/ | |
#pragma once | |
+#define CONFIG_EXAMPLES_DIR "Tronxy/X5SA" | |
+ | |
/** | |
* Configuration_adv.h | |
* | |
@@ -371,7 +373,7 @@ | |
* The fan turns on automatically whenever any driver is enabled and turns | |
* off (or reduces to idle speed) shortly after drivers are turned off. | |
*/ | |
-//#define USE_CONTROLLER_FAN | |
+#define USE_CONTROLLER_FAN | |
#if ENABLED(USE_CONTROLLER_FAN) | |
//#define CONTROLLER_FAN_PIN -1 // Set a custom pin for the controller fan | |
//#define CONTROLLER_FAN_USE_Z_ONLY // With this option only the Z axis is considered | |
@@ -450,7 +452,7 @@ | |
* Multiple extruders can be assigned to the same pin in which case | |
* the fan will turn on when any selected extruder is above the threshold. | |
*/ | |
-#define E0_AUTO_FAN_PIN -1 | |
+#define E0_AUTO_FAN_PIN FAN_PIN_2 | |
#define E1_AUTO_FAN_PIN -1 | |
#define E2_AUTO_FAN_PIN -1 | |
#define E3_AUTO_FAN_PIN -1 | |
@@ -1200,7 +1202,7 @@ | |
#endif | |
// This allows hosts to request long names for files and folders with M33 | |
- //#define LONG_FILENAME_HOST_SUPPORT | |
+ #define LONG_FILENAME_HOST_SUPPORT | |
// Enable this option to scroll long filenames in the SD card menu | |
//#define SCROLL_LONG_FILENAMES | |
@@ -1553,17 +1555,17 @@ | |
* | |
* Warning: Does not respect endstops! | |
*/ | |
-//#define BABYSTEPPING | |
+#define BABYSTEPPING | |
#if ENABLED(BABYSTEPPING) | |
//#define INTEGRATED_BABYSTEPPING // EXPERIMENTAL integration of babystepping into the Stepper ISR | |
//#define BABYSTEP_WITHOUT_HOMING | |
//#define BABYSTEP_XY // Also enable X/Y Babystepping. Not supported on DELTA! | |
#define BABYSTEP_INVERT_Z false // Change if Z babysteps should go the other way | |
//#define BABYSTEP_MILLIMETER_UNITS // Specify BABYSTEP_MULTIPLICATOR_(XY|Z) in mm instead of micro-steps | |
- #define BABYSTEP_MULTIPLICATOR_Z 1 // (steps or mm) Steps or millimeter distance for each Z babystep | |
+ #define BABYSTEP_MULTIPLICATOR_Z 10 // (steps or mm) Steps or millimeter distance for each Z babystep | |
#define BABYSTEP_MULTIPLICATOR_XY 1 // (steps or mm) Steps or millimeter distance for each XY babystep | |
- //#define DOUBLECLICK_FOR_Z_BABYSTEPPING // Double-click on the Status Screen for Z Babystepping. | |
+ #define DOUBLECLICK_FOR_Z_BABYSTEPPING // Double-click on the Status Screen for Z Babystepping. | |
#if ENABLED(DOUBLECLICK_FOR_Z_BABYSTEPPING) | |
#define DOUBLECLICK_MAX_INTERVAL 1250 // Maximum interval between clicks, in milliseconds. | |
// Note: Extra time may be added to mitigate controller latency. | |
@@ -1574,9 +1576,9 @@ | |
#endif | |
#endif | |
- //#define BABYSTEP_DISPLAY_TOTAL // Display total babysteps since last G28 | |
+ #define BABYSTEP_DISPLAY_TOTAL // Display total babysteps since last G28 | |
- //#define BABYSTEP_ZPROBE_OFFSET // Combine M851 Z and Babystepping | |
+ #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 | |
//#define BABYSTEP_ZPROBE_GFX_OVERLAY // Enable graphical overlay on Z-offset editor | |
@@ -1600,10 +1602,10 @@ | |
* | |
* See https://marlinfw.org/docs/features/lin_advance.html for full instructions. | |
*/ | |
-//#define LIN_ADVANCE | |
+#define LIN_ADVANCE | |
#if ENABLED(LIN_ADVANCE) | |
//#define EXTRA_LIN_ADVANCE_K // Enable for second linear advance constants | |
- #define LIN_ADVANCE_K 0.22 // Unit: mm compression per 1mm/s extruder speed | |
+ #define LIN_ADVANCE_K 0 // Unit: mm compression per 1mm/s extruder speed | |
//#define LA_DEBUG // If enabled, this will generate debug information output over USB. | |
//#define EXPERIMENTAL_SCURVE // Enable this option to permit S-Curve Acceleration | |
#endif | |
@@ -2037,7 +2039,7 @@ | |
* Requires NOZZLE_PARK_FEATURE. | |
* This feature is required for the default FILAMENT_RUNOUT_SCRIPT. | |
*/ | |
-//#define ADVANCED_PAUSE_FEATURE | |
+#define ADVANCED_PAUSE_FEATURE | |
#if ENABLED(ADVANCED_PAUSE_FEATURE) | |
#define PAUSE_PARK_RETRACT_FEEDRATE 60 // (mm/s) Initial retract feedrate. | |
#define PAUSE_PARK_RETRACT_LENGTH 2 // (mm) Initial retract. | |
@@ -2407,7 +2409,7 @@ | |
*/ | |
#define STEALTHCHOP_XY | |
#define STEALTHCHOP_Z | |
- #define STEALTHCHOP_E | |
+ //#define STEALTHCHOP_E | |
/** | |
* Optimize spreadCycle chopper parameters by using predefined parameter sets | |
@@ -2424,7 +2426,7 @@ | |
* Define you own with | |
* { <off_time[1..15]>, <hysteresis_end[-3..12]>, hysteresis_start[1..8] } | |
*/ | |
- #define CHOPPER_TIMING CHOPPER_DEFAULT_12V | |
+ #define CHOPPER_TIMING CHOPPER_DEFAULT_24V | |
/** | |
* Monitor Trinamic drivers | |
@@ -2532,7 +2534,7 @@ | |
* Enable M122 debugging command for TMC stepper drivers. | |
* M122 S0/1 will enable continous reporting. | |
*/ | |
- //#define TMC_DEBUG | |
+ #define TMC_DEBUG | |
/** | |
* You can set your own advanced settings by filling in predefined functions. | |
@@ -3111,8 +3113,6 @@ | |
//#define M114_REALTIME // Real current position based on forward kinematics | |
//#define M114_LEGACY // M114 used to synchronize on every call. Enable if needed. | |
-//#define REPORT_FAN_CHANGE // Report the new fan speed when changed by M106 (and others) | |
- | |
/** | |
* Set the number of proportional font spaces required to fill up a typical character space. | |
* This can help to better align the output of commands like `G29 O` Mesh Output. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment