diff --git a/Marlin/src/HAL/HAL_ESP32/HAL.cpp b/Marlin/src/HAL/HAL_ESP32/HAL.cpp index dc6d84e96..d9afa13ab 100644 --- a/Marlin/src/HAL/HAL_ESP32/HAL.cpp +++ b/Marlin/src/HAL/HAL_ESP32/HAL.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include "../../inc/MarlinConfigPre.h" @@ -105,6 +106,27 @@ void HAL_init_board() { #endif server.begin(); #endif + + // ESP32 uses a GPIO matrix that allows pins to be assigned to hardware serial ports. + // The following code initializes hardware Serial1 and Serial2 to use user-defined pins + // if they have been defined. + #if defined(HARDWARE_SERIAL1_RX) && defined(HARDWARE_SERIAL1_TX) + HardwareSerial Serial1(1); + #ifdef TMC_BAUD_RATE // use TMC_BAUD_RATE for Serial1 if defined + Serial1.begin(TMC_BAUD_RATE, SERIAL_8N1, HARDWARE_SERIAL1_RX, HARDWARE_SERIAL1_TX); + #else // use default BAUDRATE if TMC_BAUD_RATE not defined + Serial1.begin(BAUDRATE, SERIAL_8N1, HARDWARE_SERIAL1_RX, HARDWARE_SERIAL1_TX); + #endif + #endif + #if defined(HARDWARE_SERIAL2_RX) && defined(HARDWARE_SERIAL2_TX) + HardwareSerial Serial2(2); + #ifdef TMC_BAUD_RATE // use TMC_BAUD_RATE for Serial1 if defined + Serial2.begin(TMC_BAUD_RATE, SERIAL_8N1, HARDWARE_SERIAL2_RX, HARDWARE_SERIAL2_TX); + #else // use default BAUDRATE if TMC_BAUD_RATE not defined + Serial2.begin(BAUDRATE, SERIAL_8N1, HARDWARE_SERIAL2_RX, HARDWARE_SERIAL2_TX); + #endif + #endif + } void HAL_idletask() { diff --git a/Marlin/src/gcode/lcd/M0_M1.cpp b/Marlin/src/gcode/lcd/M0_M1.cpp index 9ed7b2af4..bf6a3d23d 100644 --- a/Marlin/src/gcode/lcd/M0_M1.cpp +++ b/Marlin/src/gcode/lcd/M0_M1.cpp @@ -102,7 +102,7 @@ void GcodeSuite::M0_M1() { #endif if (ms > 0) ms += millis(); // wait until this time for a click - while (wait_for_user && (ms > 0 || PENDING(millis(), ms))) idle(); + while (wait_for_user || (ms > 0 && PENDING(millis(), ms))) idle(); #if HAS_LEDS_OFF_FLAG printerEventLEDs.onResumeAfterWait(); diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h index 1ae71e2ac..88cd49f57 100644 --- a/Marlin/src/inc/SanityCheck.h +++ b/Marlin/src/inc/SanityCheck.h @@ -2474,6 +2474,86 @@ static_assert( _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2) constexpr char _chr5 = USER_GCODE_5[strlen(USER_GCODE_5) - 1]; static_assert(_chr5 != '\n' && _chr5 != '\r', "USER_GCODE_5 cannot have a newline at the end. Please remove it."); #endif + #ifdef USER_GCODE_6 + constexpr char _chr6 = USER_GCODE_6[strlen(USER_GCODE_6) - 1]; + static_assert(_chr6 != '\n' && _chr6 != '\r', "USER_GCODE_6 cannot have a newline at the end. Please remove it."); + #endif + #ifdef USER_GCODE_7 + constexpr char _chr7 = USER_GCODE_7[strlen(USER_GCODE_7) - 1]; + static_assert(_chr7 != '\n' && _chr7 != '\r', "USER_GCODE_7 cannot have a newline at the end. Please remove it."); + #endif + #ifdef USER_GCODE_8 + constexpr char _chr8 = USER_GCODE_8[strlen(USER_GCODE_8) - 1]; + static_assert(_chr8 != '\n' && _chr8 != '\r', "USER_GCODE_8 cannot have a newline at the end. Please remove it."); + #endif + #ifdef USER_GCODE_9 + constexpr char _chr9 = USER_GCODE_9[strlen(USER_GCODE_9) - 1]; + static_assert(_chr9 != '\n' && _chr9 != '\r', "USER_GCODE_9 cannot have a newline at the end. Please remove it."); + #endif + #ifdef USER_GCODE_10 + constexpr char _chr10 = USER_GCODE_10[strlen(USER_GCODE_10) - 1]; + static_assert(_chr10 != '\n' && _chr10 != '\r', "USER_GCODE_10 cannot have a newline at the end. Please remove it."); + #endif + #ifdef USER_GCODE_11 + constexpr char _chr11 = USER_GCODE_11[strlen(USER_GCODE_11) - 1]; + static_assert(_chr11 != '\n' && _chr11 != '\r', "USER_GCODE_11 cannot have a newline at the end. Please remove it."); + #endif + #ifdef USER_GCODE_12 + constexpr char _chr12 = USER_GCODE_12[strlen(USER_GCODE_12) - 1]; + static_assert(_chr12 != '\n' && _chr12 != '\r', "USER_GCODE_12 cannot have a newline at the end. Please remove it."); + #endif + #ifdef USER_GCODE_13 + constexpr char _chr13 = USER_GCODE_13[strlen(USER_GCODE_13) - 1]; + static_assert(_chr13 != '\n' && _chr13 != '\r', "USER_GCODE_13 cannot have a newline at the end. Please remove it."); + #endif + #ifdef USER_GCODE_14 + constexpr char _chr14 = USER_GCODE_14[strlen(USER_GCODE_14) - 1]; + static_assert(_chr14 != '\n' && _chr14 != '\r', "USER_GCODE_14 cannot have a newline at the end. Please remove it."); + #endif + #ifdef USER_GCODE_15 + constexpr char _chr15 = USER_GCODE_15[strlen(USER_GCODE_15) - 1]; + static_assert(_chr15 != '\n' && _chr15 != '\r', "USER_GCODE_15 cannot have a newline at the end. Please remove it."); + #endif + #ifdef USER_GCODE_16 + constexpr char _chr16 = USER_GCODE_16[strlen(USER_GCODE_16) - 1]; + static_assert(_chr16 != '\n' && _chr16 != '\r', "USER_GCODE_16 cannot have a newline at the end. Please remove it."); + #endif + #ifdef USER_GCODE_17 + constexpr char _chr17 = USER_GCODE_17[strlen(USER_GCODE_17) - 1]; + static_assert(_chr17 != '\n' && _chr17 != '\r', "USER_GCODE_17 cannot have a newline at the end. Please remove it."); + #endif + #ifdef USER_GCODE_18 + constexpr char _chr18 = USER_GCODE_18[strlen(USER_GCODE_18) - 1]; + static_assert(_chr18 != '\n' && _chr18 != '\r', "USER_GCODE_18 cannot have a newline at the end. Please remove it."); + #endif + #ifdef USER_GCODE_19 + constexpr char _chr19 = USER_GCODE_19[strlen(USER_GCODE_19) - 1]; + static_assert(_chr19 != '\n' && _chr19 != '\r', "USER_GCODE_19 cannot have a newline at the end. Please remove it."); + #endif + #ifdef USER_GCODE_20 + constexpr char _chr20 = USER_GCODE_20[strlen(USER_GCODE_20) - 1]; + static_assert(_chr20 != '\n' && _chr20 != '\r', "USER_GCODE_20 cannot have a newline at the end. Please remove it."); + #endif + #ifdef USER_GCODE_21 + constexpr char _chr21 = USER_GCODE_21[strlen(USER_GCODE_21) - 1]; + static_assert(_chr21 != '\n' && _chr21 != '\r', "USER_GCODE_21 cannot have a newline at the end. Please remove it."); + #endif + #ifdef USER_GCODE_22 + constexpr char _chr22 = USER_GCODE_22[strlen(USER_GCODE_22) - 1]; + static_assert(_chr22 != '\n' && _chr22 != '\r', "USER_GCODE_22 cannot have a newline at the end. Please remove it."); + #endif + #ifdef USER_GCODE_23 + constexpr char _chr23 = USER_GCODE_23[strlen(USER_GCODE_23) - 1]; + static_assert(_chr23 != '\n' && _chr23 != '\r', "USER_GCODE_23 cannot have a newline at the end. Please remove it."); + #endif + #ifdef USER_GCODE_24 + constexpr char _chr24 = USER_GCODE_24[strlen(USER_GCODE_24) - 1]; + static_assert(_chr24 != '\n' && _chr24 != '\r', "USER_GCODE_24 cannot have a newline at the end. Please remove it."); + #endif + #ifdef USER_GCODE_25 + constexpr char _chr25 = USER_GCODE_25[strlen(USER_GCODE_25) - 1]; + static_assert(_chr25 != '\n' && _chr25 != '\r', "USER_GCODE_25 cannot have a newline at the end. Please remove it."); + #endif #endif #if ENABLED(BACKLASH_COMPENSATION) diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h index d6833b414..d9a795cf9 100644 --- a/Marlin/src/inc/Version.h +++ b/Marlin/src/inc/Version.h @@ -42,7 +42,7 @@ * version was tagged. */ #ifndef STRING_DISTRIBUTION_DATE - #define STRING_DISTRIBUTION_DATE "2020-02-22" + #define STRING_DISTRIBUTION_DATE "2020-02-23" #endif /** diff --git a/Marlin/src/pins/esp32/pins_MRR_ESPA.h b/Marlin/src/pins/esp32/pins_MRR_ESPA.h index a984ddbe1..a93f0f05c 100644 --- a/Marlin/src/pins/esp32/pins_MRR_ESPA.h +++ b/Marlin/src/pins/esp32/pins_MRR_ESPA.h @@ -101,3 +101,10 @@ #define SDSS 5 #define USES_SHARED_SPI // SPI is shared by SD card with TMC SPI drivers +// Hardware serial pins +// Add the following to Configuration.h or Configuration_adv.h to assign +// specific pins to hardware Serial1. +// Note: Serial2 can be defined using HARDWARE_SERIAL2_RX and HARDWARE_SERIAL2_TX but +// MRR ESPA does not have enough spare pins for such reassignment. +//#define HARDWARE_SERIAL1_RX 21 +//#define HARDWARE_SERIAL1_TX 22 diff --git a/Marlin/src/pins/esp32/pins_MRR_ESPE.h b/Marlin/src/pins/esp32/pins_MRR_ESPE.h index cffdfa465..009602715 100644 --- a/Marlin/src/pins/esp32/pins_MRR_ESPE.h +++ b/Marlin/src/pins/esp32/pins_MRR_ESPE.h @@ -139,7 +139,7 @@ #define BEEPER_PIN 151 //#define LCD_PINS_D5 150 - //#define LCD_PINS_D6 151 + //#define LCD_PINS_D6 152 //#define LCD_PINS_D7 153 #else @@ -153,3 +153,13 @@ #define BTN_ENC 14 #endif // HAS_GRAPHICAL_LCD + +// Hardware serial pins +// Add the following to Configuration.h or Configuration_adv.h to assign +// specific pins to hardware Serial1 and Serial2. +// Note: Serial2 can be defined using HARDWARE_SERIAL2_RX and HARDWARE_SERIAL2_TX but +// MRR ESPA does not have enough spare pins for such reassignment. +//#define HARDWARE_SERIAL1_RX 21 +//#define HARDWARE_SERIAL1_TX 22 +//#define HARDWARE_SERIAL2_RX 2 +//#define HARDWARE_SERIAL2_TX 4 diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h index 2bb57c09f..b90ac07a7 100644 --- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h +++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h @@ -232,9 +232,19 @@ * EXP2 EXP1 */ #if HAS_SPI_LCD - #define BTN_ENC P0_28 // (58) open-drain + #if ENABLED(ANET_FULL_GRAPHICS_LCD) - #if ENABLED(CR10_STOCKDISPLAY) + #define LCD_PINS_RS P1_23 + + #define BTN_EN1 P1_20 + #define BTN_EN2 P1_22 + #define BTN_ENC P1_18 + + #define LCD_PINS_ENABLE P1_21 + #define LCD_PINS_D4 P1_19 + + #elif ENABLED(CR10_STOCKDISPLAY) + #define BTN_ENC P0_28 // (58) open-drain #define LCD_PINS_RS P1_22 #define BTN_EN1 P1_18 @@ -244,6 +254,7 @@ #define LCD_PINS_D4 P1_21 #else + #define BTN_ENC P0_28 // (58) open-drain #define LCD_PINS_RS P1_19 #define BTN_EN1 P3_26 // (31) J3-2 & AUX-4