Skip to content

Commit a896c56

Browse files
damvcoooldamvcoool
committed
Update to Marlin 2.0.4.4
1 parent ee694da commit a896c56

File tree

138 files changed

+1098
-868
lines changed

Some content is hidden

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

138 files changed

+1098
-868
lines changed

‎Marlin/Configuration.h

+3
Original file line numberDiff line numberDiff line change
@@ -671,6 +671,7 @@
671671
//#define Y2_DRIVER_TYPE A4988
672672
//#define Z2_DRIVER_TYPE A4988
673673
//#define Z3_DRIVER_TYPE A4988
674+
//#define Z4_DRIVER_TYPE A4988
674675
#define E0_DRIVER_TYPE TMC2209
675676
//#define E1_DRIVER_TYPE A4988
676677
//#define E2_DRIVER_TYPE A4988
@@ -776,6 +777,8 @@
776777
#define DEFAULT_YJERK 10.0
777778
#define DEFAULT_ZJERK 0.3
778779

780+
//#define TRAVEL_EXTRA_XYJERK 0.0 // Additional jerk allowance for all travel moves
781+
779782
//#define LIMITED_JERK_EDITING // Limit edit via M205 or LCD to DEFAULT_aJERK * 2
780783
#if ENABLED(LIMITED_JERK_EDITING)
781784
#define MAX_JERK_EDIT_VALUES { 20, 20, 0.6, 10 } // ...or, set your own edit limits

‎Marlin/Configuration_adv.h

+14-13
Original file line numberDiff line numberDiff line change
@@ -1044,7 +1044,7 @@
10441044
#if ENABLED(POWER_LOSS_RECOVERY)
10451045
//#define BACKUP_POWER_SUPPLY // Backup power / UPS to move the steppers on power loss
10461046
//#define POWER_LOSS_ZRAISE 2 // (mm) Z axis raise on resume (on power loss with UPS)
1047-
//#define POWER_LOSS_PIN 44 // Pin to detect power loss
1047+
//#define POWER_LOSS_PIN 44 // Pin to detect power loss. Set to -1 to disable default pin on boards without module.
10481048
//#define POWER_LOSS_STATE HIGH // State of pin indicating power loss
10491049
//#define POWER_LOSS_PULL // Set pullup / pulldown as appropriate
10501050
//#define POWER_LOSS_PURGE_LEN 20 // (mm) Length of filament to purge on resume
@@ -1172,18 +1172,16 @@
11721172
// Add an optimized binary file transfer mode, initiated with 'M28 B1'
11731173
//#define BINARY_FILE_TRANSFER
11741174

1175-
#if HAS_SDCARD_CONNECTION
1176-
/**
1177-
* Set this option to one of the following (or the board's defaults apply):
1178-
*
1179-
* LCD - Use the SD drive in the external LCD controller.
1180-
* ONBOARD - Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.)
1181-
* CUSTOM_CABLE - Use a custom cable to access the SD (as defined in a pins file).
1182-
*
1183-
* :[ 'LCD', 'ONBOARD', 'CUSTOM_CABLE' ]
1184-
*/
1185-
#define SDCARD_CONNECTION ONBOARD
1186-
#endif
1175+
/**
1176+
* Set this option to one of the following (or the board's defaults apply):
1177+
*
1178+
* LCD - Use the SD drive in the external LCD controller.
1179+
* ONBOARD - Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.)
1180+
* CUSTOM_CABLE - Use a custom cable to access the SD (as defined in a pins file).
1181+
*
1182+
* :[ 'LCD', 'ONBOARD', 'CUSTOM_CABLE' ]
1183+
*/
1184+
#define SDCARD_CONNECTION ONBOARD
11871185

11881186
#endif // SDSUPPORT
11891187

@@ -1260,6 +1258,7 @@
12601258
#define STATUS_HOTEND_ANIM // Use a second bitmap to indicate hotend heating
12611259
#define STATUS_BED_ANIM // Use a second bitmap to indicate bed heating
12621260
#define STATUS_CHAMBER_ANIM // Use a second bitmap to indicate chamber heating
1261+
//#define STATUS_CUTTER_ANIM // Use a second bitmap to indicate spindle / laser active
12631262
//#define STATUS_ALT_BED_BITMAP // Use the alternative bed bitmap
12641263
//#define STATUS_ALT_FAN_BITMAP // Use the alternative fan bitmap
12651264
//#define STATUS_FAN_FRAMES 3 // :[0,1,2,3,4] Number of fan animation frames
@@ -2791,6 +2790,8 @@
27912790
//#define GCODE_QUOTED_STRINGS // Support for quoted string parameters
27922791
#endif
27932792

2793+
//#define GCODE_CASE_INSENSITIVE // Accept G-code sent to the firmware in lowercase
2794+
27942795
/**
27952796
* CNC G-code options
27962797
* Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc.

‎Marlin/Version.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
/**
2929
* Marlin release version identifier
3030
*/
31-
//#define SHORT_BUILD_VERSION "2.0.4.3"
31+
//#define SHORT_BUILD_VERSION "2.0.4.4"
3232

3333
/**
3434
* Verbose version identifier which should contain a reference to the location

‎Marlin/src/HAL/HAL_AVR/persistent_store_eeprom.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
3939
if (v != eeprom_read_byte(p)) {
4040
eeprom_write_byte(p, v);
4141
if (eeprom_read_byte(p) != v) {
42-
SERIAL_ECHO_MSG(MSG_ERR_EEPROM_WRITE);
42+
SERIAL_ECHO_MSG(STR_ERR_EEPROM_WRITE);
4343
return true;
4444
}
4545
}

‎Marlin/src/HAL/HAL_AVR/watchdog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ void watchdog_init() {
6262
#if ENABLED(WATCHDOG_RESET_MANUAL)
6363
ISR(WDT_vect) {
6464
sei(); // With the interrupt driven serial we need to allow interrupts.
65-
SERIAL_ERROR_MSG(MSG_WATCHDOG_FIRED);
65+
SERIAL_ERROR_MSG(STR_WATCHDOG_FIRED);
6666
minkill(); // interrupt-safe final kill and infinite loop
6767
}
6868
#endif

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
5454
eeprom_write_byte(p, v);
5555
delay(2);
5656
if (eeprom_read_byte(p) != v) {
57-
SERIAL_ECHO_MSG(MSG_ERR_EEPROM_WRITE);
57+
SERIAL_ECHO_MSG(STR_ERR_EEPROM_WRITE);
5858
return true;
5959
}
6060
}

‎Marlin/src/HAL/HAL_LPC1768/MarlinSerial.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,21 @@
3232
}
3333
#endif
3434

35-
#if (defined(SERIAL_PORT) && SERIAL_PORT == 1) || (defined(SERIAL_PORT_2) && SERIAL_PORT_2 == 1) || (defined(DGUS_SERIAL_PORT) && DGUS_SERIAL_PORT == 1)
35+
#if SERIAL_PORT == 1 || SERIAL_PORT_2 == 1 || DGUS_SERIAL_PORT == 1
3636
MarlinSerial MSerial1((LPC_UART_TypeDef *) LPC_UART1);
3737
extern "C" void UART1_IRQHandler() {
3838
MSerial1.IRQHandler();
3939
}
4040
#endif
4141

42-
#if (defined(SERIAL_PORT) && SERIAL_PORT == 2) || (defined(SERIAL_PORT_2) && SERIAL_PORT_2 == 2) || (defined(DGUS_SERIAL_PORT) && DGUS_SERIAL_PORT == 2)
42+
#if SERIAL_PORT == 2 || SERIAL_PORT_2 == 2 || DGUS_SERIAL_PORT == 2
4343
MarlinSerial MSerial2(LPC_UART2);
4444
extern "C" void UART2_IRQHandler() {
4545
MSerial2.IRQHandler();
4646
}
4747
#endif
4848

49-
#if (defined(SERIAL_PORT) && SERIAL_PORT == 3) || (defined(SERIAL_PORT_2) && SERIAL_PORT_2 == 3) || (defined(DGUS_SERIAL_PORT) && DGUS_SERIAL_PORT == 3)
49+
#if SERIAL_PORT == 3 || SERIAL_PORT_2 == 3 || DGUS_SERIAL_PORT == 3
5050
MarlinSerial MSerial3(LPC_UART3);
5151
extern "C" void UART3_IRQHandler() {
5252
MSerial3.IRQHandler();

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

+49
Original file line numberDiff line numberDiff line change
@@ -76,3 +76,52 @@
7676
#if ENABLED(BAUD_RATE_GCODE)
7777
#error "BAUD_RATE_GCODE is not yet supported on LPC176x."
7878
#endif
79+
80+
/**
81+
* Flag any serial port conflicts
82+
*
83+
* Port | TX | RX |
84+
* --- | --- | --- |
85+
* Serial | P0_02 | P0_03 |
86+
* Serial1 | P0_15 | P0_16 |
87+
* Serial2 | P0_10 | P0_11 |
88+
* Serial3 | P0_00 | P0_01 |
89+
*/
90+
#if (defined(SERIAL_PORT) && SERIAL_PORT == 0) || (defined(SERIAL_PORT_2) && SERIAL_PORT_2 == 0) || (defined(DGUS_SERIAL_PORT) && DGUS_SERIAL_PORT == 0)
91+
#if X_CS_PIN == P0_02 || TMC_SW_MISO == P0_02 || (E_STEPPERS && E_MUX1_PIN == P0_02) \
92+
|| Y_CS_PIN == P0_03 || TMC_SW_MOSI == P0_03 || (E_STEPPERS && E_MUX0_PIN == P0_03)
93+
#error "Serial port assignment (0) conflicts with other pins!"
94+
#endif
95+
#endif
96+
97+
#if SERIAL_PORT == 1 || SERIAL_PORT_2 == 1 || DGUS_SERIAL_PORT == 1
98+
#if TMC_SW_SCK == P0_15
99+
#error "Serial port assignment (1) conflicts with other pins!"
100+
#elif HAS_SPI_LCD
101+
#if BTN_EN2 == P0_15 || SCK_PIN == P0_15 || LCD_PINS_D4 == P0_15 || DOGLCD_SCK == P0_15 || LCD_RESET_PIN == P0_15 || LCD_PINS_RS == P0_15 || SHIFT_CLK == P0_15 \
102+
|| BTN_EN1 == P0_16 || LCD_SDSS == P0_16 || LCD_PINS_RS == P0_16 || MISO_PIN == P0_16 || DOGLCD_A0 == P0_16 || SS_PIN == P0_16 || LCD_SDSS == P0_16 || DOGLCD_CS == P0_16 || LCD_RESET_PIN == P0_16 || LCD_BACKLIGHT_PIN == P0_16
103+
#error "Serial port assignment (1) conflicts with other pins!"
104+
#endif
105+
#endif
106+
#endif
107+
108+
#if SERIAL_PORT == 2 || SERIAL_PORT_2 == 2 || DGUS_SERIAL_PORT == 2
109+
#if Y_MIN_PIN == P0_10 || Z_MIN_PROBE_PIN == P0_10 \
110+
|| X_ENABLE_PIN == P0_10 || Y_ENABLE_PIN == P0_10 || X2_ENABLE_PIN == P0_10 || Y2_ENABLE_PIN == P0_10 || Z2_ENABLE_PIN == P0_10 || Z3_ENABLE_PIN == P0_10 || Z4_ENABLE_PIN == P0_10 \
111+
|| X2_CS_PIN == P0_10 || Y2_CS_PIN == P0_10 || Z2_CS_PIN == P0_10 || Z3_CS_PIN == P0_10 || Z4_CS_PIN == P0_10 \
112+
|| X_DIR_PIN == P0_11 || Y_DIR_PIN == P0_11 || X2_DIR_PIN == P0_11 || Y2_DIR_PIN == P0_11 || Z2_DIR_PIN == P0_11 || Z3_DIR_PIN == P0_11 || Z4_DIR_PIN == P0_11 \
113+
|| X2_STEP_PIN == P0_11 || Y2_STEP_PIN == P0_11 || Z2_STEP_PIN == P0_11 || Z3_STEP_PIN == P0_11 || Z4_STEP_PIN == P0_11
114+
#error "Serial port assignment (2) conflicts with other pins!"
115+
#elif (E_STEPPERS > 1 && (E1_ENABLE_PIN == P0_10 || E1_CS_PIN == P0_10)) || (E_STEPPERS > 0 && (E0_DIR_PIN == P0_11 || E0_STEP_PIN == P0_11))
116+
#error "Serial port assignment (2) conflicts with other pins!"
117+
#endif
118+
#endif
119+
120+
#if SERIAL_PORT == 3 || SERIAL_PORT_2 == 3 || DGUS_SERIAL_PORT == 3
121+
#if X_MIN_PIN == P0_00 || Y_SERIAL_TX_PIN == P0_00 || Y_SERIAL_RX_PIN == P0_00 \
122+
|| X_MAX_PIN == P0_01 || X_SERIAL_TX_PIN == P0_01 || X_SERIAL_RX_PIN == P0_01
123+
#error "Serial port assignment (2) conflicts with other pins!"
124+
#elif E_STEPPERS > 1 && (E1_DIR_PIN == P0_00 || E1_STEP_PIN == P0_01)
125+
#error "Serial port assignment (2) conflicts with other pins!"
126+
#endif
127+
#endif

‎Marlin/src/HAL/HAL_SAMD51/persistent_store_eeprom.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
7272
eeprom_write_byte(p, v);
7373
delay(2);
7474
if (eeprom_read_byte(p) != v) {
75-
SERIAL_ECHO_MSG(MSG_ERR_EEPROM_WRITE);
75+
SERIAL_ECHO_MSG(STR_ERR_EEPROM_WRITE);
7676
return true;
7777
}
7878
}

‎Marlin/src/HAL/HAL_STM32/persistent_store_impl.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
4848
if (v != eeprom_read_byte(p)) {
4949
eeprom_write_byte(p, v);
5050
if (eeprom_read_byte(p) != v) {
51-
SERIAL_ECHO_MSG(MSG_ERR_EEPROM_WRITE);
51+
SERIAL_ECHO_MSG(STR_ERR_EEPROM_WRITE);
5252
return true;
5353
}
5454
}

‎Marlin/src/HAL/HAL_STM32F1/persistent_store_eeprom.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
4949
if (v != eeprom_read_byte(p)) {
5050
eeprom_write_byte(p, v);
5151
if (eeprom_read_byte(p) != v) {
52-
SERIAL_ECHO_MSG(MSG_ERR_EEPROM_WRITE);
52+
SERIAL_ECHO_MSG(STR_ERR_EEPROM_WRITE);
5353
return true;
5454
}
5555
}

‎Marlin/src/HAL/HAL_STM32_F4_F7/persistent_store_eeprom.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
4141
if (v != eeprom_read_byte(p)) {
4242
eeprom_write_byte(p, v);
4343
if (eeprom_read_byte(p) != v) {
44-
SERIAL_ECHO_MSG(MSG_ERR_EEPROM_WRITE);
44+
SERIAL_ECHO_MSG(STR_ERR_EEPROM_WRITE);
4545
return true;
4646
}
4747
}

‎Marlin/src/HAL/HAL_TEENSY31_32/persistent_store_impl.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
3636
if (v != eeprom_read_byte(p)) {
3737
eeprom_write_byte(p, v);
3838
if (eeprom_read_byte(p) != v) {
39-
SERIAL_ECHO_MSG(MSG_ERR_EEPROM_WRITE);
39+
SERIAL_ECHO_MSG(STR_ERR_EEPROM_WRITE);
4040
return true;
4141
}
4242
}

‎Marlin/src/HAL/HAL_TEENSY35_36/persistent_store_eeprom.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
4242
if (v != eeprom_read_byte(p)) {
4343
eeprom_write_byte(p, v);
4444
if (eeprom_read_byte(p) != v) {
45-
SERIAL_ECHO_MSG(MSG_ERR_EEPROM_WRITE);
45+
SERIAL_ECHO_MSG(STR_ERR_EEPROM_WRITE);
4646
return true;
4747
}
4848
}

0 commit comments

Comments
 (0)