Skip to content

Commit 3e23ac4

Browse files
committed
Merge commit '0b7d69d06ff58e01adace95bc08c69322c815639' into 2.0.x
* commit '0b7d69d06ff58e01adace95bc08c69322c815639': (40 commits) [cron] Bump distribution date (2020-09-15) Only set up SPI pins as needed (MarlinFirmware#19372) More strict STATIC_ITEM_N (MarlinFirmware#19378) Add missing FTDI EVE menu source (MarlinFirmware#19382) Allow E3 V2 DWIN without EEPROM, POWER_LOSS_RECOVERY M115 strings Always show Compiled: Better choice of code Improve temperature runaway, idle timeout (MarlinFirmware#19339) [cron] Bump distribution date (2020-09-14) heater_ind_t => heater_id_t Allow SWD debug on Robin Nano (MarlinFirmware#19345) Touch UI "Leveling" menu, misc. fixes (MarlinFirmware#19349) Fix extra string substitution bug (MarlinFirmware#19351) Read from backup TMC StealthChop state (MarlinFirmware#19364) Fix EXP2 pin define for MKS SGEN_L (MarlinFirmware#19369) Update Italian language (MarlinFirmware#19365) Highlight Creality DWIN menu icons (MarlinFirmware#19368) [cron] Bump distribution date (2020-09-13) M872 wait for probe temperature (MarlinFirmware#19344) ...
2 parents 3edb010 + 0b7d69d commit 3e23ac4

123 files changed

Lines changed: 3331 additions & 1173 deletions

File tree

Some content is hidden

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

Marlin/Makefile

Lines changed: 55 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -170,110 +170,114 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1100)
170170
else ifeq ($(HARDWARE_MOTHERBOARD),1101)
171171
# Velleman K8400 Controller (derived from 3Drag Controller)
172172
else ifeq ($(HARDWARE_MOTHERBOARD),1102)
173-
# Velleman K8600 Controller (derived from 3Drag Controller)
173+
# Velleman K8600 Controller (Vertex Nano)
174174
else ifeq ($(HARDWARE_MOTHERBOARD),1103)
175-
# 2PrintBeta BAM&DICE with STK drivers
175+
# Velleman K8800 Controller (Vertex Delta)
176176
else ifeq ($(HARDWARE_MOTHERBOARD),1104)
177-
# 2PrintBeta BAM&DICE Due with STK drivers
177+
# 2PrintBeta BAM&DICE with STK drivers
178178
else ifeq ($(HARDWARE_MOTHERBOARD),1105)
179-
# MKS BASE v1.0
179+
# 2PrintBeta BAM&DICE Due with STK drivers
180180
else ifeq ($(HARDWARE_MOTHERBOARD),1106)
181-
# MKS v1.4 with A4982 stepper drivers
181+
# MKS BASE v1.0
182182
else ifeq ($(HARDWARE_MOTHERBOARD),1107)
183-
# MKS v1.5 with Allegro A4982 stepper drivers
183+
# MKS v1.4 with A4982 stepper drivers
184184
else ifeq ($(HARDWARE_MOTHERBOARD),1108)
185-
# MKS v1.6 with Allegro A4982 stepper drivers
185+
# MKS v1.5 with Allegro A4982 stepper drivers
186186
else ifeq ($(HARDWARE_MOTHERBOARD),1109)
187-
# MKS BASE 1.0 with Heroic HR4982 stepper drivers
187+
# MKS v1.6 with Allegro A4982 stepper drivers
188188
else ifeq ($(HARDWARE_MOTHERBOARD),1110)
189-
# MKS GEN v1.3 or 1.4
189+
# MKS BASE 1.0 with Heroic HR4982 stepper drivers
190190
else ifeq ($(HARDWARE_MOTHERBOARD),1111)
191-
# MKS GEN L
191+
# MKS GEN v1.3 or 1.4
192192
else ifeq ($(HARDWARE_MOTHERBOARD),1112)
193-
# zrib V2.0 control board (Chinese knock off RAMPS replica)
193+
# MKS GEN L
194194
else ifeq ($(HARDWARE_MOTHERBOARD),1113)
195-
# BigTreeTech or BIQU KFB2.0
195+
# zrib V2.0 control board (Chinese knock off RAMPS replica)
196196
else ifeq ($(HARDWARE_MOTHERBOARD),1114)
197-
# Felix 2.0+ Electronics Board (RAMPS like)
197+
# BigTreeTech or BIQU KFB2.0
198198
else ifeq ($(HARDWARE_MOTHERBOARD),1115)
199-
# Invent-A-Part RigidBoard
199+
# Felix 2.0+ Electronics Board (RAMPS like)
200200
else ifeq ($(HARDWARE_MOTHERBOARD),1116)
201-
# Invent-A-Part RigidBoard V2
201+
# Invent-A-Part RigidBoard
202202
else ifeq ($(HARDWARE_MOTHERBOARD),1117)
203-
# Sainsmart 2-in-1 board
203+
# Invent-A-Part RigidBoard V2
204204
else ifeq ($(HARDWARE_MOTHERBOARD),1118)
205-
# Ultimaker
205+
# Sainsmart 2-in-1 board
206206
else ifeq ($(HARDWARE_MOTHERBOARD),1119)
207-
# Ultimaker (Older electronics. Pre 1.5.4. This is rare)
207+
# Ultimaker
208208
else ifeq ($(HARDWARE_MOTHERBOARD),1120)
209+
# Ultimaker (Older electronics. Pre 1.5.4. This is rare)
210+
else ifeq ($(HARDWARE_MOTHERBOARD),1121)
209211
MCU ?= atmega1280
210212

211213
# Azteeg X3
212-
else ifeq ($(HARDWARE_MOTHERBOARD),1121)
213-
# Azteeg X3 Pro
214214
else ifeq ($(HARDWARE_MOTHERBOARD),1122)
215-
# Ultimainboard 2.x (Uses TEMP_SENSOR 20)
215+
# Azteeg X3 Pro
216216
else ifeq ($(HARDWARE_MOTHERBOARD),1123)
217-
# Rumba
217+
# Ultimainboard 2.x (Uses TEMP_SENSOR 20)
218218
else ifeq ($(HARDWARE_MOTHERBOARD),1124)
219-
# Raise3D Rumba
219+
# Rumba
220220
else ifeq ($(HARDWARE_MOTHERBOARD),1125)
221-
# Rapide Lite RL200 Rumba
221+
# Raise3D Rumba
222222
else ifeq ($(HARDWARE_MOTHERBOARD),1126)
223-
# Formbot T-Rex 2 Plus
223+
# Rapide Lite RL200 Rumba
224224
else ifeq ($(HARDWARE_MOTHERBOARD),1127)
225-
# Formbot T-Rex 3
225+
# Formbot T-Rex 2 Plus
226226
else ifeq ($(HARDWARE_MOTHERBOARD),1128)
227-
# Formbot Raptor
227+
# Formbot T-Rex 3
228228
else ifeq ($(HARDWARE_MOTHERBOARD),1129)
229-
# Formbot Raptor 2
229+
# Formbot Raptor
230230
else ifeq ($(HARDWARE_MOTHERBOARD),1130)
231-
# bq ZUM Mega 3D
231+
# Formbot Raptor 2
232232
else ifeq ($(HARDWARE_MOTHERBOARD),1131)
233-
# MakeBoard Mini v2.1.2 is a control board sold by MicroMake
233+
# bq ZUM Mega 3D
234234
else ifeq ($(HARDWARE_MOTHERBOARD),1132)
235-
# TriGorilla Anycubic version 1.3 based on RAMPS EFB
235+
# MakeBoard Mini v2.1.2 is a control board sold by MicroMake
236236
else ifeq ($(HARDWARE_MOTHERBOARD),1133)
237-
# TriGorilla Anycubic version 1.4 based on RAMPS EFB
237+
# TriGorilla Anycubic version 1.3 based on RAMPS EFB
238238
else ifeq ($(HARDWARE_MOTHERBOARD),1134)
239-
# TriGorilla Anycubic version 1.4 Rev 1.1
239+
# TriGorilla Anycubic version 1.4 based on RAMPS EFB
240240
else ifeq ($(HARDWARE_MOTHERBOARD),1135)
241-
# Creality: Ender-4, CR-8
241+
# TriGorilla Anycubic version 1.4 Rev 1.1
242242
else ifeq ($(HARDWARE_MOTHERBOARD),1136)
243-
# Creality: CR10S, CR20, CR-X
243+
# Creality: Ender-4, CR-8
244244
else ifeq ($(HARDWARE_MOTHERBOARD),1137)
245-
# Dagoma F5
245+
# Creality: CR10S, CR20, CR-X
246246
else ifeq ($(HARDWARE_MOTHERBOARD),1138)
247-
# FYSETC F6 1.3
247+
# Dagoma F5
248248
else ifeq ($(HARDWARE_MOTHERBOARD),1139)
249-
# FYSETC F6 1.5
249+
# FYSETC F6 1.3
250250
else ifeq ($(HARDWARE_MOTHERBOARD),1140)
251-
# Duplicator i3 Plus
251+
# FYSETC F6 1.5
252252
else ifeq ($(HARDWARE_MOTHERBOARD),1141)
253-
# VORON
253+
# Duplicator i3 Plus
254254
else ifeq ($(HARDWARE_MOTHERBOARD),1142)
255-
# TRONXY V3 1.0
255+
# VORON
256256
else ifeq ($(HARDWARE_MOTHERBOARD),1143)
257-
# Z-Bolt X Series
257+
# TRONXY V3 1.0
258258
else ifeq ($(HARDWARE_MOTHERBOARD),1144)
259-
# TT OSCAR
259+
# Z-Bolt X Series
260260
else ifeq ($(HARDWARE_MOTHERBOARD),1145)
261-
# Overlord/Overlord Pro
261+
# TT OSCAR
262262
else ifeq ($(HARDWARE_MOTHERBOARD),1146)
263-
# ADIMLab Gantry v1
263+
# Overlord/Overlord Pro
264264
else ifeq ($(HARDWARE_MOTHERBOARD),1147)
265-
# ADIMLab Gantry v2
265+
# ADIMLab Gantry v1
266266
else ifeq ($(HARDWARE_MOTHERBOARD),1148)
267-
# BIQU Tango V1
267+
# ADIMLab Gantry v2
268268
else ifeq ($(HARDWARE_MOTHERBOARD),1149)
269-
# MKS GEN L V2
269+
# BIQU Tango V1
270270
else ifeq ($(HARDWARE_MOTHERBOARD),1150)
271-
# Copymaster 3D
271+
# MKS GEN L V2
272272
else ifeq ($(HARDWARE_MOTHERBOARD),1151)
273-
# Ortur 4
273+
# MKS GEN L V2.1
274274
else ifeq ($(HARDWARE_MOTHERBOARD),1152)
275-
# Tenlog D3 Hero
275+
# Copymaster 3D
276276
else ifeq ($(HARDWARE_MOTHERBOARD),1153)
277+
# Ortur 4
278+
else ifeq ($(HARDWARE_MOTHERBOARD),1154)
279+
# Tenlog D3 Hero
280+
else ifeq ($(HARDWARE_MOTHERBOARD),1155)
277281

278282
#
279283
# RAMBo and derivatives

0 commit comments

Comments
 (0)