Commit af66005
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into ender3v2_bugfix
* upstream/bugfix-2.0.x: (141 commits)
♻️ Refactor status screen timeout
[cron] Bump distribution date (2021-06-27)
🎨 Small tweak, ms => now
🎨 Format onboard_sd.cpp
🐛 Fix Z_MULTI_ENDSTOPS + NUM_Z_STEPPER_DRIVERS 4 compile (MarlinFirmware#22203)
✨ Update/extend Quiet Probing (MarlinFirmware#22205)
🔧 Fix E.S.T. sanity-check errors (MarlinFirmware#22224)
🚸 Expand box in draw_boxed_string (MarlinFirmware#22209)
🎨 Fix and improve FTDI Eve Touch UI (MarlinFirmware#22223)
[cron] Bump distribution date (2021-06-26)
📝 Update TMC SPI endstops comment (MarlinFirmware#22221)
🎨 Power-off tone followup (MarlinFirmware#22222)
🐛 Trigger existing endstops on G38 hit
[cron] Bump distribution date (2021-06-25)
🐛 Fix Octopus build on case-sensitive FS (MarlinFirmware#22206)
[cron] Bump distribution date (2021-06-24)
✨ Power-off confirm / beep options (MarlinFirmware#22191)
[cron] Bump distribution date (2021-06-23)
🌐 Update Russian language (MarlinFirmware#22193)
🚸 MarlinUI Move Z >= 1000 (MarlinFirmware#22192)
...
# Conflicts:
# Marlin/Configuration.h521 files changed
Lines changed: 10999 additions & 6473 deletions
File tree
- .github/workflows
- Marlin
- src
- HAL
- AVR
- DUE
- ESP32
- LINUX/include
- LPC1768
- tft
- SAMD51
- STM32F1
- tft
- STM32
- inc
- tft
- TEENSY31_32
- TEENSY35_36
- TEENSY40_41
- core
- feature
- bedlevel
- ubl
- dac
- leds
- mmu
- gcode
- bedlevel
- abl
- mbl
- calibrate
- config
- control
- feature
- L6470
- clean
- digipot
- leds
- pause
- runout
- trinamic
- geometry
- host
- motion
- temp
- inc
- lcd
- HD44780
- dogm
- status
- dwin/e3v2
- extui
- dgus
- fysetc
- hiprecy
- mks
- origin
- ftdi_eve_touch_ui
- archim2-flash
- bioprinter
- cocoa_press
- ftdi_eve_lib
- basic
- extended
- unicode
- scripts
- generic
- language
- screens
- theme
- mks_ui
- language
- tft_io
- tft
- libs
- L64XX
- module
- stepper
- thermistor
- pins
- lpc1768
- lpc1769
- mega
- ramps
- samd
- sam
- stm32f1
- stm32f4
- teensy2
- sd
- buildroot
- bin
- tests
- ini
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
56 | 56 | | |
57 | 57 | | |
58 | 58 | | |
59 | | - | |
60 | | - | |
61 | | - | |
62 | | - | |
| 59 | + | |
| 60 | + | |
63 | 61 | | |
64 | 62 | | |
65 | 63 | | |
66 | 64 | | |
67 | | - | |
| 65 | + | |
68 | 66 | | |
69 | 67 | | |
70 | | - | |
71 | | - | |
| 68 | + | |
| 69 | + | |
72 | 70 | | |
73 | 71 | | |
74 | 72 | | |
75 | | - | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
76 | 78 | | |
77 | 79 | | |
78 | 80 | | |
79 | 81 | | |
80 | 82 | | |
81 | | - | |
| 83 | + | |
82 | 84 | | |
83 | 85 | | |
84 | 86 | | |
| |||
88 | 90 | | |
89 | 91 | | |
90 | 92 | | |
91 | | - | |
| 93 | + | |
92 | 94 | | |
93 | 95 | | |
94 | 96 | | |
| |||
107 | 109 | | |
108 | 110 | | |
109 | 111 | | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
110 | 129 | | |
111 | | - | |
| 130 | + | |
112 | 131 | | |
113 | 132 | | |
114 | 133 | | |
| |||
118 | 137 | | |
119 | 138 | | |
120 | 139 | | |
121 | | - | |
122 | | - | |
123 | | - | |
124 | 140 | | |
125 | 141 | | |
126 | 142 | | |
0 commit comments