Commit d042748
committed
Merge branch 'bugfix-2.0.x' into rmpel/bugfix-2.0.x/ender-3-skr-14-turbo-bttsfs
* bugfix-2.0.x: (1598 commits)
[cron] Bump distribution date (2022-02-19)
♻️ Refactor HAL as singleton (MarlinFirmware#23357)
✏️ Fix getLFNName parameter (MarlinFirmware#23752)
🚨 Fix TEMP_SENSOR_BOARD warnings (MarlinFirmware#23754)
🐛 Fix HAS_TMC26X feature path (MarlinFirmware#23757)
[cron] Bump distribution date (2022-02-18)
🐛 Patch Creality RAMPS FET / FAN pins
[cron] Bump distribution date (2022-02-17)
🧑💻 Update MightyBoard FET pins (MarlinFirmware#23728)
[cron] Bump distribution date (2022-02-16)
♻️ Rename XATC z_values => z_offset
🐛 Fix XATC divide-by-zero (MarlinFirmware#23743)
[cron] Bump distribution date (2022-02-14)
♻️ No ui.reinit_lcd on any ExtUI (MarlinFirmware#23722)
📝 Update conditionals descriptions
🔧 HAS_LCDPRINT conditional
[cron] Bump distribution date (2022-02-12)
✨ More Nozzle Park move options (MarlinFirmware#23158)
✏️ Fix E3V2 display with BTT SKR Mini E3 v3 (MarlinFirmware#23719)
🚸 Align MKS UI heated bed status with HAS_MULTI_HOTEND (MarlinFirmware#23718)
...
# Conflicts:
# Marlin/Configuration.h
# Marlin/Configuration_adv.h2,128 files changed
Lines changed: 186816 additions & 60564 deletions
File tree
- .github/workflows
- .vscode
- Marlin
- src
- HAL
- AVR
- inc
- DUE
- dogm
- fastio
- usb
- ESP32
- LINUX
- hardware
- include
- inc
- LPC1768
- include
- inc
- tft
- u8g
- NATIVE_SIM
- inc
- tft
- u8g
- SAMD51
- inc
- STM32F1
- dogm
- inc
- tft
- STM32
- inc
- tft
- TEENSY31_32
- TEENSY35_36
- TEENSY40_41
- core
- feature
- adc
- bedlevel
- abl
- mbl
- ubl
- dac
- digipot
- leds
- mmu
- password
- gcode
- bedlevel
- abl
- mbl
- ubl
- calibrate
- config
- control
- eeprom
- feature
- L6470
- adc
- advance
- camera
- caselight
- clean
- controllerfan
- digipot
- filwidth
- fwretract
- i2c
- leds
- mixing
- network
- password
- pause
- power_monitor
- powerloss
- runout
- trinamic
- geometry
- host
- lcd
- motion
- probe
- sd
- stats
- temp
- units
- inc
- lcd
- HD44780
- TFTGLCD
- dogm
- fontdata
- status
- dwin/e3v2
- e3v2
- common
- creality
- jyersui
- marlinui
- proui
- extui
- anycubic_chiron
- anycubic_i3mega
- dgus_reloaded
- config
- definition
- dgus
- fysetc
- hiprecy
- mks
- origin
- example
- ftdi_eve_touch_ui
- archim2-flash
- bioprinter
- cocoa_press
- ftdi_eve_lib
- basic
- extended
- unicode
- font_bitmaps
- scripts
- generic
- language
- theme
- lib
- anycubic_chiron
- anycubic_i3mega
- ftdi_eve_touch_ui
- ftdi_eve_lib
- extended/unicode
- extras
- screens
- mks_ui
- malyan
- mks_ui
- nextion
- language
- tft_io
- tft
- bitmaps
- images
- touch
- libs
- L64XX
- module
- stepper
- thermistor
- pins
- esp32
- linux
- lpc1768
- lpc1769
- mega
- rambo
- ramps
- samd
- sam
- sanguino
- stm32f0
- stm32f1
- stm32f4
- stm32f7
- stm32g0
- stm32h7
- teensy2
- sd
- usb_flashdrive
- lib-uhs2
- lib-uhs3
- UHS_host
- USB_HOST_SHIELD
- buildroot
- bin
- tests
- web-ui/data/www
- config
- data/www
- docs
- 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 | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
| 7 | + | |
8 | 8 | | |
9 | 9 | | |
10 | | - | |
| 10 | + | |
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
56 | 56 | | |
57 | 57 | | |
58 | 58 | | |
59 | | - | |
60 | | - | |
61 | | - | |
62 | | - | |
63 | | - | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
64 | 62 | | |
65 | | - | |
66 | | - | |
67 | | - | |
68 | | - | |
69 | | - | |
70 | | - | |
71 | | - | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
72 | 71 | | |
73 | 72 | | |
74 | 73 | | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
75 | 80 | | |
76 | 81 | | |
77 | 82 | | |
78 | 83 | | |
79 | 84 | | |
80 | | - | |
| 85 | + | |
81 | 86 | | |
82 | 87 | | |
83 | 88 | | |
| |||
86 | 91 | | |
87 | 92 | | |
88 | 93 | | |
89 | | - | |
| 94 | + | |
| 95 | + | |
90 | 96 | | |
91 | 97 | | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
92 | 101 | | |
93 | 102 | | |
94 | 103 | | |
| |||
98 | 107 | | |
99 | 108 | | |
100 | 109 | | |
| 110 | + | |
101 | 111 | | |
102 | 112 | | |
103 | 113 | | |
104 | 114 | | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
105 | 132 | | |
106 | | - | |
| 133 | + | |
107 | 134 | | |
108 | 135 | | |
109 | 136 | | |
| |||
113 | 140 | | |
114 | 141 | | |
115 | 142 | | |
116 | | - | |
117 | | - | |
118 | | - | |
119 | 143 | | |
120 | 144 | | |
121 | 145 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
25 | 29 | | |
26 | 30 | | |
27 | 31 | | |
28 | 32 | | |
29 | 33 | | |
30 | | - | |
| 34 | + | |
31 | 35 | | |
32 | 36 | | |
33 | 37 | | |
| |||
37 | 41 | | |
38 | 42 | | |
39 | 43 | | |
40 | | - | |
41 | 44 | | |
42 | 45 | | |
43 | 46 | | |
| |||
122 | 125 | | |
123 | 126 | | |
124 | 127 | | |
125 | | - | |
126 | | - | |
127 | | - | |
128 | | - | |
129 | | - | |
130 | | - | |
131 | | - | |
132 | | - | |
133 | | - | |
134 | | - | |
135 | | - | |
136 | | - | |
137 | | - | |
138 | | - | |
139 | | - | |
140 | | - | |
141 | | - | |
142 | | - | |
143 | | - | |
144 | | - | |
145 | | - | |
146 | | - | |
147 | | - | |
148 | 128 | | |
149 | 129 | | |
150 | 130 | | |
| |||
160 | 140 | | |
161 | 141 | | |
162 | 142 | | |
163 | | - | |
164 | | - | |
165 | | - | |
166 | | - | |
167 | | - | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
168 | 150 | | |
169 | | - | |
| 151 | + | |
170 | 152 | | |
171 | 153 | | |
172 | 154 | | |
| 155 | + | |
173 | 156 | | |
174 | 157 | | |
175 | 158 | | |
| |||
186 | 169 | | |
187 | 170 | | |
188 | 171 | | |
189 | | - | |
190 | | - | |
191 | | - | |
192 | | - | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
0 commit comments