Skip to content

Commit 283dce9

Browse files
damvcoooldamvcoool
committed
Update to Marlin 2.0.5.2
1 parent a896c56 commit 283dce9

File tree

964 files changed

+18469
-16524
lines changed

Some content is hidden

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

964 files changed

+18469
-16524
lines changed

‎.github/FUNDING.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
custom: http://www.thinkyhead.com/donate-to-marlin
1+
github: [thinkyhead]
2+
patreon: thinkyhead
3+
custom: ["http://www.thinkyhead.com/donate-to-marlin"]

‎.github/workflows/bad-target.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
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.
2+
3+
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.
4+
5+
It may help to set your fork's default branch to `bugfix-2.0.x`.
6+
7+
See [this page](http://marlinfw.org/docs/development/getting_started_pull_requests.html) for full instructions.

‎.github/workflows/bump-date.yml

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#
2+
# bump-date.yml
3+
# Bump the distribution date once per day
4+
#
5+
6+
name: Bump Distribution Date
7+
8+
on:
9+
schedule:
10+
- cron: '0 0 * * *'
11+
12+
jobs:
13+
bump_date:
14+
15+
runs-on: ubuntu-latest
16+
17+
steps:
18+
19+
- name: Check out bugfix-2.0.x
20+
uses: actions/checkout@v2
21+
with:
22+
ref: bugfix-2.0.x
23+
24+
- name: Bump Distribution Date
25+
run: |
26+
# Inline Bump Script
27+
[[ "$GITHUB_REPOSITORY" == "MarlinFirmware/Marlin" ]] || exit 0
28+
DIST=$( date +"%Y-%m-%d" )
29+
eval "sed -E -i 's/(#define +STRING_DISTRIBUTION_DATE) .*$/\1 \"$DIST\"/g' Marlin/src/inc/Version.h" && \
30+
git config user.name "${GITHUB_ACTOR}" && \
31+
git config user.email "${GITHUB_ACTOR}@users.noreply.github.com" && \
32+
git add . && \
33+
git commit -m "[cron] Bump distribution date ($DIST)" && \
34+
git push

‎.github/workflows/check-pr.yml

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#
2+
# comment-pr.yml
3+
# Add a comment to any PR directed to a release branch
4+
#
5+
6+
name: PR Bad Target
7+
8+
on:
9+
pull_request:
10+
branches:
11+
- 1.0.x
12+
- 1.1.x
13+
- 2.0.x
14+
15+
jobs:
16+
bad_target:
17+
18+
name: PR Bad Target
19+
runs-on: ubuntu-latest
20+
21+
steps:
22+
- uses: actions/checkout@v1
23+
- uses: harupy/comment-on-pr@master
24+
env:
25+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
26+
with:
27+
filename: bad-target.md

‎.github/workflows/test-builds.yml

+104
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
#
2+
# test-builds.yml
3+
# Do test builds to catch compile errors
4+
#
5+
6+
name: CI
7+
8+
on:
9+
pull_request:
10+
branches:
11+
- bugfix-2.0.x
12+
- dev-2.1.x
13+
paths-ignore:
14+
- config/**
15+
- data/**
16+
- docs/**
17+
- '**/*.md'
18+
19+
jobs:
20+
test_builds:
21+
22+
runs-on: ubuntu-latest
23+
24+
strategy:
25+
matrix:
26+
test-platform:
27+
# Base Environments
28+
29+
- DUE
30+
- esp32
31+
- linux_native
32+
- mega2560
33+
- teensy31
34+
- teensy35
35+
- SAMD51_grandcentral_m4
36+
37+
# Extended AVR Environments
38+
39+
- FYSETC_F6_13
40+
- mega1280
41+
- rambo
42+
- sanguino1284p
43+
- sanguino644p
44+
45+
# Extended STM32 Environments
46+
47+
- STM32F103RC_btt
48+
- STM32F103RC_btt_USB
49+
- STM32F103RE_btt
50+
- STM32F103RE_btt_USB
51+
- STM32F103RC_fysetc
52+
- jgaurora_a5s_a1
53+
- STM32F103VE_longer
54+
- STM32F407VE_black
55+
- BIGTREE_SKR_PRO
56+
- BIGTREE_GTR_V1_0
57+
- mks_robin
58+
- ARMED
59+
- FYSETC_S6
60+
61+
# Put lengthy tests last
62+
63+
- LPC1768
64+
- LPC1769
65+
66+
# STM32 with non-STM framework. both broken for now. they should use HAL_STM32 which is working.
67+
68+
#- STM32F4
69+
#- STM32F7
70+
71+
# Non-working environment tests
72+
73+
#- BIGTREE_BTT002
74+
#- at90usb1286_cdc
75+
#- at90usb1286_dfu
76+
#- STM32F103CB_malyan
77+
#- mks_robin_lite
78+
#- mks_robin_mini
79+
#- mks_robin_nano
80+
81+
steps:
82+
83+
- name: Select Python 3.7
84+
uses: actions/setup-python@v1
85+
with:
86+
python-version: '3.7' # Version range or exact version of a Python version to use, using semvers version range syntax.
87+
architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
88+
89+
- name: Install PlatformIO
90+
run: |
91+
pip install -U https://github.com/platformio/platformio-core/archive/master.zip
92+
platformio update
93+
94+
- name: Check out the PR
95+
uses: actions/checkout@v2
96+
97+
- name: Run ${{ matrix.test-platform }} Tests
98+
run: |
99+
# Inline tests script
100+
[[ "$GITHUB_REPOSITORY" == "MarlinFirmware/Marlin" ]] || exit 0
101+
chmod +x buildroot/bin/*
102+
chmod +x buildroot/share/tests/*
103+
export PATH=./buildroot/bin/:./buildroot/share/tests/:${PATH}
104+
run_tests . ${{ matrix.test-platform }}

‎Marlin/Configuration.h

+19-8
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
* Advanced settings can be found in Configuration_adv.h
3737
*
3838
*/
39-
#define CONFIGURATION_H_VERSION 020004
39+
#define CONFIGURATION_H_VERSION 020005
4040

4141
//===========================================================================
4242
//============================= Getting Started =============================
@@ -99,6 +99,7 @@
9999
/**
100100
* Select the serial port on the board to use for communication with the host.
101101
* This allows the connection of wireless adapters (for instance) to non-default port pins.
102+
* Serial port -1 is the USB emulated serial port, if available.
102103
* Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
103104
*
104105
* :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
@@ -107,9 +108,9 @@
107108

108109
/**
109110
* Select a secondary serial port on the board to use for communication with the host.
110-
* This allows the connection of wireless adapters (for instance) to non-default port pins.
111-
* Serial port -1 is the USB emulated serial port, if available.
112-
*
111+
112+
113+
113114
* :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
114115
*/
115116
#define SERIAL_PORT_2 -1
@@ -363,6 +364,7 @@
363364
* 331 : (3.3V scaled thermistor 1 table for MEGA)
364365
* 332 : (3.3V scaled thermistor 1 table for DUE)
365366
* 2 : 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
367+
* 202 : 200k thermistor - Copymaster 3D
366368
* 3 : Mendel-parts thermistor (4.7k pullup)
367369
* 4 : 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
368370
* 5 : 100K thermistor - ATC Semitec 104GT-2/104NT-4-R025H42G (Used in ParCan & J-Head) (4.7k pullup)
@@ -474,7 +476,7 @@
474476
#if ENABLED(PIDTEMP)
475477
//#define PID_EDIT_MENU // Add PID editing to the "Advanced Settings" menu. (~700 bytes of PROGMEM)
476478
//#define PID_AUTOTUNE_MENU // Add PID auto-tuning to the "Advanced Settings" menu. (~250 bytes of PROGMEM)
477-
//#define PID_DEBUG // Sends debug data to the serial port.
479+
//#define PID_DEBUG // Sends debug data to the serial port. Use 'M303 D' to toggle activation.
478480
//#define PID_OPENLOOP 1 // Puts PID in open loop. M104/M140 sets the output power from 0 to PID_MAX
479481
//#define SLOW_PWM_HEATERS // PWM with very low frequency (roughly 0.125Hz=8s) and minimum state time of approximately 1s useful for heaters driven by a relay
480482
//#define PID_PARAMS_PER_HOTEND // Uses separate PID parameters for each extruder (useful for mismatched extruders)
@@ -918,6 +920,14 @@
918920
#define SMART_EFFECTOR_MOD_PIN -1 // Connect a GPIO pin to the Smart Effector MOD pin
919921
#endif
920922

923+
/**
924+
* Use StallGuard2 to probe the bed with the nozzle.
925+
* Requires stallGuard-capable Trinamic stepper drivers.
926+
* CAUTION: This can damage machines with Z lead screws.
927+
* Take extreme care when setting up this feature.
928+
*/
929+
//#define SENSORLESS_PROBING
930+
921931
//
922932
// For Z_PROBE_ALLEN_KEY see the Delta example configurations.
923933
//
@@ -942,7 +952,7 @@
942952
*
943953
* Specify a Probe position as { X, Y, Z }
944954
*/
945-
#define NOZZLE_TO_PROBE_OFFSET { -46.5, 7, -3.4 }
955+
#define NOZZLE_TO_PROBE_OFFSET { -46.5, 7, -2 }
946956

947957
// Most probes should stay away from the edges of the bed, but
948958
// with NOZZLE_AS_PROBE this can be negative for a wider probing area.
@@ -1428,9 +1438,10 @@
14281438
* M501 - Read settings from EEPROM. (i.e., Throw away unsaved changes)
14291439
* M502 - Revert settings to "factory" defaults. (Follow with M500 to init the EEPROM.)
14301440
*/
1431-
#define EEPROM_SETTINGS // Persistent storage with M500 and M501
1441+
#define EEPROM_SETTINGS // Persistent storage with M500 and M501
14321442
//#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release!
14331443
//#define EEPROM_CHITCHAT // Give feedback on EEPROM commands. Disable to save PROGMEM.
1444+
#define EEPROM_BOOT_SILENT // Keep M503 quiet and only give errors during first load
14341445
#if ENABLED(EEPROM_SETTINGS)
14351446
//#define EEPROM_AUTO_INIT // Init EEPROM automatically on any errors.
14361447
#endif
@@ -1465,7 +1476,7 @@
14651476

14661477
#define PREHEAT_2_LABEL "PETG"
14671478
#define PREHEAT_2_TEMP_HOTEND 230
1468-
#define PREHEAT_2_TEMP_BED 80
1479+
#define PREHEAT_2_TEMP_BED 80
14691480
#define PREHEAT_2_FAN_SPEED 255 // Value from 0 to 255
14701481

14711482
/**

0 commit comments

Comments
 (0)