Last active
December 31, 2022 22:26
-
-
Save mrwm/4cac058126884a6b26e231e472702293 to your computer and use it in GitHub Desktop.
Configuration changes for marlin 2.1.1 to 2.1.2 (2.1.1 < - > 2.1.2)
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
40c40 | |
< #define CONFIGURATION_H_VERSION 02010100 | |
--- | |
> #define CONFIGURATION_H_VERSION 02010200 | |
141c141 | |
< #define CUSTOM_MACHINE_NAME "ToasterPop" | |
--- | |
> #define CUSTOM_MACHINE_NAME "RoomHeater" | |
146a147,148 | |
> // @section stepper drivers | |
> | |
245a248,249 | |
> // @section multi-material | |
> | |
257a262 | |
> * :["PRUSA_MMU1", "PRUSA_MMU2", "PRUSA_MMU2S", "EXTENDABLE_EMU_MMU2", "EXTENDABLE_EMU_MMU2S"] | |
497c502 | |
< * 66 : 4.7MΩ Dyze Design High Temperature Thermistor | |
--- | |
> * 66 : 4.7MΩ Dyze Design / Trianglelab T-D500 500°C High Temperature Thermistor | |
518a524 | |
> * 1022 : Pt1000 with 2.2kΩ pullup | |
563a570,573 | |
> #if TEMP_SENSOR_IS_MAX_TC(2) | |
> #define MAX31865_SENSOR_OHMS_2 100 | |
> #define MAX31865_CALIBRATION_OHMS_2 430 | |
> #endif | |
728a739 | |
> * @section bed temp | |
874c885 | |
< #define POLAR_SEGMENTS_PER_SECOND 5 | |
--- | |
> #define DEFAULT_SEGMENTS_PER_SECOND 5 | |
886c897 | |
< #define DELTA_SEGMENTS_PER_SECOND 200 | |
--- | |
> #define DEFAULT_SEGMENTS_PER_SECOND 200 | |
892c903 | |
< // uncomment to add three points calibration menu option. | |
--- | |
> // Add three-point calibration to the MarlinUI menu. | |
896c907 | |
< // uncomment to add G33 Delta Auto-Calibration (Enable EEPROM_SETTINGS to store results) | |
--- | |
> // G33 Delta Auto-Calibration. Enable EEPROM_SETTINGS to store results. | |
899,900d909 | |
< // NOTE NB all values for DELTA_* values MUST be floating point, so always have a decimal point in them | |
< | |
902c911 | |
< // set the default number of probe points : n*n (1 -> 7) | |
--- | |
> // Default number of probe points : n*n (1 -> 7) | |
907c916 | |
< // Set the steprate for papertest probing | |
--- | |
> // Step size for paper-test probing | |
952c961 | |
< #define SCARA_SEGMENTS_PER_SECOND 200 | |
--- | |
> #define DEFAULT_SEGMENTS_PER_SECOND 200 | |
988,989c997,998 | |
< #define DEBUG_ROBOT_KINEMATICS | |
< #define ROBOT_SEGMENTS_PER_SECOND 200 | |
--- | |
> #define DEBUG_TPARA_KINEMATICS | |
> #define DEFAULT_SEGMENTS_PER_SECOND 200 | |
992,993c1001,1002 | |
< #define ROBOT_LINKAGE_1 120 // (mm) | |
< #define ROBOT_LINKAGE_2 120 // (mm) | |
--- | |
> #define TPARA_LINKAGE_1 120 // (mm) | |
> #define TPARA_LINKAGE_2 120 // (mm) | |
997,999c1006,1008 | |
< #define ROBOT_OFFSET_X 0 // (mm) | |
< #define ROBOT_OFFSET_Y 0 // (mm) | |
< #define ROBOT_OFFSET_Z 0 // (mm) | |
--- | |
> #define TPARA_OFFSET_X 0 // (mm) | |
> #define TPARA_OFFSET_Y 0 // (mm) | |
> #define TPARA_OFFSET_Z 0 // (mm) | |
1200,1202c1209,1211 | |
< #define DEFAULT_ACCELERATION 600 // X, Y, Z ... and E acceleration for printing moves | |
< #define DEFAULT_RETRACT_ACCELERATION 1000 // E acceleration for retracts | |
< #define DEFAULT_TRAVEL_ACCELERATION 800 // X, Y, Z ... acceleration for travel (non printing) moves | |
--- | |
> #define DEFAULT_ACCELERATION 600 // X, Y, Z and E acceleration for printing moves | |
> #define DEFAULT_RETRACT_ACCELERATION 1000 // E acceleration for retracts | |
> #define DEFAULT_TRAVEL_ACCELERATION 800 // X, Y, Z acceleration for travel (non printing) moves | |
1559,1560c1568,1569 | |
< #define Z_CLEARANCE_DEPLOY_PROBE 7 // Z Clearance for Deploy/Stow | |
< #define Z_CLEARANCE_BETWEEN_PROBES 7 // Z Clearance between probe points | |
--- | |
> #define Z_CLEARANCE_DEPLOY_PROBE 7 // Z Clearance for Deploy/Stow | |
> #define Z_CLEARANCE_BETWEEN_PROBES 7 // Z Clearance between probe points | |
1636c1645 | |
< // @section machine | |
--- | |
> // @section motion | |
1702c1711 | |
< #define Z_MAX_POS 380 | |
--- | |
> #define Z_MAX_POS 400 | |
1915,1917c1924,1928 | |
< // Gradually reduce leveling correction until a set height is reached, | |
< // at which point movement will be level to the machine's XY plane. | |
< // The height can be set with M420 Z<height> | |
--- | |
> /** | |
> * Gradually reduce leveling correction until a set height is reached, | |
> * at which point movement will be level to the machine's XY plane. | |
> * The height can be set with M420 Z<height> | |
> */ | |
1923,1925c1934,1938 | |
< // For Cartesian machines, instead of dividing moves on mesh boundaries, | |
< // split up moves into short segments like a Delta. This follows the | |
< // contours of the bed more closely than edge-to-edge straight moves. | |
--- | |
> /** | |
> * For Cartesian machines, instead of dividing moves on mesh boundaries, | |
> * split up moves into short segments like a Delta. This follows the | |
> * contours of the bed more closely than edge-to-edge straight moves. | |
> */ | |
2136,2137c2149 | |
< // Or, set the default skew factors directly here | |
< // to override the above measurements: | |
--- | |
> // Or, set the XY skew factor directly: | |
2147,2148c2159,2162 | |
< #define XZ_SKEW_FACTOR 0.0 | |
< #define YZ_SKEW_FACTOR 0.0 | |
--- | |
> | |
> // Or, set the Z skew factors directly: | |
> //#define XZ_SKEW_FACTOR 0.0 | |
> //#define YZ_SKEW_FACTOR 0.0 | |
2206c2220 | |
< // Preheat Constants - Up to 6 are supported without changes | |
--- | |
> // Preheat Constants - Up to 10 are supported without changes | |
2364c2378 | |
< #define PRINTCOUNTER_SAVE_INTERVAL 60 // (minutes) EEPROM save interval during print | |
--- | |
> #define PRINTCOUNTER_SAVE_INTERVAL 60 // (minutes) EEPROM save interval during print. A value of 0 will save stats at end of print. | |
2735c2749 | |
< // https://reprapworld.com/?products_details&products_id/1218 | |
--- | |
> // https://reprapworld.com/electronics/3d-printer-modules/autonomous-printing/graphical-lcd-screen-v1-0/ | |
2989a3004 | |
> //#define ANYCUBIC_LCD_GCODE_EXT // Add ".gcode" to menu entries for DGUS clone compatibility | |
3058c3073 | |
< // 480x320, 3.5", FSMC Stock Display from TronxXY | |
--- | |
> // 480x320, 3.5", FSMC Stock Display from Tronxy | |
3124a3140,3143 | |
> #if ENABLED(TFT_COLOR_UI) | |
> //#define TFT_SHARED_SPI // SPI is shared between TFT display and other devices. Disable async data transfer | |
> #endif | |
> | |
3157,3158c3176,3177 | |
< #define BUTTON_DELAY_EDIT 50 // (ms) Button repeat delay for edit screens | |
< #define BUTTON_DELAY_MENU 250 // (ms) Button repeat delay for menus | |
--- | |
> #define BUTTON_DELAY_EDIT 50 // (ms) Button repeat delay for edit screens | |
> #define BUTTON_DELAY_MENU 250 // (ms) Button repeat delay for menus | |
3160c3179,3180 | |
< //#define TOUCH_IDLE_SLEEP 300 // (s) Turn off the TFT backlight if set (5mn) | |
--- | |
> //#define DISABLE_ENCODER // Disable the click encoder, if any | |
> //#define TOUCH_IDLE_SLEEP_MINS 5 // (minutes) Display Sleep after a period of inactivity. Set with M255 S. | |
3251c3271 | |
< * *** CAUTION *** | |
--- | |
> * === CAUTION === | |
3254a3275 | |
> * | |
3257d3277 | |
< * *** CAUTION *** | |
3259c3279,3280 | |
< * LED Type. Enable only one of the following two options. | |
--- | |
> * Requires PWM frequency between 50 <> 100Hz (Check HAL or variant) | |
> * Use FAST_PWM_FAN, if possible, to reduce fan noise. | |
3260a3282,3283 | |
> | |
> // LED Type. Enable only one of the following two options: | |
3268a3292,3295 | |
> //#define RGB_STARTUP_TEST // For PWM pins, fade between all colors | |
> #if ENABLED(RGB_STARTUP_TEST) | |
> #define RGB_STARTUP_TEST_INNER_MS 10 // (ms) Reduce or increase fading speed | |
> #endif | |
3289a3317 | |
> #define NEOPIXEL_M150_DEFAULT -1 // Default strip for M150 without 'S'. Use -1 to set all by default. |
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
35c35 | |
< #define CONFIGURATION_ADV_H_VERSION 02010100 | |
--- | |
> #define CONFIGURATION_ADV_H_VERSION 02010200 | |
53c53 | |
< //#define CONFIG_EXPORT // :[1:'JSON', 2:'config.ini', 3:'schema.json', 4:'schema.yml'] | |
--- | |
> //#define CONFIG_EXPORT 2 // :[1:'JSON', 2:'config.ini', 3:'schema.json', 4:'schema.yml'] | |
179a180 | |
> //#define MAX31865_SENSOR_WIRES_2 2 | |
189a191 | |
> //#define MAX31865_WIRE_OHMS_2 0.0f | |
486,490c488,494 | |
< // The number of milliseconds a hotend will preheat before starting to check | |
< // the temperature. This value should NOT be set to the time it takes the | |
< // hot end to reach the target temperature, but the time it takes to reach | |
< // the minimum temperature your thermistor can read. The lower the better/safer. | |
< // This shouldn't need to be more than 30 seconds (30000) | |
--- | |
> /** | |
> * The number of milliseconds a hotend will preheat before starting to check | |
> * the temperature. This value should NOT be set to the time it takes the | |
> * hot end to reach the target temperature, but the time it takes to reach | |
> * the minimum temperature your thermistor can read. The lower the better/safer. | |
> * This shouldn't need to be more than 30 seconds (30000) | |
> */ | |
495,497c499,503 | |
< // Extruder runout prevention. | |
< // If the machine is idle and the temperature over MINTEMP | |
< // then extrude some filament every couple of SECONDS. | |
--- | |
> /** | |
> * Extruder runout prevention. | |
> * If the machine is idle and the temperature over MINTEMP | |
> * then extrude some filament every couple of SECONDS. | |
> */ | |
536a543 | |
> //#define CONTROLLER_FAN2_PIN -1 // Set a custom pin for second controller fan | |
553,556c560,567 | |
< // When first starting the main fan, run it at full speed for the | |
< // given number of milliseconds. This gets the fan spinning reliably | |
< // before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu) | |
< //#define FAN_KICKSTART_TIME 100 | |
--- | |
> /** | |
> * Fan Kickstart | |
> * When part cooling or controller fans first start, run at a speed that | |
> * gets it spinning reliably for a short time before setting the requested speed. | |
> * (Does not work on Sanguinololu with FAN_SOFT_PWM.) | |
> */ | |
> //#define FAN_KICKSTART_TIME 100 // (ms) | |
> //#define FAN_KICKSTART_POWER 180 // 64-255 | |
634d644 | |
< //#define E0_AUTO_FAN_PIN -1 | |
872,873c882 | |
< //#define HOMING_BUMP_MM { 5, 5, 2 } // (linear=mm, rotational=°) Backoff from endstops after first bump | |
< #define HOMING_BUMP_MM { 0, 0, 0 } // (linear=mm, rotational=°) Backoff from endstops after first bump | |
--- | |
> #define HOMING_BUMP_MM { 5, 5, 2 } // (linear=mm, rotational=°) Backoff from endstops after first bump | |
876a886 | |
> //#define XY_COUNTERPART_BACKOFF_MM 0 // (mm) Backoff X after homing Y, and vice-versa | |
1052a1063,1099 | |
> /** | |
> * Input Shaping -- EXPERIMENTAL | |
> * | |
> * Zero Vibration (ZV) Input Shaping for X and/or Y movements. | |
> * | |
> * This option uses a lot of SRAM for the step buffer. The buffer size is | |
> * calculated automatically from SHAPING_FREQ_[XY], DEFAULT_AXIS_STEPS_PER_UNIT, | |
> * DEFAULT_MAX_FEEDRATE and ADAPTIVE_STEP_SMOOTHING. The default calculation can | |
> * be overridden by setting SHAPING_MIN_FREQ and/or SHAPING_MAX_FEEDRATE. | |
> * The higher the frequency and the lower the feedrate, the smaller the buffer. | |
> * If the buffer is too small at runtime, input shaping will have reduced | |
> * effectiveness during high speed movements. | |
> * | |
> * Tune with M593 D<factor> F<frequency>: | |
> * | |
> * D<factor> Set the zeta/damping factor. If axes (X, Y, etc.) are not specified, set for all axes. | |
> * F<frequency> Set the frequency. If axes (X, Y, etc.) are not specified, set for all axes. | |
> * T[map] Input Shaping type, 0:ZV, 1:EI, 2:2H EI (not implemented yet) | |
> * X<1> Set the given parameters only for the X axis. | |
> * Y<1> Set the given parameters only for the Y axis. | |
> */ | |
> //#define INPUT_SHAPING_X | |
> //#define INPUT_SHAPING_Y | |
> #if EITHER(INPUT_SHAPING_X, INPUT_SHAPING_Y) | |
> #if ENABLED(INPUT_SHAPING_X) | |
> #define SHAPING_FREQ_X 40 // (Hz) The default dominant resonant frequency on the X axis. | |
> #define SHAPING_ZETA_X 0.15f // Damping ratio of the X axis (range: 0.0 = no damping to 1.0 = critical damping). | |
> #endif | |
> #if ENABLED(INPUT_SHAPING_Y) | |
> #define SHAPING_FREQ_Y 40 // (Hz) The default dominant resonant frequency on the Y axis. | |
> #define SHAPING_ZETA_Y 0.15f // Damping ratio of the Y axis (range: 0.0 = no damping to 1.0 = critical damping). | |
> #endif | |
> //#define SHAPING_MIN_FREQ 20 // By default the minimum of the shaping frequencies. Override to affect SRAM usage. | |
> //#define SHAPING_MAX_STEPRATE 10000 // By default the maximum total step rate of the shaped axes. Override to affect SRAM usage. | |
> //#define SHAPING_MENU // Add a menu to the LCD to set shaping parameters. | |
> #endif | |
> | |
1088,1089c1135,1136 | |
< #define DEFAULT_MINIMUMFEEDRATE 0.0 // (mm/s) Minimum feedrate. Set with M205 S. | |
< #define DEFAULT_MINTRAVELFEEDRATE 0.0 // (mm/s) Minimum travel feedrate. Set with M205 T. | |
--- | |
> #define DEFAULT_MINIMUMFEEDRATE 0.0 // (mm/s. °/s for rotational-only moves) Minimum feedrate. Set with M205 S. | |
> #define DEFAULT_MINTRAVELFEEDRATE 0.0 // (mm/s. °/s for rotational-only moves) Minimum travel feedrate. Set with M205 T. | |
1154c1201 | |
< * Automatic backlash, position and hotend offset calibration | |
--- | |
> * Automatic backlash, position, and hotend offset calibration | |
1328c1375 | |
< //#define LCD_BACKLIGHT_TIMEOUT 30 // (s) Timeout before turning off the backlight | |
--- | |
> //#define LCD_BACKLIGHT_TIMEOUT_MINS 1 // (minutes) Timeout before turning off the backlight | |
1405,1407d1451 | |
< // Add an 'M73' G-code to set the current percentage | |
< //#define LCD_SET_PROGRESS_MANUALLY | |
< | |
1428,1433c1472,1477 | |
< #define NEO2_USER_PRESET_RED 255 // User defined RED value | |
< #define NEO2_USER_PRESET_GREEN 128 // User defined GREEN value | |
< #define NEO2_USER_PRESET_BLUE 0 // User defined BLUE value | |
< #define NEO2_USER_PRESET_WHITE 255 // User defined WHITE value | |
< #define NEO2_USER_PRESET_BRIGHTNESS 255 // User defined intensity | |
< //#define NEO2_USER_PRESET_STARTUP // Have the printer display the user preset color on startup for the second strip | |
--- | |
> #define NEO2_USER_PRESET_RED 255 // User defined RED value | |
> #define NEO2_USER_PRESET_GREEN 128 // User defined GREEN value | |
> #define NEO2_USER_PRESET_BLUE 0 // User defined BLUE value | |
> #define NEO2_USER_PRESET_WHITE 255 // User defined WHITE value | |
> #define NEO2_USER_PRESET_BRIGHTNESS 255 // User defined intensity | |
> //#define NEO2_USER_PRESET_STARTUP // Have the printer display the user preset color on startup for the second strip | |
1437,1446c1481,1491 | |
< #endif | |
< | |
< // LCD Print Progress options | |
< #if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY) | |
< #if CAN_SHOW_REMAINING_TIME | |
< #define SHOW_REMAINING_TIME // Display estimated time to completion | |
< #if ENABLED(SHOW_REMAINING_TIME) | |
< //#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation | |
< #define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time | |
< #endif | |
--- | |
> #endif // HAS_DISPLAY || DWIN_LCD_PROUI | |
> | |
> // Add 'M73' to set print job progress, overrides Marlin's built-in estimate | |
> //#define SET_PROGRESS_MANUALLY | |
> #if ENABLED(SET_PROGRESS_MANUALLY) | |
> #define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done | |
> #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time | |
> //#define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction | |
> //#define M73_REPORT // Report M73 values to host | |
> #if BOTH(M73_REPORT, SDSUPPORT) | |
> #define M73_REPORT_SD_ONLY // Report only when printing from SD | |
1447a1493 | |
> #endif | |
1449,1450c1495,1501 | |
< #if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI) | |
< //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits | |
--- | |
> // LCD Print Progress options. Multiple times may be displayed in turn. | |
> #if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) | |
> #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) | |
> #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') | |
> //#define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') | |
> #if ENABLED(SET_INTERACTION_TIME) | |
> #define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change) | |
1451a1503 | |
> //#define PRINT_PROGRESS_SHOW_DECIMALS // Show/report progress with decimal digits, not all UIs support this | |
1458c1510 | |
< #define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever) | |
--- | |
> #define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever) | |
1584a1637 | |
> //#define M20_TIMESTAMP_SUPPORT // Include timestamps by adding the 'T' flag to M20 commands | |
1747c1800 | |
< //#define DISPLAY_SLEEP_MINUTES 2 // (minutes) Timeout before turning off the screen | |
--- | |
> //#define DISPLAY_SLEEP_MINUTES 2 // (minutes) Timeout before turning off the screen. Set with M255 S. | |
1801,1808c1854,1855 | |
< // Show SD percentage next to the progress bar | |
< //#define SHOW_SD_PERCENT | |
< | |
< // Enable to save many cycles by drawing a hollow frame on Menu Screens | |
< #define MENU_HOLLOW_FRAME | |
< | |
< // Swap the CW/CCW indicators in the graphics overlay | |
< //#define OVERLAY_GFX_REVERSE | |
--- | |
> #define MENU_HOLLOW_FRAME // Enable to save many cycles by drawing a hollow frame on Menu Screens | |
> //#define OVERLAY_GFX_REVERSE // Swap the CW/CCW indicators in the graphics overlay | |
2066,2070c2113,2122 | |
< //#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 LA_DEBUG // If enabled, this will generate debug information output over USB. | |
< //#define EXPERIMENTAL_SCURVE // Enable this option to permit S-Curve Acceleration | |
< //#define ALLOW_LOW_EJERK // Allow a DEFAULT_EJERK value of <10. Recommended for direct drive hotends. | |
--- | |
> #if ENABLED(DISTINCT_E_FACTORS) | |
> #define ADVANCE_K { 0.22 } // (mm) Compression length per 1mm/s extruder speed, per extruder | |
> #else | |
> #define ADVANCE_K 0.22 // (mm) Compression length applying to all extruders | |
> #endif | |
> //#define ADVANCE_K_EXTRA // Add a second linear advance constant, configurable with M900 L. | |
> //#define LA_DEBUG // Print debug information to serial during operation. Disable for production use. | |
> //#define EXPERIMENTAL_SCURVE // Allow S-Curve Acceleration to be used with LA. | |
> //#define ALLOW_LOW_EJERK // Allow a DEFAULT_EJERK value of <10. Recommended for direct drive hotends. | |
> //#define EXPERIMENTAL_I2S_LA // Allow I2S_STEPPER_STREAM to be used with LA. Performance degrades as the LA step rate reaches ~20kHz. | |
2528c2580 | |
< #define TOOLCHANGE_FS_WIPE_RETRACT 0 // (mm) Retract before cooling for less stringing, better wipe, etc. | |
--- | |
> #define TOOLCHANGE_FS_WIPE_RETRACT 0 // (mm) Cutting retraction out of park, for less stringing, better wipe, etc. Adjust with LCD or M217 G. | |
2634,2775c2686 | |
< /** | |
< * TMC26X Stepper Driver options | |
< * | |
< * The TMC26XStepper library is required for this stepper driver. | |
< * https://github.com/trinamic/TMC26XStepper | |
< * @section tmc/tmc26x | |
< */ | |
< #if HAS_DRIVER(TMC26X) | |
< | |
< #if AXIS_DRIVER_TYPE_X(TMC26X) | |
< #define X_MAX_CURRENT 1000 // (mA) | |
< #define X_SENSE_RESISTOR 91 // (mOhms) | |
< #define X_MICROSTEPS 16 // Number of microsteps | |
< #endif | |
< | |
< #if AXIS_DRIVER_TYPE_X2(TMC26X) | |
< #define X2_MAX_CURRENT 1000 | |
< #define X2_SENSE_RESISTOR 91 | |
< #define X2_MICROSTEPS X_MICROSTEPS | |
< #endif | |
< | |
< #if AXIS_DRIVER_TYPE_Y(TMC26X) | |
< #define Y_MAX_CURRENT 1000 | |
< #define Y_SENSE_RESISTOR 91 | |
< #define Y_MICROSTEPS 16 | |
< #endif | |
< | |
< #if AXIS_DRIVER_TYPE_Y2(TMC26X) | |
< #define Y2_MAX_CURRENT 1000 | |
< #define Y2_SENSE_RESISTOR 91 | |
< #define Y2_MICROSTEPS Y_MICROSTEPS | |
< #endif | |
< | |
< #if AXIS_DRIVER_TYPE_Z(TMC26X) | |
< #define Z_MAX_CURRENT 1000 | |
< #define Z_SENSE_RESISTOR 91 | |
< #define Z_MICROSTEPS 16 | |
< #endif | |
< | |
< #if AXIS_DRIVER_TYPE_Z2(TMC26X) | |
< #define Z2_MAX_CURRENT 1000 | |
< #define Z2_SENSE_RESISTOR 91 | |
< #define Z2_MICROSTEPS Z_MICROSTEPS | |
< #endif | |
< | |
< #if AXIS_DRIVER_TYPE_Z3(TMC26X) | |
< #define Z3_MAX_CURRENT 1000 | |
< #define Z3_SENSE_RESISTOR 91 | |
< #define Z3_MICROSTEPS Z_MICROSTEPS | |
< #endif | |
< | |
< #if AXIS_DRIVER_TYPE_Z4(TMC26X) | |
< #define Z4_MAX_CURRENT 1000 | |
< #define Z4_SENSE_RESISTOR 91 | |
< #define Z4_MICROSTEPS Z_MICROSTEPS | |
< #endif | |
< | |
< #if AXIS_DRIVER_TYPE_I(TMC26X) | |
< #define I_MAX_CURRENT 1000 | |
< #define I_SENSE_RESISTOR 91 | |
< #define I_MICROSTEPS 16 | |
< #endif | |
< | |
< #if AXIS_DRIVER_TYPE_J(TMC26X) | |
< #define J_MAX_CURRENT 1000 | |
< #define J_SENSE_RESISTOR 91 | |
< #define J_MICROSTEPS 16 | |
< #endif | |
< | |
< #if AXIS_DRIVER_TYPE_K(TMC26X) | |
< #define K_MAX_CURRENT 1000 | |
< #define K_SENSE_RESISTOR 91 | |
< #define K_MICROSTEPS 16 | |
< #endif | |
< | |
< #if AXIS_DRIVER_TYPE_U(TMC26X) | |
< #define U_MAX_CURRENT 1000 | |
< #define U_SENSE_RESISTOR 91 | |
< #define U_MICROSTEPS 16 | |
< #endif | |
< | |
< #if AXIS_DRIVER_TYPE_V(TMC26X) | |
< #define V_MAX_CURRENT 1000 | |
< #define V_SENSE_RESISTOR 91 | |
< #define V_MICROSTEPS 16 | |
< #endif | |
< | |
< #if AXIS_DRIVER_TYPE_W(TMC26X) | |
< #define W_MAX_CURRENT 1000 | |
< #define W_SENSE_RESISTOR 91 | |
< #define W_MICROSTEPS 16 | |
< #endif | |
< | |
< #if AXIS_DRIVER_TYPE_E0(TMC26X) | |
< #define E0_MAX_CURRENT 1000 | |
< #define E0_SENSE_RESISTOR 91 | |
< #define E0_MICROSTEPS 16 | |
< #endif | |
< | |
< #if AXIS_DRIVER_TYPE_E1(TMC26X) | |
< #define E1_MAX_CURRENT 1000 | |
< #define E1_SENSE_RESISTOR 91 | |
< #define E1_MICROSTEPS E0_MICROSTEPS | |
< #endif | |
< | |
< #if AXIS_DRIVER_TYPE_E2(TMC26X) | |
< #define E2_MAX_CURRENT 1000 | |
< #define E2_SENSE_RESISTOR 91 | |
< #define E2_MICROSTEPS E0_MICROSTEPS | |
< #endif | |
< | |
< #if AXIS_DRIVER_TYPE_E3(TMC26X) | |
< #define E3_MAX_CURRENT 1000 | |
< #define E3_SENSE_RESISTOR 91 | |
< #define E3_MICROSTEPS E0_MICROSTEPS | |
< #endif | |
< | |
< #if AXIS_DRIVER_TYPE_E4(TMC26X) | |
< #define E4_MAX_CURRENT 1000 | |
< #define E4_SENSE_RESISTOR 91 | |
< #define E4_MICROSTEPS E0_MICROSTEPS | |
< #endif | |
< | |
< #if AXIS_DRIVER_TYPE_E5(TMC26X) | |
< #define E5_MAX_CURRENT 1000 | |
< #define E5_SENSE_RESISTOR 91 | |
< #define E5_MICROSTEPS E0_MICROSTEPS | |
< #endif | |
< | |
< #if AXIS_DRIVER_TYPE_E6(TMC26X) | |
< #define E6_MAX_CURRENT 1000 | |
< #define E6_SENSE_RESISTOR 91 | |
< #define E6_MICROSTEPS E0_MICROSTEPS | |
< #endif | |
< | |
< #if AXIS_DRIVER_TYPE_E7(TMC26X) | |
< #define E7_MAX_CURRENT 1000 | |
< #define E7_SENSE_RESISTOR 91 | |
< #define E7_MICROSTEPS E0_MICROSTEPS | |
< #endif | |
< | |
< #endif // TMC26X | |
--- | |
> // @section tmc_smart | |
2778,2782c2689,2696 | |
< * To use TMC2130, TMC2160, TMC2660, TMC5130, TMC5160 stepper drivers in SPI mode | |
< * connect your SPI pins to the hardware SPI interface on your board and define | |
< * the required CS pins in your `pins_MYBOARD.h` file. (e.g., RAMPS 1.4 uses AUX3 | |
< * pins `X_CS_PIN 53`, `Y_CS_PIN 49`, etc.). | |
< * You may also use software SPI if you wish to use general purpose IO pins. | |
--- | |
> * Trinamic Smart Drivers | |
> * | |
> * To use TMC2130, TMC2160, TMC2660, TMC5130, TMC5160 stepper drivers in SPI mode: | |
> * - Connect your SPI pins to the Hardware SPI interface on the board. | |
> * Some boards have simple jumper connections! See your board's documentation. | |
> * - Define the required Stepper CS pins in your `pins_MYBOARD.h` file. | |
> * (See the RAMPS pins, for example.) | |
> * - You can also use Software SPI with GPIO pins instead of Hardware SPI. | |
2784,2788c2698,2708 | |
< * To use TMC2208 stepper UART-configurable stepper drivers connect #_SERIAL_TX_PIN | |
< * to the driver side PDN_UART pin with a 1K resistor. | |
< * To use the reading capabilities, also connect #_SERIAL_RX_PIN to PDN_UART without | |
< * a resistor. | |
< * The drivers can also be used with hardware serial. | |
--- | |
> * To use TMC220x stepper drivers with Serial UART: | |
> * - Connect PDN_UART to the #_SERIAL_TX_PIN through a 1K resistor. | |
> * For reading capabilities also connect PDN_UART to #_SERIAL_RX_PIN with no resistor. | |
> * Some boards have simple jumper connections! See your board's documentation. | |
> * - These drivers can also be used with Hardware Serial. | |
> * | |
> * The TMC26XStepper library is required for TMC26X stepper drivers. | |
> * https://github.com/MarlinFirmware/TMC26XStepper | |
> * | |
> * The TMCStepper library is required for other TMC stepper drivers. | |
> * https://github.com/teemuatlut/TMCStepper | |
2790,2791d2709 | |
< * TMCStepper library is required to use TMC stepper drivers. | |
< * https://github.com/teemuatlut/TMCStepper | |
2794c2712 | |
< #if HAS_TRINAMIC_CONFIG | |
--- | |
> #if HAS_TRINAMIC_CONFIG || HAS_TMC26X | |
2804c2722 | |
< #if AXIS_IS_TMC(X) | |
--- | |
> #if AXIS_IS_TMC_CONFIG(X) | |
2808c2726 | |
< #define X_RSENSE 0.11 | |
--- | |
> #define X_RSENSE 0.11 // Multiplied x1000 for TMC26X | |
2814c2732 | |
< #if AXIS_IS_TMC(X2) | |
--- | |
> #if AXIS_IS_TMC_CONFIG(X2) | |
2824c2742 | |
< #if AXIS_IS_TMC(Y) | |
--- | |
> #if AXIS_IS_TMC_CONFIG(Y) | |
2834c2752 | |
< #if AXIS_IS_TMC(Y2) | |
--- | |
> #if AXIS_IS_TMC_CONFIG(Y2) | |
2844c2762 | |
< #if AXIS_IS_TMC(Z) | |
--- | |
> #if AXIS_IS_TMC_CONFIG(Z) | |
2854c2772 | |
< #if AXIS_IS_TMC(Z2) | |
--- | |
> #if AXIS_IS_TMC_CONFIG(Z2) | |
2864c2782 | |
< #if AXIS_IS_TMC(Z3) | |
--- | |
> #if AXIS_IS_TMC_CONFIG(Z3) | |
2874c2792 | |
< #if AXIS_IS_TMC(Z4) | |
--- | |
> #if AXIS_IS_TMC_CONFIG(Z4) | |
2884c2802 | |
< #if AXIS_IS_TMC(I) | |
--- | |
> #if AXIS_IS_TMC_CONFIG(I) | |
2894c2812 | |
< #if AXIS_IS_TMC(J) | |
--- | |
> #if AXIS_IS_TMC_CONFIG(J) | |
2904c2822 | |
< #if AXIS_IS_TMC(K) | |
--- | |
> #if AXIS_IS_TMC_CONFIG(K) | |
2914c2832 | |
< #if AXIS_IS_TMC(U) | |
--- | |
> #if AXIS_IS_TMC_CONFIG(U) | |
2924c2842 | |
< #if AXIS_IS_TMC(V) | |
--- | |
> #if AXIS_IS_TMC_CONFIG(V) | |
2934c2852 | |
< #if AXIS_IS_TMC(W) | |
--- | |
> #if AXIS_IS_TMC_CONFIG(W) | |
2944c2862 | |
< #if AXIS_IS_TMC(E0) | |
--- | |
> #if AXIS_IS_TMC_CONFIG(E0) | |
2953c2871 | |
< #if AXIS_IS_TMC(E1) | |
--- | |
> #if AXIS_IS_TMC_CONFIG(E1) | |
2962c2880 | |
< #if AXIS_IS_TMC(E2) | |
--- | |
> #if AXIS_IS_TMC_CONFIG(E2) | |
2971c2889 | |
< #if AXIS_IS_TMC(E3) | |
--- | |
> #if AXIS_IS_TMC_CONFIG(E3) | |
2980c2898 | |
< #if AXIS_IS_TMC(E4) | |
--- | |
> #if AXIS_IS_TMC_CONFIG(E4) | |
2989c2907 | |
< #if AXIS_IS_TMC(E5) | |
--- | |
> #if AXIS_IS_TMC_CONFIG(E5) | |
2998c2916 | |
< #if AXIS_IS_TMC(E6) | |
--- | |
> #if AXIS_IS_TMC_CONFIG(E6) | |
3007c2925 | |
< #if AXIS_IS_TMC(E7) | |
--- | |
> #if AXIS_IS_TMC_CONFIG(E7) | |
3100c3018 | |
< //#define SOFTWARE_DRIVER_ENABLE | |
--- | |
> #define SOFTWARE_DRIVER_ENABLE | |
3109,3117c3027,3037 | |
< #define STEALTHCHOP_XY | |
< #define STEALTHCHOP_Z | |
< #define STEALTHCHOP_I | |
< #define STEALTHCHOP_J | |
< #define STEALTHCHOP_K | |
< #define STEALTHCHOP_U | |
< #define STEALTHCHOP_V | |
< #define STEALTHCHOP_W | |
< #define STEALTHCHOP_E | |
--- | |
> #if HAS_STEALTHCHOP | |
> #define STEALTHCHOP_XY | |
> #define STEALTHCHOP_Z | |
> #define STEALTHCHOP_I | |
> #define STEALTHCHOP_J | |
> #define STEALTHCHOP_K | |
> #define STEALTHCHOP_U | |
> #define STEALTHCHOP_V | |
> #define STEALTHCHOP_W | |
> #define STEALTHCHOP_E | |
> #endif | |
3204c3124 | |
< #define E0_HYBRID_THRESHOLD 27 | |
--- | |
> #define E0_HYBRID_THRESHOLD 30 | |
3300c3220 | |
< #endif // HAS_TRINAMIC_CONFIG | |
--- | |
> #endif // HAS_TRINAMIC_CONFIG || HAS_TMC26X | |
3538d3457 | |
< | |
4063c3982 | |
< * Modern replacement for the Prusa TMC_Z_CALIBRATION. | |
--- | |
> * Modern replacement for the Průša TMC_Z_CALIBRATION. | |
4154c4073 | |
< //#define WIFISUPPORT // Marlin embedded WiFi managenent | |
--- | |
> //#define WIFISUPPORT // Marlin embedded WiFi management |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment