Compare commits
46 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 611587ef2b | |||
| 499649cf31 | |||
| e41ea19899 | |||
| 5dc5d42e25 | |||
| c57876a5ec | |||
| a5fbcd7a4c | |||
| fb6c6d164d | |||
| 56013e2b70 | |||
| 947c727b56 | |||
| 81860e9deb | |||
| aa19345c91 | |||
| 7124b2164d | |||
| efc19260a7 | |||
| d37bfa3b4e | |||
| 129b1bb8d4 | |||
| 8dbbcfd382 | |||
| fa48fbb9b8 | |||
| d6e767e36b | |||
| b29aae6c0c | |||
| 1955eea1b8 | |||
| 42fa9fc570 | |||
| 130d0395d0 | |||
| c5f1ff9ee1 | |||
| 089cc68a04 | |||
| 2b759b9e8d | |||
| 5f27f7de47 | |||
| 282f4678cd | |||
| c41f3f8582 | |||
| 8670df08a2 | |||
| 730690ea03 | |||
| 3543873da7 | |||
| c505626c42 | |||
| 7e8505fc11 | |||
| f9aec2685c | |||
| dd6a7ca197 | |||
| 62b9d7dc73 | |||
| d83382eb55 | |||
| 4c76314c26 | |||
| 64ab254f26 | |||
| e6a7be922b | |||
| 1525c2530e | |||
| 016e4c0193 | |||
| be642610ae | |||
| ee17051933 | |||
| 0673f335e1 | |||
| ac7ee4b94a |
@@ -0,0 +1,43 @@
|
|||||||
|
---
|
||||||
|
name: Bug report
|
||||||
|
about: Report a bug in Marlin
|
||||||
|
title: "[BUG] (short description)"
|
||||||
|
labels: ''
|
||||||
|
assignees: ''
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
<!--
|
||||||
|
|
||||||
|
Have you read Marlin's Code of Conduct? By filing an Issue, you are expected to comply with it, including treating everyone with respect: https://github.com/MarlinFirmware/Marlin/blob/master/.github/code_of_conduct.md
|
||||||
|
|
||||||
|
Do you want to ask a question? Are you looking for support? Please don't post here. Instead please use one of the support links at https://github.com/MarlinFirmware/Marlin/issues/new/choose
|
||||||
|
|
||||||
|
Before filing an issue be sure to test the "bugfix" branches to see whether the issue has been resolved.
|
||||||
|
|
||||||
|
-->
|
||||||
|
|
||||||
|
### Bug Description
|
||||||
|
|
||||||
|
<!-- Description of the bug -->
|
||||||
|
|
||||||
|
### My Configurations
|
||||||
|
|
||||||
|
**Required:** Please include a ZIP file containing your `Configuration.h` and `Configuration_adv.h` files.
|
||||||
|
|
||||||
|
### Steps to Reproduce
|
||||||
|
|
||||||
|
<!-- Please describe the steps needed to reproduce the issue -->
|
||||||
|
|
||||||
|
1. [First Step]
|
||||||
|
2. [Second Step]
|
||||||
|
3. [and so on...]
|
||||||
|
|
||||||
|
**Expected behavior:** [What you expect to happen]
|
||||||
|
|
||||||
|
**Actual behavior:** [What actually happens]
|
||||||
|
|
||||||
|
#### Additional Information
|
||||||
|
|
||||||
|
* Provide pictures or links to videos that clearly demonstrate the issue.
|
||||||
|
* See [How Can I Contribute](#how-can-i-contribute) for additional guidelines.
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
blank_issues_enabled: false
|
||||||
|
contact_links:
|
||||||
|
- name: Marlin Documentation
|
||||||
|
url: http://marlinfw.org/
|
||||||
|
about: Lots of documentation on installing and using Marlin.
|
||||||
|
- name: MarlinFirmware Facebook group
|
||||||
|
url: https://www.facebook.com/groups/1049718498464482
|
||||||
|
about: Please ask and answer questions here.
|
||||||
|
- name: Marlin on Discord
|
||||||
|
url: https://discord.gg/n5NJ59y
|
||||||
|
about: Join the Discord server for support and discussion.
|
||||||
|
- name: Marlin Discussion Forum
|
||||||
|
url: http://forums.reprap.org/list.php?415
|
||||||
|
about: A searchable web forum hosted by RepRap dot org.
|
||||||
|
- name: Marlin Videos on YouTube
|
||||||
|
url: https://www.youtube.com/results?search_query=marlin+firmware
|
||||||
|
about: Tutorials and more from Marlin users all around the world. Great for new users!
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
---
|
||||||
|
name: Feature request
|
||||||
|
about: Request a Feature
|
||||||
|
title: "[FR] (feature request title)"
|
||||||
|
labels: ''
|
||||||
|
assignees: ''
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
<!--
|
||||||
|
|
||||||
|
Have you read Marlin's Code of Conduct? By filing an Issue, you are expected to comply with it, including treating everyone with respect: https://github.com/MarlinFirmware/Marlin/blob/master/.github/code_of_conduct.md
|
||||||
|
|
||||||
|
Do you want to ask a question? Are you looking for support? Please don't post here. Instead please use one of the support links at https://github.com/MarlinFirmware/Marlin/issues/new/choose
|
||||||
|
|
||||||
|
Before filing an issue be sure to test the "bugfix" branches to see whether the issue has been resolved.
|
||||||
|
|
||||||
|
-->
|
||||||
|
|
||||||
|
### Description
|
||||||
|
|
||||||
|
<!-- Description of the requested feature -->
|
||||||
|
|
||||||
|
### Feature Workflow
|
||||||
|
|
||||||
|
<!-- Please describe the feature's behavior, user interaction, etc. -->
|
||||||
|
|
||||||
|
1. [First Action]
|
||||||
|
2. [Second Action]
|
||||||
|
3. [and so on...]
|
||||||
|
|
||||||
|
#### Additional Information
|
||||||
|
|
||||||
|
* Provide pictures or links that demonstrate a similar feature or concept.
|
||||||
|
* See [How Can I Contribute](#how-can-i-contribute) for additional guidelines.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
Thanks for your contribution! Unfortunately we can't accept PRs directed at release branches. We make patches to the bugfix branches and only later do we push them out as releases.
|
||||||
|
|
||||||
|
Please redo this PR starting with the `bugfix-2.0.x` branch and be careful to target `bugfix-2.0.x` when resubmitting the PR.
|
||||||
|
|
||||||
|
It may help to set your fork's default branch to `bugfix-2.0.x`.
|
||||||
|
|
||||||
|
See [this page](http://marlinfw.org/docs/development/getting_started_pull_requests.html) for full instructions.
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
#
|
||||||
|
# bump-date.yml
|
||||||
|
# Bump the distribution date once per day
|
||||||
|
#
|
||||||
|
|
||||||
|
name: Bump Distribution Date
|
||||||
|
|
||||||
|
on:
|
||||||
|
schedule:
|
||||||
|
- cron: '0 0 * * *'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
bump_date:
|
||||||
|
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
|
||||||
|
- name: Check out bugfix-2.0.x
|
||||||
|
uses: actions/checkout@v2
|
||||||
|
with:
|
||||||
|
ref: bugfix-2.0.x
|
||||||
|
|
||||||
|
- name: Bump Distribution Date
|
||||||
|
run: |
|
||||||
|
# Inline Bump Script
|
||||||
|
[[ "$GITHUB_REPOSITORY" == "MarlinFirmware/Marlin" ]] || exit 0
|
||||||
|
DIST=$( date +"%Y-%m-%d" )
|
||||||
|
eval "sed -E -i 's/(#define +STRING_DISTRIBUTION_DATE) .*$/\1 \"$DIST\"/g' Marlin/src/inc/Version.h" && \
|
||||||
|
git config user.name "${GITHUB_ACTOR}" && \
|
||||||
|
git config user.email "${GITHUB_ACTOR}@users.noreply.github.com" && \
|
||||||
|
git add . && \
|
||||||
|
git commit -m "[cron] Bump distribution date ($DIST)" && \
|
||||||
|
git push
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
#
|
||||||
|
# comment-pr.yml
|
||||||
|
# Add a comment to any PR directed to a release branch
|
||||||
|
#
|
||||||
|
|
||||||
|
name: PR Bad Target
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
branches:
|
||||||
|
- 1.0.x
|
||||||
|
- 1.1.x
|
||||||
|
- 2.0.x
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
bad_target:
|
||||||
|
|
||||||
|
name: PR Bad Target
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v1
|
||||||
|
- uses: harupy/comment-on-pr@master
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
with:
|
||||||
|
filename: bad-target.md
|
||||||
+52
-50
@@ -69,7 +69,7 @@
|
|||||||
// @section info
|
// @section info
|
||||||
|
|
||||||
// Author info of this build printed to the host during boot and M115
|
// 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 "InsanityAutomation" // Who made the changes.
|
||||||
//#define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes)
|
//#define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -84,7 +84,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
// Show the Marlin bootscreen on startup. ** ENABLE FOR PRODUCTION **
|
// Show the Marlin bootscreen on startup. ** ENABLE FOR PRODUCTION **
|
||||||
#define SHOW_BOOTSCREEN
|
//#define SHOW_BOOTSCREEN
|
||||||
|
|
||||||
// Show the bitmap in Marlin/_Bootscreen.h on startup.
|
// Show the bitmap in Marlin/_Bootscreen.h on startup.
|
||||||
//#define SHOW_CUSTOM_BOOTSCREEN
|
//#define SHOW_CUSTOM_BOOTSCREEN
|
||||||
@@ -139,11 +139,11 @@
|
|||||||
|
|
||||||
// Choose the name from boards.h that matches your setup
|
// Choose the name from boards.h that matches your setup
|
||||||
#ifndef MOTHERBOARD
|
#ifndef MOTHERBOARD
|
||||||
#define MOTHERBOARD BOARD_RAMPS_14_EFB
|
#define MOTHERBOARD BOARD_ANET_10
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Name displayed in the LCD "Ready" message and Info menu
|
// Name displayed in the LCD "Ready" message and Info menu
|
||||||
//#define CUSTOM_MACHINE_NAME "3D Printer"
|
#define CUSTOM_MACHINE_NAME "AnetE16V1.3"
|
||||||
|
|
||||||
// Printer's unique ID, used by some programs to differentiate between machines.
|
// 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
|
// Choose your own or use a service like https://www.uuidgenerator.net/version4
|
||||||
@@ -486,7 +486,7 @@
|
|||||||
* 999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.
|
* 999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
#define TEMP_SENSOR_0 1
|
#define TEMP_SENSOR_0 5
|
||||||
#define TEMP_SENSOR_1 0
|
#define TEMP_SENSOR_1 0
|
||||||
#define TEMP_SENSOR_2 0
|
#define TEMP_SENSOR_2 0
|
||||||
#define TEMP_SENSOR_3 0
|
#define TEMP_SENSOR_3 0
|
||||||
@@ -494,7 +494,7 @@
|
|||||||
#define TEMP_SENSOR_5 0
|
#define TEMP_SENSOR_5 0
|
||||||
#define TEMP_SENSOR_6 0
|
#define TEMP_SENSOR_6 0
|
||||||
#define TEMP_SENSOR_7 0
|
#define TEMP_SENSOR_7 0
|
||||||
#define TEMP_SENSOR_BED 0
|
#define TEMP_SENSOR_BED 5
|
||||||
#define TEMP_SENSOR_PROBE 0
|
#define TEMP_SENSOR_PROBE 0
|
||||||
#define TEMP_SENSOR_CHAMBER 0
|
#define TEMP_SENSOR_CHAMBER 0
|
||||||
#define TEMP_SENSOR_COOLER 0
|
#define TEMP_SENSOR_COOLER 0
|
||||||
@@ -555,7 +555,7 @@
|
|||||||
// Above this temperature the heater will be switched off.
|
// Above this temperature the heater will be switched off.
|
||||||
// This can protect components from overheating, but NOT from shorts and failures.
|
// This can protect components from overheating, but NOT from shorts and failures.
|
||||||
// (Use MINTEMP for thermistor short/failure protection.)
|
// (Use MINTEMP for thermistor short/failure protection.)
|
||||||
#define HEATER_0_MAXTEMP 275
|
#define HEATER_0_MAXTEMP 305
|
||||||
#define HEATER_1_MAXTEMP 275
|
#define HEATER_1_MAXTEMP 275
|
||||||
#define HEATER_2_MAXTEMP 275
|
#define HEATER_2_MAXTEMP 275
|
||||||
#define HEATER_3_MAXTEMP 275
|
#define HEATER_3_MAXTEMP 275
|
||||||
@@ -563,7 +563,7 @@
|
|||||||
#define HEATER_5_MAXTEMP 275
|
#define HEATER_5_MAXTEMP 275
|
||||||
#define HEATER_6_MAXTEMP 275
|
#define HEATER_6_MAXTEMP 275
|
||||||
#define HEATER_7_MAXTEMP 275
|
#define HEATER_7_MAXTEMP 275
|
||||||
#define BED_MAXTEMP 150
|
#define BED_MAXTEMP 120
|
||||||
#define CHAMBER_MAXTEMP 60
|
#define CHAMBER_MAXTEMP 60
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -600,9 +600,11 @@
|
|||||||
#define DEFAULT_Ki_LIST { 1.08, 1.08 }
|
#define DEFAULT_Ki_LIST { 1.08, 1.08 }
|
||||||
#define DEFAULT_Kd_LIST { 114.00, 114.00 }
|
#define DEFAULT_Kd_LIST { 114.00, 114.00 }
|
||||||
#else
|
#else
|
||||||
#define DEFAULT_Kp 22.20
|
// ANET E16 Standard Extruder at 210 Degree Celsius and 100% Fan
|
||||||
#define DEFAULT_Ki 1.08
|
//(measured after M106 S255 with M303 E0 S210 C8)
|
||||||
#define DEFAULT_Kd 114.00
|
#define DEFAULT_Kp 21.0
|
||||||
|
#define DEFAULT_Ki 1.25
|
||||||
|
#define DEFAULT_Kd 86.0
|
||||||
#endif
|
#endif
|
||||||
#endif // PIDTEMP
|
#endif // PIDTEMP
|
||||||
|
|
||||||
@@ -623,7 +625,7 @@
|
|||||||
* heater. If your configuration is significantly different than this and you don't understand
|
* heater. If your configuration is significantly different than this and you don't understand
|
||||||
* the issues involved, don't use bed PID until someone else verifies that your hardware works.
|
* the issues involved, don't use bed PID until someone else verifies that your hardware works.
|
||||||
*/
|
*/
|
||||||
//#define PIDTEMPBED
|
#define PIDTEMPBED
|
||||||
|
|
||||||
//#define BED_LIMIT_SWITCHING
|
//#define BED_LIMIT_SWITCHING
|
||||||
|
|
||||||
@@ -639,11 +641,11 @@
|
|||||||
//#define MIN_BED_POWER 0
|
//#define MIN_BED_POWER 0
|
||||||
//#define PID_BED_DEBUG // Sends debug data to the serial port.
|
//#define PID_BED_DEBUG // Sends debug data to the serial port.
|
||||||
|
|
||||||
// 120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
|
// ANET E16
|
||||||
// from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
|
// original Bed 4mm glass plate (PID-Autotune: M303 E-1 S60 C5):
|
||||||
#define DEFAULT_bedKp 10.00
|
#define DEFAULT_bedKp 295.00
|
||||||
#define DEFAULT_bedKi .023
|
#define DEFAULT_bedKi 35.65
|
||||||
#define DEFAULT_bedKd 305.4
|
#define DEFAULT_bedKd 610.21
|
||||||
|
|
||||||
// FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles.
|
// FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles.
|
||||||
#endif // PIDTEMPBED
|
#endif // PIDTEMPBED
|
||||||
@@ -818,9 +820,9 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
|
// 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 X_MIN_ENDSTOP_INVERTING true // 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 Y_MIN_ENDSTOP_INVERTING true // 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 Z_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop.
|
||||||
#define I_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
|
#define I_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
|
||||||
#define J_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
|
#define J_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
|
||||||
#define K_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
|
#define K_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
|
||||||
@@ -830,7 +832,7 @@
|
|||||||
#define I_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
|
#define I_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
|
||||||
#define J_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
|
#define J_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
|
||||||
#define K_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
|
#define K_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
|
* Stepper Drivers
|
||||||
@@ -916,14 +918,14 @@
|
|||||||
* Override with M92
|
* Override with M92
|
||||||
* X, Y, Z [, I [, J [, K]]], E0 [, E1[, E2...]]
|
* X, Y, Z [, I [, J [, K]]], E0 [, E1[, E2...]]
|
||||||
*/
|
*/
|
||||||
#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 500 }
|
#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 96 }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Default Max Feed Rate (mm/s)
|
* Default Max Feed Rate (mm/s)
|
||||||
* Override with M203
|
* Override with M203
|
||||||
* X, Y, Z [, I [, J [, K]]], E0 [, E1[, E2...]]
|
* X, Y, Z [, I [, J [, K]]], E0 [, E1[, E2...]]
|
||||||
*/
|
*/
|
||||||
#define DEFAULT_MAX_FEEDRATE { 300, 300, 5, 25 }
|
#define DEFAULT_MAX_FEEDRATE { 300, 300, 50, 25 }
|
||||||
|
|
||||||
//#define LIMITED_MAX_FR_EDITING // Limit edit via M203 or LCD to DEFAULT_MAX_FEEDRATE * 2
|
//#define LIMITED_MAX_FR_EDITING // Limit edit via M203 or LCD to DEFAULT_MAX_FEEDRATE * 2
|
||||||
#if ENABLED(LIMITED_MAX_FR_EDITING)
|
#if ENABLED(LIMITED_MAX_FR_EDITING)
|
||||||
@@ -936,7 +938,7 @@
|
|||||||
* Override with M201
|
* Override with M201
|
||||||
* X, Y, Z [, I [, J [, K]]], E0 [, E1[, E2...]]
|
* X, Y, Z [, I [, J [, K]]], E0 [, E1[, E2...]]
|
||||||
*/
|
*/
|
||||||
#define DEFAULT_MAX_ACCELERATION { 3000, 3000, 100, 10000 }
|
#define DEFAULT_MAX_ACCELERATION { 2000, 2000, 100, 10000 }
|
||||||
|
|
||||||
//#define LIMITED_MAX_ACCEL_EDITING // Limit edit via M201 or LCD to DEFAULT_MAX_ACCELERATION * 2
|
//#define LIMITED_MAX_ACCEL_EDITING // Limit edit via M201 or LCD to DEFAULT_MAX_ACCELERATION * 2
|
||||||
#if ENABLED(LIMITED_MAX_ACCEL_EDITING)
|
#if ENABLED(LIMITED_MAX_ACCEL_EDITING)
|
||||||
@@ -951,9 +953,9 @@
|
|||||||
* M204 R Retract Acceleration
|
* M204 R Retract Acceleration
|
||||||
* M204 T Travel Acceleration
|
* M204 T Travel Acceleration
|
||||||
*/
|
*/
|
||||||
#define DEFAULT_ACCELERATION 3000 // X, Y, Z and E acceleration for printing moves
|
#define DEFAULT_ACCELERATION 1000 // X, Y, Z and E acceleration for printing moves
|
||||||
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
|
#define DEFAULT_RETRACT_ACCELERATION 1000 // E acceleration for retracts
|
||||||
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
|
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Default Jerk limits (mm/s)
|
* Default Jerk limits (mm/s)
|
||||||
@@ -963,7 +965,7 @@
|
|||||||
* When changing speed and direction, if the difference is less than the
|
* When changing speed and direction, if the difference is less than the
|
||||||
* value set here, it may happen instantaneously.
|
* value set here, it may happen instantaneously.
|
||||||
*/
|
*/
|
||||||
//#define CLASSIC_JERK
|
#define CLASSIC_JERK
|
||||||
#if ENABLED(CLASSIC_JERK)
|
#if ENABLED(CLASSIC_JERK)
|
||||||
#define DEFAULT_XJERK 10.0
|
#define DEFAULT_XJERK 10.0
|
||||||
#define DEFAULT_YJERK 10.0
|
#define DEFAULT_YJERK 10.0
|
||||||
@@ -1244,8 +1246,8 @@
|
|||||||
#define Z_PROBE_LOW_POINT -2 // Farthest distance below the trigger-point to go before stopping
|
#define Z_PROBE_LOW_POINT -2 // Farthest distance below the trigger-point to go before stopping
|
||||||
|
|
||||||
// For M851 give a range for adjusting the Z probe offset
|
// For M851 give a range for adjusting the Z probe offset
|
||||||
#define Z_PROBE_OFFSET_RANGE_MIN -20
|
#define Z_PROBE_OFFSET_RANGE_MIN -9
|
||||||
#define Z_PROBE_OFFSET_RANGE_MAX 20
|
#define Z_PROBE_OFFSET_RANGE_MAX 9
|
||||||
|
|
||||||
// Enable the M48 repeatability test to test probe accuracy
|
// Enable the M48 repeatability test to test probe accuracy
|
||||||
//#define Z_MIN_PROBE_REPEATABILITY_TEST
|
//#define Z_MIN_PROBE_REPEATABILITY_TEST
|
||||||
@@ -1312,7 +1314,7 @@
|
|||||||
// Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way.
|
// 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 false
|
||||||
#define INVERT_Y_DIR true
|
#define INVERT_Y_DIR true
|
||||||
#define INVERT_Z_DIR false
|
#define INVERT_Z_DIR true
|
||||||
//#define INVERT_I_DIR false
|
//#define INVERT_I_DIR false
|
||||||
//#define INVERT_J_DIR false
|
//#define INVERT_J_DIR false
|
||||||
//#define INVERT_K_DIR false
|
//#define INVERT_K_DIR false
|
||||||
@@ -1358,16 +1360,16 @@
|
|||||||
// @section machine
|
// @section machine
|
||||||
|
|
||||||
// The size of the printable area
|
// The size of the printable area
|
||||||
#define X_BED_SIZE 200
|
#define X_BED_SIZE 300
|
||||||
#define Y_BED_SIZE 200
|
#define Y_BED_SIZE 300
|
||||||
|
|
||||||
// Travel limits (mm) after homing, corresponding to endstop positions.
|
// Travel limits (mm) after homing, corresponding to endstop positions.
|
||||||
#define X_MIN_POS 0
|
#define X_MIN_POS -2
|
||||||
#define Y_MIN_POS 0
|
#define Y_MIN_POS -23
|
||||||
#define Z_MIN_POS 0
|
#define Z_MIN_POS 0
|
||||||
#define X_MAX_POS X_BED_SIZE
|
#define X_MAX_POS X_BED_SIZE
|
||||||
#define Y_MAX_POS Y_BED_SIZE
|
#define Y_MAX_POS Y_BED_SIZE
|
||||||
#define Z_MAX_POS 200
|
#define Z_MAX_POS 400
|
||||||
//#define I_MIN_POS 0
|
//#define I_MIN_POS 0
|
||||||
//#define I_MAX_POS 50
|
//#define I_MAX_POS 50
|
||||||
//#define J_MIN_POS 0
|
//#define J_MIN_POS 0
|
||||||
@@ -1527,14 +1529,14 @@
|
|||||||
//#define AUTO_BED_LEVELING_LINEAR
|
//#define AUTO_BED_LEVELING_LINEAR
|
||||||
//#define AUTO_BED_LEVELING_BILINEAR
|
//#define AUTO_BED_LEVELING_BILINEAR
|
||||||
//#define AUTO_BED_LEVELING_UBL
|
//#define AUTO_BED_LEVELING_UBL
|
||||||
//#define MESH_BED_LEVELING
|
#define MESH_BED_LEVELING
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Normally G28 leaves leveling disabled on completion. Enable one of
|
* Normally G28 leaves leveling disabled on completion. Enable one of
|
||||||
* these options to restore the prior leveling state or to always enable
|
* these options to restore the prior leveling state or to always enable
|
||||||
* leveling immediately after G28.
|
* leveling immediately after G28.
|
||||||
*/
|
*/
|
||||||
//#define RESTORE_LEVELING_AFTER_G28
|
#define RESTORE_LEVELING_AFTER_G28
|
||||||
//#define ENABLE_LEVELING_AFTER_G28
|
//#define ENABLE_LEVELING_AFTER_G28
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -1562,7 +1564,7 @@
|
|||||||
// Gradually reduce leveling correction until a set height is reached,
|
// Gradually reduce leveling correction until a set height is reached,
|
||||||
// at which point movement will be level to the machine's XY plane.
|
// at which point movement will be level to the machine's XY plane.
|
||||||
// The height can be set with M420 Z<height>
|
// The height can be set with M420 Z<height>
|
||||||
#define ENABLE_LEVELING_FADE_HEIGHT
|
//#define ENABLE_LEVELING_FADE_HEIGHT
|
||||||
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
||||||
#define DEFAULT_LEVELING_FADE_HEIGHT 10.0 // (mm) Default fade height.
|
#define DEFAULT_LEVELING_FADE_HEIGHT 10.0 // (mm) Default fade height.
|
||||||
#endif
|
#endif
|
||||||
@@ -1570,7 +1572,7 @@
|
|||||||
// For Cartesian machines, instead of dividing moves on mesh boundaries,
|
// For Cartesian machines, instead of dividing moves on mesh boundaries,
|
||||||
// split up moves into short segments like a Delta. This follows the
|
// split up moves into short segments like a Delta. This follows the
|
||||||
// contours of the bed more closely than edge-to-edge straight moves.
|
// contours of the bed more closely than edge-to-edge straight moves.
|
||||||
#define SEGMENT_LEVELED_MOVES
|
//#define SEGMENT_LEVELED_MOVES
|
||||||
#define LEVELED_SEGMENT_LENGTH 5.0 // (mm) Length of all segments (except the last one)
|
#define LEVELED_SEGMENT_LENGTH 5.0 // (mm) Length of all segments (except the last one)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -1656,12 +1658,12 @@
|
|||||||
* Add a bed leveling sub-menu for ABL or MBL.
|
* Add a bed leveling sub-menu for ABL or MBL.
|
||||||
* Include a guided procedure if manual probing is enabled.
|
* Include a guided procedure if manual probing is enabled.
|
||||||
*/
|
*/
|
||||||
//#define LCD_BED_LEVELING
|
#define LCD_BED_LEVELING
|
||||||
|
|
||||||
#if ENABLED(LCD_BED_LEVELING)
|
#if ENABLED(LCD_BED_LEVELING)
|
||||||
#define MESH_EDIT_Z_STEP 0.025 // (mm) Step size while manually probing Z axis.
|
#define MESH_EDIT_Z_STEP 0.025 // (mm) Step size while manually probing Z axis.
|
||||||
#define LCD_PROBE_Z_RANGE 4 // (mm) Z Range centered on Z_MIN_POS for LCD Z adjustment
|
#define LCD_PROBE_Z_RANGE 4 // (mm) Z Range centered on Z_MIN_POS for LCD Z adjustment
|
||||||
//#define MESH_EDIT_MENU // Add a menu to edit mesh points
|
#define MESH_EDIT_MENU // Add a menu to edit mesh points
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Add a menu item to move between bed corners for manual bed adjustment
|
// Add a menu item to move between bed corners for manual bed adjustment
|
||||||
@@ -1811,12 +1813,12 @@
|
|||||||
* M501 - Read settings from EEPROM. (i.e., Throw away unsaved changes)
|
* M501 - Read settings from EEPROM. (i.e., Throw away unsaved changes)
|
||||||
* M502 - Revert settings to "factory" defaults. (Follow with M500 to init the EEPROM.)
|
* 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 DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release!
|
||||||
#define EEPROM_CHITCHAT // Give feedback on EEPROM commands. Disable to save PROGMEM.
|
//#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
|
#define EEPROM_BOOT_SILENT // Keep M503 quiet and only give errors during first load
|
||||||
#if ENABLED(EEPROM_SETTINGS)
|
#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
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
@@ -1867,11 +1869,11 @@
|
|||||||
* P1 Raise the nozzle always to Z-park height.
|
* P1 Raise the nozzle always to Z-park height.
|
||||||
* P2 Raise the nozzle by Z-park amount, limited to Z_MAX_POS.
|
* 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)
|
#if ENABLED(NOZZLE_PARK_FEATURE)
|
||||||
// Specify a park position as { X, Y, Z_raise }
|
// Specify a park position as { X, Y, Z_raise }
|
||||||
#define NOZZLE_PARK_POINT { (X_MIN_POS + 10), (Y_MAX_POS - 10), 20 }
|
#define NOZZLE_PARK_POINT { (X_MIN_POS + 10), (Y_MIN_POS + 10), 5 }
|
||||||
//#define NOZZLE_PARK_X_ONLY // X move only is required to park
|
//#define NOZZLE_PARK_X_ONLY // X move only is required to park
|
||||||
//#define NOZZLE_PARK_Y_ONLY // Y move only is required to park
|
//#define NOZZLE_PARK_Y_ONLY // Y move only is required to park
|
||||||
#define NOZZLE_PARK_Z_RAISE_MIN 2 // (mm) Always raise Z by at least this distance
|
#define NOZZLE_PARK_Z_RAISE_MIN 2 // (mm) Always raise Z by at least this distance
|
||||||
@@ -2084,7 +2086,7 @@
|
|||||||
* SD Card support is disabled by default. If your controller has an SD slot,
|
* SD Card support is disabled by default. If your controller has an SD slot,
|
||||||
* you must uncomment the following option or it won't work.
|
* you must uncomment the following option or it won't work.
|
||||||
*/
|
*/
|
||||||
//#define SDSUPPORT
|
#define SDSUPPORT
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* SD CARD: ENABLE CRC
|
* SD CARD: ENABLE CRC
|
||||||
@@ -2100,7 +2102,7 @@
|
|||||||
* just remove some extraneous menu items to recover space.
|
* just remove some extraneous menu items to recover space.
|
||||||
*/
|
*/
|
||||||
//#define NO_LCD_MENUS
|
//#define NO_LCD_MENUS
|
||||||
//#define SLIM_LCD_MENUS
|
#define SLIM_LCD_MENUS
|
||||||
|
|
||||||
//
|
//
|
||||||
// ENCODER SETTINGS
|
// ENCODER SETTINGS
|
||||||
@@ -2343,7 +2345,7 @@
|
|||||||
// RepRapDiscount FULL GRAPHIC Smart Controller
|
// RepRapDiscount FULL GRAPHIC Smart Controller
|
||||||
// https://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
|
// https://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
|
||||||
//
|
//
|
||||||
//#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
|
#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
|
||||||
|
|
||||||
//
|
//
|
||||||
// K.3D Full Graphic Smart Controller
|
// K.3D Full Graphic Smart Controller
|
||||||
|
|||||||
+39
-35
@@ -273,12 +273,12 @@
|
|||||||
* THERMAL_PROTECTION_HYSTERESIS and/or THERMAL_PROTECTION_PERIOD
|
* THERMAL_PROTECTION_HYSTERESIS and/or THERMAL_PROTECTION_PERIOD
|
||||||
*/
|
*/
|
||||||
#if ENABLED(THERMAL_PROTECTION_HOTENDS)
|
#if ENABLED(THERMAL_PROTECTION_HOTENDS)
|
||||||
#define THERMAL_PROTECTION_PERIOD 40 // Seconds
|
#define THERMAL_PROTECTION_PERIOD 20 // Seconds
|
||||||
#define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius
|
#define THERMAL_PROTECTION_HYSTERESIS 12 // Degrees Celsius
|
||||||
|
|
||||||
//#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops
|
#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops
|
||||||
#if BOTH(ADAPTIVE_FAN_SLOWING, PIDTEMP)
|
#if BOTH(ADAPTIVE_FAN_SLOWING, PIDTEMP)
|
||||||
//#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303
|
#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -293,7 +293,7 @@
|
|||||||
* and/or decrease WATCH_TEMP_INCREASE. WATCH_TEMP_INCREASE should not be set
|
* and/or decrease WATCH_TEMP_INCREASE. WATCH_TEMP_INCREASE should not be set
|
||||||
* below 2.
|
* below 2.
|
||||||
*/
|
*/
|
||||||
#define WATCH_TEMP_PERIOD 20 // Seconds
|
#define WATCH_TEMP_PERIOD 40 // Seconds
|
||||||
#define WATCH_TEMP_INCREASE 2 // Degrees Celsius
|
#define WATCH_TEMP_INCREASE 2 // Degrees Celsius
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -301,13 +301,13 @@
|
|||||||
* Thermal Protection parameters for the bed are just as above for hotends.
|
* Thermal Protection parameters for the bed are just as above for hotends.
|
||||||
*/
|
*/
|
||||||
#if ENABLED(THERMAL_PROTECTION_BED)
|
#if ENABLED(THERMAL_PROTECTION_BED)
|
||||||
#define THERMAL_PROTECTION_BED_PERIOD 20 // Seconds
|
#define THERMAL_PROTECTION_BED_PERIOD 40 // Seconds
|
||||||
#define THERMAL_PROTECTION_BED_HYSTERESIS 2 // Degrees Celsius
|
#define THERMAL_PROTECTION_BED_HYSTERESIS 5 // Degrees Celsius
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* As described above, except for the bed (M140/M190/M303).
|
* As described above, except for the bed (M140/M190/M303).
|
||||||
*/
|
*/
|
||||||
#define WATCH_BED_TEMP_PERIOD 60 // Seconds
|
#define WATCH_BED_TEMP_PERIOD 80 // Seconds
|
||||||
#define WATCH_BED_TEMP_INCREASE 2 // Degrees Celsius
|
#define WATCH_BED_TEMP_INCREASE 2 // Degrees Celsius
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -412,7 +412,7 @@
|
|||||||
* Enable Autotemp Mode with M104/M109 F<factor> S<mintemp> B<maxtemp>.
|
* Enable Autotemp Mode with M104/M109 F<factor> S<mintemp> B<maxtemp>.
|
||||||
* Disable by sending M104/M109 with no F parameter (or F0 with AUTOTEMP_PROPORTIONAL).
|
* Disable by sending M104/M109 with no F parameter (or F0 with AUTOTEMP_PROPORTIONAL).
|
||||||
*/
|
*/
|
||||||
#define AUTOTEMP
|
//#define AUTOTEMP
|
||||||
#if ENABLED(AUTOTEMP)
|
#if ENABLED(AUTOTEMP)
|
||||||
#define AUTOTEMP_OLDWEIGHT 0.98
|
#define AUTOTEMP_OLDWEIGHT 0.98
|
||||||
// Turn on AUTOTEMP on M104/M109 by default using proportions set here
|
// Turn on AUTOTEMP on M104/M109 by default using proportions set here
|
||||||
@@ -791,7 +791,7 @@
|
|||||||
|
|
||||||
//#define HOMING_BACKOFF_POST_MM { 2, 2, 2 } // (mm) Backoff from endstops after homing
|
//#define HOMING_BACKOFF_POST_MM { 2, 2, 2 } // (mm) Backoff from endstops after homing
|
||||||
|
|
||||||
//#define QUICK_HOME // If G28 contains XY do a diagonal move first
|
#define QUICK_HOME // If G28 contains XY do a diagonal move first
|
||||||
//#define HOME_Y_BEFORE_X // If G28 contains XY home Y before X
|
//#define HOME_Y_BEFORE_X // If G28 contains XY home Y before X
|
||||||
//#define HOME_Z_FIRST // Home Z first. Requires a Z-MIN endstop (not a probe).
|
//#define HOME_Z_FIRST // Home Z first. Requires a Z-MIN endstop (not a probe).
|
||||||
//#define CODEPENDENT_XY_HOMING // If X/Y can't home without homing Y/X first
|
//#define CODEPENDENT_XY_HOMING // If X/Y can't home without homing Y/X first
|
||||||
@@ -910,14 +910,14 @@
|
|||||||
// Define one position per Z stepper in stepper driver order.
|
// Define one position per Z stepper in stepper driver order.
|
||||||
#define Z_STEPPER_ALIGN_STEPPER_XY { { 210.7, 102.5 }, { 152.6, 220.0 }, { 94.5, 102.5 } }
|
#define Z_STEPPER_ALIGN_STEPPER_XY { { 210.7, 102.5 }, { 152.6, 220.0 }, { 94.5, 102.5 } }
|
||||||
#else
|
#else
|
||||||
// Amplification factor. Used to scale the correction step up or down in case
|
// Amplification factor. Used to scale the correction step up or down.
|
||||||
// the stepper (spindle) position is farther out than the test point.
|
// In case the stepper (spindle) position is further out than the test point.
|
||||||
#define Z_STEPPER_ALIGN_AMP 1.0 // Use a value > 1.0 NOTE: This may cause instability!
|
// Use a value > 1. NOTE: This may cause instability
|
||||||
|
#define Z_STEPPER_ALIGN_AMP 1.0
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// On a 300mm bed a 5% grade would give a misalignment of ~1.5cm
|
|
||||||
#define G34_MAX_GRADE 5 // (%) Maximum incline that G34 will handle
|
#define G34_MAX_GRADE 5 // (%) Maximum incline that G34 will handle
|
||||||
#define Z_STEPPER_ALIGN_ITERATIONS 5 // Number of iterations to apply during alignment
|
#define Z_STEPPER_ALIGN_ITERATIONS 3 // Number of iterations to apply during alignment
|
||||||
#define Z_STEPPER_ALIGN_ACC 0.02 // Stop iterating early if the accuracy is better than this
|
#define Z_STEPPER_ALIGN_ACC 0.02 // Stop iterating early if the accuracy is better than this
|
||||||
#define RESTORE_LEVELING_AFTER_G34 // Restore leveling after G34 is done?
|
#define RESTORE_LEVELING_AFTER_G34 // Restore leveling after G34 is done?
|
||||||
// After G34, re-home Z (G28 Z) or just calculate it from the last probe heights?
|
// After G34, re-home Z (G28 Z) or just calculate it from the last probe heights?
|
||||||
@@ -1360,7 +1360,7 @@
|
|||||||
// Since the FAT gets out of order with usage, SDCARD_SORT_ALPHA is recommended.
|
// Since the FAT gets out of order with usage, SDCARD_SORT_ALPHA is recommended.
|
||||||
#define SDCARD_RATHERRECENTFIRST
|
#define SDCARD_RATHERRECENTFIRST
|
||||||
|
|
||||||
#define SD_MENU_CONFIRM_START // Confirm the selected SD file before printing
|
//#define SD_MENU_CONFIRM_START // Confirm the selected SD file before printing
|
||||||
|
|
||||||
//#define NO_SD_AUTOSTART // Remove auto#.g file support completely to save some Flash, SRAM
|
//#define NO_SD_AUTOSTART // Remove auto#.g file support completely to save some Flash, SRAM
|
||||||
//#define MENU_ADDAUTOSTART // Add a menu option to run auto#.g files
|
//#define MENU_ADDAUTOSTART // Add a menu option to run auto#.g files
|
||||||
@@ -1375,6 +1375,10 @@
|
|||||||
#define PE_LEDS_COMPLETED_TIME (30*60) // (seconds) Time to keep the LED "done" color before restoring normal illumination
|
#define PE_LEDS_COMPLETED_TIME (30*60) // (seconds) Time to keep the LED "done" color before restoring normal illumination
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if ENABLED(PRINTER_EVENT_LEDS)
|
||||||
|
#define PE_LEDS_COMPLETED_TIME (30*60) // (seconds) Time to keep the LED "done" color before restoring normal illumination
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Continue after Power-Loss (Creality3D)
|
* Continue after Power-Loss (Creality3D)
|
||||||
*
|
*
|
||||||
@@ -1631,9 +1635,9 @@
|
|||||||
//#define STATUS_COMBINE_HEATERS // Use combined heater images instead of separate ones
|
//#define STATUS_COMBINE_HEATERS // Use combined heater images instead of separate ones
|
||||||
//#define STATUS_HOTEND_NUMBERLESS // Use plain hotend icons instead of numbered ones (with 2+ hotends)
|
//#define STATUS_HOTEND_NUMBERLESS // Use plain hotend icons instead of numbered ones (with 2+ hotends)
|
||||||
#define STATUS_HOTEND_INVERTED // Show solid nozzle bitmaps when heating (Requires STATUS_HOTEND_ANIM for numbered hotends)
|
#define STATUS_HOTEND_INVERTED // Show solid nozzle bitmaps when heating (Requires STATUS_HOTEND_ANIM for numbered hotends)
|
||||||
#define STATUS_HOTEND_ANIM // Use a second bitmap to indicate hotend heating
|
//#define STATUS_HOTEND_ANIM // Use a second bitmap to indicate hotend heating
|
||||||
#define STATUS_BED_ANIM // Use a second bitmap to indicate bed heating
|
//#define STATUS_BED_ANIM // Use a second bitmap to indicate bed heating
|
||||||
#define STATUS_CHAMBER_ANIM // Use a second bitmap to indicate chamber heating
|
//#define STATUS_CHAMBER_ANIM // Use a second bitmap to indicate chamber heating
|
||||||
//#define STATUS_CUTTER_ANIM // Use a second bitmap to indicate spindle / laser active
|
//#define STATUS_CUTTER_ANIM // Use a second bitmap to indicate spindle / laser active
|
||||||
//#define STATUS_COOLER_ANIM // Use a second bitmap to indicate laser cooling
|
//#define STATUS_COOLER_ANIM // Use a second bitmap to indicate laser cooling
|
||||||
//#define STATUS_FLOWMETER_ANIM // Use multiple bitmaps to indicate coolant flow
|
//#define STATUS_FLOWMETER_ANIM // Use multiple bitmaps to indicate coolant flow
|
||||||
@@ -1858,18 +1862,18 @@
|
|||||||
*
|
*
|
||||||
* Warning: Does not respect endstops!
|
* Warning: Does not respect endstops!
|
||||||
*/
|
*/
|
||||||
//#define BABYSTEPPING
|
#define BABYSTEPPING
|
||||||
#if ENABLED(BABYSTEPPING)
|
#if ENABLED(BABYSTEPPING)
|
||||||
//#define INTEGRATED_BABYSTEPPING // EXPERIMENTAL integration of babystepping into the Stepper ISR
|
#define INTEGRATED_BABYSTEPPING // EXPERIMENTAL integration of babystepping into the Stepper ISR
|
||||||
//#define BABYSTEP_WITHOUT_HOMING
|
//#define BABYSTEP_WITHOUT_HOMING
|
||||||
//#define BABYSTEP_ALWAYS_AVAILABLE // Allow babystepping at all times (not just during movement).
|
#define BABYSTEP_ALWAYS_AVAILABLE // Allow babystepping at all times (not just during movement).
|
||||||
//#define BABYSTEP_XY // Also enable X/Y Babystepping. Not supported on DELTA!
|
//#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_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_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 40 // (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 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)
|
#if ENABLED(DOUBLECLICK_FOR_Z_BABYSTEPPING)
|
||||||
#define DOUBLECLICK_MAX_INTERVAL 1250 // Maximum interval between clicks, in milliseconds.
|
#define DOUBLECLICK_MAX_INTERVAL 1250 // Maximum interval between clicks, in milliseconds.
|
||||||
// Note: Extra time may be added to mitigate controller latency.
|
// Note: Extra time may be added to mitigate controller latency.
|
||||||
@@ -1884,7 +1888,7 @@
|
|||||||
//#define BABYSTEP_ZPROBE_OFFSET // Combine M851 Z and Babystepping
|
//#define BABYSTEP_ZPROBE_OFFSET // Combine M851 Z and Babystepping
|
||||||
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
|
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
|
||||||
//#define BABYSTEP_HOTEND_Z_OFFSET // For multiple hotends, babystep relative Z offsets
|
//#define BABYSTEP_HOTEND_Z_OFFSET // For multiple hotends, babystep relative Z offsets
|
||||||
//#define BABYSTEP_ZPROBE_GFX_OVERLAY // Enable graphical overlay on Z-offset editor
|
#define BABYSTEP_ZPROBE_GFX_OVERLAY // Enable graphical overlay on Z-offset editor
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -2050,7 +2054,7 @@
|
|||||||
//
|
//
|
||||||
// G2/G3 Arc Support
|
// G2/G3 Arc Support
|
||||||
//
|
//
|
||||||
#define ARC_SUPPORT // Disable this feature to save ~3226 bytes
|
//#define ARC_SUPPORT // Disable this feature to save ~3226 bytes
|
||||||
#if ENABLED(ARC_SUPPORT)
|
#if ENABLED(ARC_SUPPORT)
|
||||||
#define MM_PER_ARC_SEGMENT 1 // (mm) Length (or minimum length) of each arc segment
|
#define MM_PER_ARC_SEGMENT 1 // (mm) Length (or minimum length) of each arc segment
|
||||||
//#define ARC_SEGMENTS_PER_R 1 // Max segment length, MM_PER = Min
|
//#define ARC_SEGMENTS_PER_R 1 // Max segment length, MM_PER = Min
|
||||||
@@ -2206,7 +2210,7 @@
|
|||||||
* Currently handles M108, M112, M410, M876
|
* Currently handles M108, M112, M410, M876
|
||||||
* NOTE: Not yet implemented for all platforms.
|
* NOTE: Not yet implemented for all platforms.
|
||||||
*/
|
*/
|
||||||
//#define EMERGENCY_PARSER
|
#define EMERGENCY_PARSER
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Realtime Reporting (requires EMERGENCY_PARSER)
|
* Realtime Reporting (requires EMERGENCY_PARSER)
|
||||||
@@ -2383,7 +2387,7 @@
|
|||||||
*
|
*
|
||||||
* Enable PARK_HEAD_ON_PAUSE to add the G-code M125 Pause and Park.
|
* Enable PARK_HEAD_ON_PAUSE to add the G-code M125 Pause and Park.
|
||||||
*/
|
*/
|
||||||
//#define ADVANCED_PAUSE_FEATURE
|
#define ADVANCED_PAUSE_FEATURE
|
||||||
#if ENABLED(ADVANCED_PAUSE_FEATURE)
|
#if ENABLED(ADVANCED_PAUSE_FEATURE)
|
||||||
#define PAUSE_PARK_RETRACT_FEEDRATE 60 // (mm/s) Initial retract feedrate.
|
#define PAUSE_PARK_RETRACT_FEEDRATE 60 // (mm/s) Initial retract feedrate.
|
||||||
#define PAUSE_PARK_RETRACT_LENGTH 2 // (mm) Initial retract.
|
#define PAUSE_PARK_RETRACT_LENGTH 2 // (mm) Initial retract.
|
||||||
@@ -2409,7 +2413,7 @@
|
|||||||
// Filament can be extruded repeatedly from the Filament Change menu
|
// Filament can be extruded repeatedly from the Filament Change menu
|
||||||
// until extrusion is consistent, and to purge old filament.
|
// until extrusion is consistent, and to purge old filament.
|
||||||
#define ADVANCED_PAUSE_RESUME_PRIME 0 // (mm) Extra distance to prime nozzle after returning from park.
|
#define ADVANCED_PAUSE_RESUME_PRIME 0 // (mm) Extra distance to prime nozzle after returning from park.
|
||||||
//#define ADVANCED_PAUSE_FANS_PAUSE // Turn off print-cooling fans while the machine is paused.
|
#define ADVANCED_PAUSE_FANS_PAUSE // Turn off print-cooling fans while the machine is paused.
|
||||||
|
|
||||||
// Filament Unload does a Retract, Delay, and Purge first:
|
// Filament Unload does a Retract, Delay, and Purge first:
|
||||||
#define FILAMENT_UNLOAD_PURGE_RETRACT 13 // (mm) Unload initial retract length.
|
#define FILAMENT_UNLOAD_PURGE_RETRACT 13 // (mm) Unload initial retract length.
|
||||||
@@ -2421,8 +2425,8 @@
|
|||||||
#define FILAMENT_CHANGE_ALERT_BEEPS 10 // Number of alert beeps to play when a response is needed.
|
#define FILAMENT_CHANGE_ALERT_BEEPS 10 // Number of alert beeps to play when a response is needed.
|
||||||
#define PAUSE_PARK_NO_STEPPER_TIMEOUT // Enable for XYZ steppers to stay powered on during filament change.
|
#define PAUSE_PARK_NO_STEPPER_TIMEOUT // Enable for XYZ steppers to stay powered on during filament change.
|
||||||
|
|
||||||
//#define PARK_HEAD_ON_PAUSE // Park the nozzle during pause and filament change.
|
#define PARK_HEAD_ON_PAUSE // Park the nozzle during pause and filament change.
|
||||||
//#define HOME_BEFORE_FILAMENT_CHANGE // If needed, home before parking for filament change
|
#define HOME_BEFORE_FILAMENT_CHANGE // If needed, home before parking for filament change
|
||||||
|
|
||||||
//#define FILAMENT_LOAD_UNLOAD_GCODES // Add M701/M702 Load/Unload G-codes, plus Load/Unload in the LCD Prepare menu.
|
//#define FILAMENT_LOAD_UNLOAD_GCODES // Add M701/M702 Load/Unload G-codes, plus Load/Unload in the LCD Prepare menu.
|
||||||
//#define FILAMENT_UNLOAD_ALL_EXTRUDERS // Allow M702 to unload all extruders above a minimum target temp (as set by M302)
|
//#define FILAMENT_UNLOAD_ALL_EXTRUDERS // Allow M702 to unload all extruders above a minimum target temp (as set by M302)
|
||||||
@@ -3594,7 +3598,7 @@
|
|||||||
/**
|
/**
|
||||||
* Include capabilities in M115 output
|
* Include capabilities in M115 output
|
||||||
*/
|
*/
|
||||||
#define EXTENDED_CAPABILITIES_REPORT
|
//#define EXTENDED_CAPABILITIES_REPORT
|
||||||
#if ENABLED(EXTENDED_CAPABILITIES_REPORT)
|
#if ENABLED(EXTENDED_CAPABILITIES_REPORT)
|
||||||
//#define M115_GEOMETRY_REPORT
|
//#define M115_GEOMETRY_REPORT
|
||||||
#endif
|
#endif
|
||||||
@@ -3820,11 +3824,11 @@
|
|||||||
* Host Prompt Support enables Marlin to use the host for user prompts so
|
* Host Prompt Support enables Marlin to use the host for user prompts so
|
||||||
* filament runout and other processes can be managed from the host side.
|
* filament runout and other processes can be managed from the host side.
|
||||||
*/
|
*/
|
||||||
//#define HOST_ACTION_COMMANDS
|
#define HOST_ACTION_COMMANDS
|
||||||
#if ENABLED(HOST_ACTION_COMMANDS)
|
#if ENABLED(HOST_ACTION_COMMANDS)
|
||||||
//#define HOST_PAUSE_M76
|
//#define HOST_PAUSE_M76
|
||||||
//#define HOST_PROMPT_SUPPORT
|
#define HOST_PROMPT_SUPPORT
|
||||||
//#define HOST_START_MENU_ITEM // Add a menu item that tells the host to start
|
#define HOST_START_MENU_ITEM // Add a menu item that tells the host to start
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -1212,8 +1212,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
|
|||||||
#error "LIN_ADVANCE and S_CURVE_ACCELERATION may not play well together! Enable EXPERIMENTAL_SCURVE to continue."
|
#error "LIN_ADVANCE and S_CURVE_ACCELERATION may not play well together! Enable EXPERIMENTAL_SCURVE to continue."
|
||||||
#elif ENABLED(DIRECT_STEPPING)
|
#elif ENABLED(DIRECT_STEPPING)
|
||||||
#error "DIRECT_STEPPING is incompatible with LIN_ADVANCE. Enable in external planner if possible."
|
#error "DIRECT_STEPPING is incompatible with LIN_ADVANCE. Enable in external planner if possible."
|
||||||
#elif !HAS_JUNCTION_DEVIATION && defined(DEFAULT_EJERK)
|
#elif DISABLED(HAS_JUNCTION_DEVIATION) && DEFAULT_EJERK < 10
|
||||||
static_assert(DEFAULT_EJERK >= 10, "It is strongly recommended to set DEFAULT_EJERK >= 10 when using LIN_ADVANCE.");
|
#error "It is strongly recommended to set DEFAULT_EJERK >= 10 when using LIN_ADVANCE."
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
@@ -25,7 +25,7 @@
|
|||||||
* Release version. Leave the Marlin version or apply a custom scheme.
|
* Release version. Leave the Marlin version or apply a custom scheme.
|
||||||
*/
|
*/
|
||||||
#ifndef SHORT_BUILD_VERSION
|
#ifndef SHORT_BUILD_VERSION
|
||||||
#define SHORT_BUILD_VERSION "bugfix-2.0.x"
|
#define SHORT_BUILD_VERSION "2.0.5.2"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user