Skip to content

Commit 4c16288

Browse files
committed
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into Anet-A6
2 parents 8526c96 + 8aca383 commit 4c16288

File tree

157 files changed

+3984
-1836
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

157 files changed

+3984
-1836
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

+14-15
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ body:
5050
Describe the bug in this section. Tell us what you were trying to do and what
5151
happened that you did not expect. Provide a clear and concise description of the
5252
problem and include as many details as possible.
53+
54+
When pasting formatted text don't forget to put ` ``` ` (on its own line) before and after to make it readable.
5355
placeholder: |
5456
Marlin doesn't work.
5557
validations:
@@ -147,23 +149,20 @@ body:
147149
- Same as my slicer
148150
- Other (explain below)
149151

150-
- type: markdown
152+
- type: checkboxes
151153
attributes:
152-
value: >-
153-
## Other things to include
154-
155-
Please also be sure to include these items to help with troubleshooting:
156-
157-
* **A ZIP file** containing your `Configuration.h` and `Configuration_adv.h`.
158-
(Please don't paste lengthy configuration text here.)
159-
* **Log output** from the host. (`M111 S247` for maximum logging.)
160-
* **Images or videos** demonstrating the problem, if it helps to make it clear.
161-
* **A G-Code file** that exposes the problem, if not affecting _all_ G-code.
162-
163-
If you've made any other modifications to the firmware, please describe them in detail in the space provided.
164-
165-
When pasting formatted text into the box below don't forget to put ` ``` ` (on its own line) before and after to make it readable.
154+
label: Other things to include
155+
options:
156+
- label: A ZIP file containing your `Configuration.h` and `Configuration_adv.h`.
157+
required: true
158+
- label: Log output from the host. (`M111 S247` for maximum logging.)
159+
- label: Images or videos demonstrating the problem, if it helps to make it clear.
160+
- label: A G-Code file that exposes the problem, if not affecting _all_ G-code.
166161

167162
- type: textarea
168163
attributes:
169164
label: Additional information & file uploads
165+
description: >-
166+
If you've made any other modifications to the firmware, please describe them in detail.
167+
168+
When pasting formatted text don't forget to put ` ``` ` (on its own line) before and after to make it readable.

Marlin/Configuration.h

+15-15
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,7 @@
630630

631631
#if ENABLED(PIDTEMP)
632632
//#define PID_PARAMS_PER_HOTEND // Uses separate PID parameters for each extruder (useful for mismatched extruders)
633-
// Set/get with gcode: M301 E[extruder number, 0-2]
633+
// Set/get with G-code: M301 E[extruder number, 0-2]
634634

635635
#if ENABLED(PID_PARAMS_PER_HOTEND)
636636
// Specify between 1 and HOTENDS values per array.
@@ -1794,18 +1794,18 @@
17941794
#endif
17951795

17961796
// Add a menu item to move between bed corners for manual bed adjustment
1797-
#define LEVEL_BED_CORNERS
1798-
1799-
#if ENABLED(LEVEL_BED_CORNERS)
1800-
#define LEVEL_CORNERS_INSET_LFRB { 30, 30, 30, 30 } // (mm) Left, Front, Right, Back insets
1801-
#define LEVEL_CORNERS_HEIGHT 0.0 // (mm) Z height of nozzle at leveling points
1802-
#define LEVEL_CORNERS_Z_HOP 4.0 // (mm) Z height of nozzle between leveling points
1803-
#define LEVEL_CENTER_TOO // Move to the center after the last corner
1804-
#define LEVEL_CORNERS_USE_PROBE
1805-
#if ENABLED(LEVEL_CORNERS_USE_PROBE)
1806-
#define LEVEL_CORNERS_PROBE_TOLERANCE 0.1
1807-
#define LEVEL_CORNERS_VERIFY_RAISED // After adjustment triggers the probe, re-probe to verify
1808-
//#define LEVEL_CORNERS_AUDIO_FEEDBACK
1797+
//#define LCD_BED_TRAMMING
1798+
1799+
#if ENABLED(LCD_BED_TRAMMING)
1800+
#define BED_TRAMMING_INSET_LFRB { 30, 30, 30, 30 } // (mm) Left, Front, Right, Back insets
1801+
#define BED_TRAMMING_HEIGHT 0.0 // (mm) Z height of nozzle at leveling points
1802+
#define BED_TRAMMING_Z_HOP 4.0 // (mm) Z height of nozzle between leveling points
1803+
//#define BED_TRAMMING_INCLUDE_CENTER // Move to the center after the last corner
1804+
//#define BED_TRAMMING_USE_PROBE
1805+
#if ENABLED(BED_TRAMMING_USE_PROBE)
1806+
#define BED_TRAMMING_PROBE_TOLERANCE 0.1 // (mm)
1807+
#define BED_TRAMMING_VERIFY_RAISED // After adjustment triggers the probe, re-probe to verify
1808+
//#define BED_TRAMMING_AUDIO_FEEDBACK
18091809
#endif
18101810

18111811
/**
@@ -1825,7 +1825,7 @@
18251825
* | 1 2 | | 1 4 | | 1 2 | | 2 |
18261826
* LF --------- RF LF --------- RF LF --------- RF LF --------- RF
18271827
*/
1828-
#define LEVEL_CORNERS_LEVELING_ORDER { LF, RF, RB, LB }
1828+
#define BED_TRAMMING_LEVELING_ORDER { LF, RF, RB, LB }
18291829
#endif
18301830

18311831
/**
@@ -2078,7 +2078,7 @@
20782078
//#define NOZZLE_CLEAN_NO_Y
20792079

20802080
// Require a minimum hotend temperature for cleaning
2081-
#define NOZZLE_CLEAN_MIN_TEMP 170
2081+
#define NOZZLE_CLEAN_MIN_TEMP 190
20822082
//#define NOZZLE_CLEAN_HEATUP // Heat up the nozzle instead of skipping wipe
20832083

20842084
// Explicit wipe G-code script applies to a G12 with no arguments.

Marlin/Configuration_adv.h

+10
Original file line numberDiff line numberDiff line change
@@ -3668,6 +3668,16 @@
36683668
#define LASER_TEST_PULSE_MIN 1 // Used with Laser Control Menu
36693669
#define LASER_TEST_PULSE_MAX 999 // Caution: Menu may not show more than 3 characters
36703670

3671+
/**
3672+
* Laser Safety Timeout
3673+
*
3674+
* The laser should be turned off when there is no movement for a period of time.
3675+
* Consider material flammability, cut rate, and G-code order when setting this
3676+
* value. Too low and it could turn off during a very slow move; too high and
3677+
* the material could ignite.
3678+
*/
3679+
#define LASER_SAFETY_TIMEOUT_MS 1000 // (ms)
3680+
36713681
/**
36723682
* Enable inline laser power to be handled in the planner / stepper routines.
36733683
* Inline power is specified by the I (inline) flag in an M3 command (e.g., M3 S20 I)

Marlin/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1324)
512512
else ifeq ($(HARDWARE_MOTHERBOARD),1325)
513513
# Intamsys 4.0 (Funmat HT)
514514
else ifeq ($(HARDWARE_MOTHERBOARD),1326)
515-
# Malyan M180 Mainboard Version 2 (no display function, direct gcode only)
515+
# Malyan M180 Mainboard Version 2 (no display function, direct G-code only)
516516
else ifeq ($(HARDWARE_MOTHERBOARD),1327)
517517
# Geeetech GT2560 Rev B for A20(M/T/D)
518518
else ifeq ($(HARDWARE_MOTHERBOARD),1328)

Marlin/Version.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
* here we define this default string as the date where the latest release
4242
* version was tagged.
4343
*/
44-
//#define STRING_DISTRIBUTION_DATE "2022-05-29"
44+
//#define STRING_DISTRIBUTION_DATE "2022-06-04"
4545

4646
/**
4747
* Defines a generic printer name to be output to the LCD after booting Marlin.

Marlin/src/HAL/AVR/pinsDebug.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
#define MULTI_NAME_PAD 26 // space needed to be pretty if not first name assigned to a pin
7575

7676
void PRINT_ARRAY_NAME(uint8_t x) {
77-
const char * const name_mem_pointer = (PGM_P)pgm_read_ptr(&pin_array[x].name);
77+
PGM_P const name_mem_pointer = (PGM_P)pgm_read_ptr(&pin_array[x].name);
7878
LOOP_L_N(y, MAX_NAME_LENGTH) {
7979
char temp_char = pgm_read_byte(name_mem_pointer + y);
8080
if (temp_char != 0)

0 commit comments

Comments
 (0)