Skip to content

Commit f7e4299

Browse files
petrzmaxpetrzmax
committed
Merge branch 'bugfix-2.0.x' into 2.0.x-Sapphire-Pro
2 parents bcf9f7d + 0b45493 commit f7e4299

Some content is hidden

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

83 files changed

+1216
-577
lines changed

‎.editorconfig

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# editorconfig.org
2+
root = true
3+
4+
[{*.patch,syntax_test_*}]
5+
trim_trailing_whitespace = false
6+
7+
[{*.c,*.cpp,*.h}]
8+
charset = utf-8
9+
10+
[{*.c,*.cpp,*.h,Makefile}]
11+
trim_trailing_whitespace = true
12+
insert_final_newline = true
13+
end_of_line = lf
14+
indent_style = space
15+
indent_size = 2
16+
17+
[{*.py,*.conf,*.sublime-project}]
18+
indent_style = tab
19+
indent_size = 4

‎Marlin/Configuration.h

+2-6
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 020000
39+
#define CONFIGURATION_H_VERSION 020004
4040

4141
//===========================================================================
4242
//============================= Getting Started =============================
@@ -693,11 +693,6 @@
693693
#define X_DRIVER_TYPE TMC2209
694694
#define Y_DRIVER_TYPE TMC2209
695695
#define Z_DRIVER_TYPE TMC2209
696-
//#define X2_DRIVER_TYPE A4988
697-
//#define Y2_DRIVER_TYPE A4988
698-
//#define Z2_DRIVER_TYPE A4988
699-
//#define Z3_DRIVER_TYPE A4988
700-
//#define Z4_DRIVER_TYPE A4988
701696
#define E0_DRIVER_TYPE TMC2209
702697
//#define E1_DRIVER_TYPE A4988
703698
//#define E2_DRIVER_TYPE A4988
@@ -1253,6 +1248,7 @@
12531248
#define MESH_TEST_HOTEND_TEMP 205 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
12541249
#define MESH_TEST_BED_TEMP 60 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
12551250
#define G26_XY_FEEDRATE 20 // (mm/s) Feedrate for XY Moves for the G26 Mesh Validation Tool.
1251+
#define G26_RETRACT_MULTIPLIER 1.0 // G26 Q (retraction) used by default between mesh test elements.
12561252
#endif
12571253

12581254
#endif

‎Marlin/Configuration_adv.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
* Basic settings can be found in Configuration.h
3232
*
3333
*/
34-
#define CONFIGURATION_ADV_H_VERSION 020000
34+
#define CONFIGURATION_ADV_H_VERSION 020004
3535

3636
// @section temperature
3737

@@ -840,8 +840,8 @@
840840

841841
// Define the pin to read during calibration
842842
#ifndef CALIBRATION_PIN
843-
#define CALIBRATION_PIN -1 // Override in pins.h or set to -1 to use your Z endstop
844-
#define CALIBRATION_PIN_INVERTING false // Set to true to invert the pin
843+
//#define CALIBRATION_PIN -1 // Define here to override the default pin
844+
#define CALIBRATION_PIN_INVERTING false // Set to true to invert the custom pin
845845
//#define CALIBRATION_PIN_PULLDOWN
846846
#define CALIBRATION_PIN_PULLUP
847847
#endif
@@ -1573,7 +1573,7 @@
15731573

15741574
// Add additional compensation depending on hotend temperature
15751575
// Note: this values cannot be calibrated and have to be set manually
1576-
#ifdef PROBE_TEMP_COMPENSATION
1576+
#if ENABLED(PROBE_TEMP_COMPENSATION)
15771577
// Max temperature that can be reached by heated bed.
15781578
// This is required only for the calibration process.
15791579
#define PTC_MAX_BED_TEMP 110

‎Marlin/Makefile

+73-68
Original file line numberDiff line numberDiff line change
@@ -180,88 +180,93 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1105)
180180
else ifeq ($(HARDWARE_MOTHERBOARD),1106)
181181
# MKS v1.5 with Allegro A4982 stepper drivers
182182
else ifeq ($(HARDWARE_MOTHERBOARD),1107)
183-
# MKS BASE 1.0 with Heroic HR4982 stepper drivers
183+
# MKS v1.6 with Allegro A4982 stepper drivers
184184
else ifeq ($(HARDWARE_MOTHERBOARD),1108)
185-
# MKS GEN v1.3 or 1.4
185+
186+
# MKS BASE 1.0 with Heroic HR4982 stepper drivers
186187
else ifeq ($(HARDWARE_MOTHERBOARD),1109)
187-
# MKS GEN L
188+
# MKS GEN v1.3 or 1.4
188189
else ifeq ($(HARDWARE_MOTHERBOARD),1110)
189-
# zrib V2.0 control board (Chinese knock off RAMPS replica)
190+
# MKS GEN L
190191
else ifeq ($(HARDWARE_MOTHERBOARD),1111)
191-
# BigTreeTech or BIQU KFB2.0
192+
# zrib V2.0 control board (Chinese knock off RAMPS replica)
192193
else ifeq ($(HARDWARE_MOTHERBOARD),1112)
193-
# Felix 2.0+ Electronics Board (RAMPS like)
194+
# BigTreeTech or BIQU KFB2.0
194195
else ifeq ($(HARDWARE_MOTHERBOARD),1113)
195-
# Invent-A-Part RigidBoard
196+
# Felix 2.0+ Electronics Board (RAMPS like)
196197
else ifeq ($(HARDWARE_MOTHERBOARD),1114)
197-
# Invent-A-Part RigidBoard V2
198+
# Invent-A-Part RigidBoard
198199
else ifeq ($(HARDWARE_MOTHERBOARD),1115)
199-
# Sainsmart 2-in-1 board
200+
# Invent-A-Part RigidBoard V2
200201
else ifeq ($(HARDWARE_MOTHERBOARD),1116)
201-
# Ultimaker
202+
# Sainsmart 2-in-1 board
202203
else ifeq ($(HARDWARE_MOTHERBOARD),1117)
203-
# Ultimaker (Older electronics. Pre 1.5.4. This is rare)
204+
# Ultimaker
204205
else ifeq ($(HARDWARE_MOTHERBOARD),1118)
206+
# Ultimaker (Older electronics. Pre 1.5.4. This is rare)
207+
else ifeq ($(HARDWARE_MOTHERBOARD),1119)
205208
MCU ?= atmega1280
206209

207210
# Azteeg X3
208-
else ifeq ($(HARDWARE_MOTHERBOARD),1119)
209-
# Azteeg X3 Pro
210211
else ifeq ($(HARDWARE_MOTHERBOARD),1120)
211-
# Ultimainboard 2.x (Uses TEMP_SENSOR 20)
212+
# Azteeg X3 Pro
212213
else ifeq ($(HARDWARE_MOTHERBOARD),1121)
213-
# Rumba
214+
# Ultimainboard 2.x (Uses TEMP_SENSOR 20)
214215
else ifeq ($(HARDWARE_MOTHERBOARD),1122)
215-
# Raise3D Rumba
216+
# Rumba
216217
else ifeq ($(HARDWARE_MOTHERBOARD),1123)
217-
# Rapide Lite RL200 Rumba
218+
# Raise3D Rumba
218219
else ifeq ($(HARDWARE_MOTHERBOARD),1124)
219-
# Formbot T-Rex 2 Plus
220+
# Rapide Lite RL200 Rumba
220221
else ifeq ($(HARDWARE_MOTHERBOARD),1125)
221-
# Formbot T-Rex 3
222+
# Formbot T-Rex 2 Plus
222223
else ifeq ($(HARDWARE_MOTHERBOARD),1126)
223-
# Formbot Raptor
224+
# Formbot T-Rex 3
224225
else ifeq ($(HARDWARE_MOTHERBOARD),1127)
225-
# Formbot Raptor 2
226+
# Formbot Raptor
226227
else ifeq ($(HARDWARE_MOTHERBOARD),1128)
227-
# bq ZUM Mega 3D
228+
# Formbot Raptor 2
228229
else ifeq ($(HARDWARE_MOTHERBOARD),1129)
229-
# MakeBoard Mini v2.1.2 is a control board sold by MicroMake
230+
# bq ZUM Mega 3D
230231
else ifeq ($(HARDWARE_MOTHERBOARD),1130)
231-
# TriGorilla Anycubic version 1.3 based on RAMPS EFB
232+
# MakeBoard Mini v2.1.2 is a control board sold by MicroMake
232233
else ifeq ($(HARDWARE_MOTHERBOARD),1131)
233-
# TriGorilla Anycubic version 1.4 based on RAMPS EFB
234+
# TriGorilla Anycubic version 1.3 based on RAMPS EFB
234235
else ifeq ($(HARDWARE_MOTHERBOARD),1132)
235-
# TriGorilla Anycubic version 1.4 Rev 1.1
236+
# TriGorilla Anycubic version 1.4 based on RAMPS EFB
236237
else ifeq ($(HARDWARE_MOTHERBOARD),1133)
237-
# Creality: Ender-4, CR-8
238+
# TriGorilla Anycubic version 1.4 Rev 1.1
238239
else ifeq ($(HARDWARE_MOTHERBOARD),1134)
239-
# Creality: CR10S, CR20, CR-X
240+
# Creality: Ender-4, CR-8
240241
else ifeq ($(HARDWARE_MOTHERBOARD),1135)
241-
# Dagoma F5
242+
# Creality: CR10S, CR20, CR-X
242243
else ifeq ($(HARDWARE_MOTHERBOARD),1136)
243-
# FYSETC F6
244+
# Dagoma F5
244245
else ifeq ($(HARDWARE_MOTHERBOARD),1137)
245-
# Duplicator i3 Plus
246+
# FYSETC F6 1.3
246247
else ifeq ($(HARDWARE_MOTHERBOARD),1138)
247-
# VORON
248+
# FYSETC F6 1.5
248249
else ifeq ($(HARDWARE_MOTHERBOARD),1139)
249-
# TRONXY V3 1.0
250+
# Duplicator i3 Plus
250251
else ifeq ($(HARDWARE_MOTHERBOARD),1140)
251-
# Z-Bolt X Series
252+
# VORON
252253
else ifeq ($(HARDWARE_MOTHERBOARD),1141)
253-
# TT OSCAR
254+
# TRONXY V3 1.0
254255
else ifeq ($(HARDWARE_MOTHERBOARD),1142)
255-
# Overlord/Overlord Pro
256+
# Z-Bolt X Series
256257
else ifeq ($(HARDWARE_MOTHERBOARD),1143)
257-
# ADIMLab Gantry v1
258+
# TT OSCAR
258259
else ifeq ($(HARDWARE_MOTHERBOARD),1144)
259-
# ADIMLab Gantry v2
260+
# Overlord/Overlord Pro
260261
else ifeq ($(HARDWARE_MOTHERBOARD),1145)
261-
# BIQU Tango V1
262+
# ADIMLab Gantry v1
262263
else ifeq ($(HARDWARE_MOTHERBOARD),1146)
263-
# MKS GEN L V2
264+
# ADIMLab Gantry v2
264265
else ifeq ($(HARDWARE_MOTHERBOARD),1147)
266+
# BIQU Tango V1
267+
else ifeq ($(HARDWARE_MOTHERBOARD),1148)
268+
# MKS GEN L V2
269+
else ifeq ($(HARDWARE_MOTHERBOARD),1149)
265270

266271
#
267272
# RAMBo and derivatives
@@ -784,22 +789,22 @@ sym: $(BUILD_DIR)/$(TARGET).sym
784789
# Do not try to reset an Arduino if it's not one
785790
upload: $(BUILD_DIR)/$(TARGET).hex
786791
ifeq (${AVRDUDE_PROGRAMMER}, arduino)
787-
stty hup < $(UPLOAD_PORT); true
792+
stty hup < $(UPLOAD_PORT); true
788793
endif
789-
$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH)
794+
$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH)
790795
ifeq (${AVRDUDE_PROGRAMMER}, arduino)
791-
stty -hup < $(UPLOAD_PORT); true
796+
stty -hup < $(UPLOAD_PORT); true
792797
endif
793798

794799
# Display size of file.
795800
HEXSIZE = $(SIZE) --target=$(FORMAT) $(BUILD_DIR)/$(TARGET).hex
796801
ELFSIZE = $(SIZE) $(SIZE_FLAGS) $(BUILD_DIR)/$(TARGET).elf; \
797802
$(SIZE) $(BUILD_DIR)/$(TARGET).elf
798803
sizebefore:
799-
$P if [ -f $(BUILD_DIR)/$(TARGET).elf ]; then echo; echo $(MSG_SIZE_BEFORE); $(HEXSIZE); echo; fi
804+
$P if [ -f $(BUILD_DIR)/$(TARGET).elf ]; then echo; echo $(MSG_SIZE_BEFORE); $(HEXSIZE); echo; fi
800805

801806
sizeafter: build
802-
$P if [ -f $(BUILD_DIR)/$(TARGET).elf ]; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); echo; fi
807+
$P if [ -f $(BUILD_DIR)/$(TARGET).elf ]; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); echo; fi
803808

804809

805810
# Convert ELF to COFF for use in debugging / simulating in AVR Studio or VMLAB.
@@ -811,71 +816,71 @@ COFFCONVERT=$(OBJCOPY) --debugging \
811816

812817

813818
coff: $(BUILD_DIR)/$(TARGET).elf
814-
$(COFFCONVERT) -O coff-avr $(BUILD_DIR)/$(TARGET).elf $(TARGET).cof
819+
$(COFFCONVERT) -O coff-avr $(BUILD_DIR)/$(TARGET).elf $(TARGET).cof
815820

816821

817822
extcoff: $(TARGET).elf
818-
$(COFFCONVERT) -O coff-ext-avr $(BUILD_DIR)/$(TARGET).elf $(TARGET).cof
823+
$(COFFCONVERT) -O coff-ext-avr $(BUILD_DIR)/$(TARGET).elf $(TARGET).cof
819824

820825

821826
.SUFFIXES: .elf .hex .eep .lss .sym .bin
822827
.PRECIOUS: .o
823828

824829
.elf.hex:
825-
$(Pecho) " COPY $@"
826-
$P $(OBJCOPY) -O $(FORMAT) -R .eeprom $< $@
830+
$(Pecho) " COPY $@"
831+
$P $(OBJCOPY) -O $(FORMAT) -R .eeprom $< $@
827832

828833
.elf.bin:
829-
$(Pecho) " COPY $@"
830-
$P $(OBJCOPY) -O binary -R .eeprom $< $@
834+
$(Pecho) " COPY $@"
835+
$P $(OBJCOPY) -O binary -R .eeprom $< $@
831836

832837
.elf.eep:
833-
-$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \
838+
-$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \
834839
--change-section-lma .eeprom=0 -O $(FORMAT) $< $@
835840

836841
# Create extended listing file from ELF output file.
837842
.elf.lss:
838-
$(OBJDUMP) -h -S $< > $@
843+
$(OBJDUMP) -h -S $< > $@
839844

840845
# Create a symbol table from ELF output file.
841846
.elf.sym:
842-
$(NM) -n $< > $@
847+
$(NM) -n $< > $@
843848

844849
# Link: create ELF output file from library.
845850

846851
$(BUILD_DIR)/$(TARGET).elf: $(OBJ) Configuration.h
847-
$(Pecho) " CXX $@"
848-
$P $(CC) $(LD_PREFIX) $(ALL_CXXFLAGS) -o $@ -L. $(OBJ) $(LDFLAGS) $(LD_SUFFIX)
852+
$(Pecho) " CXX $@"
853+
$P $(CC) $(LD_PREFIX) $(ALL_CXXFLAGS) -o $@ -L. $(OBJ) $(LDFLAGS) $(LD_SUFFIX)
849854

850855
# Object files that were found in "src" will be stored in $(BUILD_DIR)
851856
# in directories that mirror the structure of "src"
852857

853858
$(BUILD_DIR)/%.o: %.c Configuration.h Configuration_adv.h $(MAKEFILE)
854-
$(Pecho) " CC $<"
855-
$P $(CC) -MMD -c $(ALL_CFLAGS) $(CWARN) $< -o $@
859+
$(Pecho) " CC $<"
860+
$P $(CC) -MMD -c $(ALL_CFLAGS) $(CWARN) $< -o $@
856861

857862
$(BUILD_DIR)/%.o: %.cpp Configuration.h Configuration_adv.h $(MAKEFILE)
858-
$(Pecho) " CXX $<"
859-
$P $(CXX) -MMD -c $(ALL_CXXFLAGS) $(CXXWARN) $< -o $@
863+
$(Pecho) " CXX $<"
864+
$P $(CXX) -MMD -c $(ALL_CXXFLAGS) $(CXXWARN) $< -o $@
860865

861866
# Object files for Arduino libs will be created in $(BUILD_DIR)/arduino
862867

863868
$(BUILD_DIR)/arduino/%.o: %.c Configuration.h Configuration_adv.h $(MAKEFILE)
864-
$(Pecho) " CC $<"
865-
$P $(CC) -MMD -c $(ALL_CFLAGS) $(LIBWARN) $< -o $@
869+
$(Pecho) " CC $<"
870+
$P $(CC) -MMD -c $(ALL_CFLAGS) $(LIBWARN) $< -o $@
866871

867872
$(BUILD_DIR)/arduino/%.o: %.cpp Configuration.h Configuration_adv.h $(MAKEFILE)
868-
$(Pecho) " CXX $<"
869-
$P $(CXX) -MMD -c $(ALL_CXXFLAGS) $(LIBWARN) $< -o $@
873+
$(Pecho) " CXX $<"
874+
$P $(CXX) -MMD -c $(ALL_CXXFLAGS) $(LIBWARN) $< -o $@
870875

871876
$(BUILD_DIR)/arduino/%.o: %.S $(MAKEFILE)
872-
$(Pecho) " CXX $<"
873-
$P $(CXX) -MMD -c $(ALL_ASFLAGS) $< -o $@
877+
$(Pecho) " CXX $<"
878+
$P $(CXX) -MMD -c $(ALL_ASFLAGS) $< -o $@
874879

875880
# Target: clean project.
876881
clean:
877-
$(Pecho) " RMDIR $(BUILD_DIR)/"
878-
$P rm -rf $(BUILD_DIR)
882+
$(Pecho) " RMDIR $(BUILD_DIR)/"
883+
$P rm -rf $(BUILD_DIR)
879884

880885

881886
.PHONY: all build elf hex eep lss sym program coff extcoff clean depend sizebefore sizeafter

‎Marlin/src/HAL/HAL_AVR/inc/SanityCheck.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,6 @@
6060
#error "TMCStepper includes SoftwareSerial.h which is incompatible with ENDSTOP_INTERRUPTS_FEATURE. Disable ENDSTOP_INTERRUPTS_FEATURE to continue."
6161
#endif
6262

63-
#if TMC_HAS_SW_SERIAL && ENABLED(MONITOR_DRIVER_STATUS)
63+
#if HAS_TMC_SW_SERIAL && ENABLED(MONITOR_DRIVER_STATUS)
6464
#error "MONITOR_DRIVER_STATUS causes performance issues when used with SoftwareSerial-connected drivers. Disable MONITOR_DRIVER_STATUS or use hardware serial to continue."
6565
#endif

‎Marlin/src/HAL/HAL_DUE/EepromEmulation.cpp

+21
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
/**
2+
* Marlin 3D Printer Firmware
3+
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4+
*
5+
* Based on Sprinter and grbl.
6+
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
7+
*
8+
* This program is free software: you can redistribute it and/or modify
9+
* it under the terms of the GNU General Public License as published by
10+
* the Free Software Foundation, either version 3 of the License, or
11+
* (at your option) any later version.
12+
*
13+
* This program is distributed in the hope that it will be useful,
14+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16+
* GNU General Public License for more details.
17+
*
18+
* You should have received a copy of the GNU General Public License
19+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
20+
*
21+
*/
122

223
/* EEPROM emulation over flash with reduced wear
324
*

‎Marlin/src/HAL/HAL_DUE/inc/SanityCheck.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@
5656
#error "FAST_PWM_FAN is not yet implemented for this platform."
5757
#endif
5858

59-
#if TMC_HAS_SW_SERIAL
59+
#if HAS_TMC_SW_SERIAL
6060
#error "TMC220x Software Serial is not supported on this platform."
6161
#endif

‎Marlin/src/HAL/HAL_ESP32/inc/SanityCheck.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#error "FAST_PWM_FAN is not yet implemented for this platform."
3030
#endif
3131

32-
#if TMC_HAS_SW_SERIAL
32+
#if HAS_TMC_SW_SERIAL
3333
#error "TMC220x Software Serial is not supported on this platform."
3434
#endif
3535

‎Marlin/src/HAL/HAL_LINUX/inc/SanityCheck.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@
3434
#error "FAST_PWM_FAN is not yet implemented for this platform."
3535
#endif
3636

37-
#if TMC_HAS_SW_SERIAL
37+
#if HAS_TMC_SW_SERIAL
3838
#error "TMC220x Software Serial is not supported on this platform."
3939
#endif

0 commit comments

Comments
 (0)