Merge remote-tracking branch 'upstream/bugfix-2.0.x' into ender3v2_bu…

…gfix * upstream/bugfix-2.0.x: (61 commits) [cron] Bump distribution date (2021-05-30) ✨ Malyan M180 (MarlinFirmware#21992) 🌐 Update Polish language (MarlinFirmware#21993) [cron] Bump distribution date (2021-05-29) [cron] Bump distribution date (2021-05-28) 🥅 Add MESH_EDIT_MENU sanity check (MarlinFirmware#21922) 🚸 cap:HOST_ACTION_COMMANDS (MarlinFirmware#21987) [cron] Bump distribution date (2021-05-27) [cron] Bump distribution date (2021-05-26) 🐛 Fix BTT002 variant MMU2 serial pins 🧩 (MarlinFirmware#21980) ♻️ LEDs refactor and extend (MarlinFirmware#21962) [cron] Bump distribution date (2021-05-25) 🩹 Fix multi_volume + SDIO onboard compile (MarlinFirmware#21975) ♻️ Refactor Linear / Logical / Distinct Axes (MarlinFirmware#21953) 🩹 Improved SKR2 12864 LCD Delays (MarlinFirmware#21956) 🐛 Fix Octopus HS USB (MarlinFirmware#21961) 🐛 Fix flowmeter calculation (MarlinFirmware#21959) 🎨 Macros for optional arguments (MarlinFirmware#21969) ⚡️ PIO filters for M117, M300 and M414 (MarlinFirmware#21972) [cron] Bump distribution date (2021-05-24) ... # Conflicts: # Marlin/Configuration.h
TyMi · May 30, 2021 · 81e3154 · 81e3154
2 parents 99a7c00 + 52ae3e6
commit 81e3154
Show file tree

Hide file tree

Showing 159 changed files with 2,759 additions and 2,264 deletions.
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
@@ -1302,6 +1302,8 @@
 
  //#define BROWSE_MEDIA_ON_INSERT // Open the file browser when media is inserted
 
+ //#define MEDIA_MENU_AT_TOP // Force the media menu to be listed on the top of the main menu
+
  #define EVENT_GCODE_SD_ABORT "G28XY" // G-code to run on SD Abort Print (e.g., "G28XY" or "G27")
 
  #if ENABLED(PRINTER_EVENT_LEDS)
@@ -2115,9 +2117,6 @@
  //#define SERIAL_XON_XOFF
 #endif
 
-// Add M575 G-code to change the baud rate
-//#define BAUD_RATE_GCODE
-
 #if ENABLED(SDSUPPORT)
  // Enable this option to collect and display the maximum
  // RX queue usage after transferring a file to SD.

diff --git a/Marlin/src/HAL/AVR/pinsDebug.h b/Marlin/src/HAL/AVR/pinsDebug.h
@@ -38,7 +38,7 @@
  // portModeRegister takes a different argument
  #define digitalPinToTimer_DEBUG(p) digitalPinToTimer(p)
  #define digitalPinToBitMask_DEBUG(p) digitalPinToBitMask(p)
- #define digitalPinToPort_DEBUG(p) digitalPinToPort_Teensy(p)
+ #define digitalPinToPort_DEBUG(p) digitalPinToPort(p)
  #define GET_PINMODE(pin) (*portModeRegister(pin) & digitalPinToBitMask_DEBUG(pin))
 
 #elif AVR_ATmega2560_FAMILY_PLUS_70 // So we can access/display all the pins on boards using more than 70

diff --git a/Marlin/src/HAL/LPC1768/inc/SanityCheck.h b/Marlin/src/HAL/LPC1768/inc/SanityCheck.h
@@ -144,7 +144,7 @@ static_assert(DISABLED(BAUD_RATE_GCODE), "BAUD_RATE_GCODE is not yet supported o
  #error "Serial port pins (2) conflict with Z4 pins!"
  #elif ANY_RX(2, X_DIR_PIN, Y_DIR_PIN)
  #error "Serial port pins (2) conflict with other pins!"
- #elif Y_HOME_DIR < 0 && IS_TX2(Y_STOP_PIN)
+ #elif Y_HOME_TO_MIN && IS_TX2(Y_STOP_PIN)
  #error "Serial port pins (2) conflict with Y endstop pin!"
  #elif HAS_CUSTOM_PROBE_PIN && IS_TX2(Z_MIN_PROBE_PIN)
  #error "Serial port pins (2) conflict with probe pin!"

diff --git a/Marlin/src/HAL/STM32F1/timers.h b/Marlin/src/HAL/STM32F1/timers.h
@@ -80,7 +80,7 @@ typedef uint16_t hal_timer_t;
  //#define TEMP_TIMER_NUM 4 // 2->4, Timer 2 for Stepper Current PWM
 #endif
 
-#if MB(BTT_SKR_MINI_E3_V1_0, BTT_SKR_E3_DIP, BTT_SKR_MINI_E3_V1_2, MKS_ROBIN_LITE)
+#if MB(BTT_SKR_MINI_E3_V1_0, BTT_SKR_E3_DIP, BTT_SKR_MINI_E3_V1_2, MKS_ROBIN_LITE, MKS_ROBIN_E3D, MKS_ROBIN_E3)
  // SKR Mini E3 boards use PA8 as FAN_PIN, so TIMER 1 is used for Fan PWM.
  #ifdef STM32_HIGH_DENSITY
  #define SERVO0_TIMER_NUM 8 // tone.cpp uses Timer 4

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
@@ -1073,11 +1073,17 @@ void setup() {
  while (!MYSERIAL1.connected() && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
 
  #if HAS_MULTI_SERIAL && !HAS_ETHERNET
- MYSERIAL2.begin(BAUDRATE);
+ #ifndef BAUDRATE_2
+ #define BAUDRATE_2 BAUDRATE
+ #endif
+ MYSERIAL2.begin(BAUDRATE_2);
  serial_connect_timeout = millis() + 1000UL;
  while (!MYSERIAL2.connected() && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
  #ifdef SERIAL_PORT_3
- MYSERIAL3.begin(BAUDRATE);
+ #ifndef BAUDRATE_3
+ #define BAUDRATE_3 BAUDRATE
+ #endif
+ MYSERIAL3.begin(BAUDRATE_3);
  serial_connect_timeout = millis() + 1000UL;
  while (!MYSERIAL3.connected() && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
  #endif
@@ -1488,7 +1494,7 @@ void setup() {
  #endif
 
  #if HAS_TRINAMIC_CONFIG && DISABLED(PSU_DEFAULT_OFF)
- SETUP_RUN(test_tmc_connection(true, true, true, true));
+ SETUP_RUN(test_tmc_connection());
  #endif
 
  #if HAS_DRIVER_SAFE_POWER_PROTECT

diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
@@ -159,6 +159,7 @@
 #define BOARD_PICA_REVB 1324 // PICA Shield (original version)
 #define BOARD_PICA 1325 // PICA Shield (rev C or later)
 #define BOARD_INTAMSYS40 1326 // Intamsys 4.0 (Funmat HT)
+#define BOARD_MALYAN_M180 1327 // Malyan M180 Mainboard Version 2 (no display function, direct gcode only)
 
 //
 // ATmega1281, ATmega2561

diff --git a/Marlin/src/core/debug_section.h b/Marlin/src/core/debug_section.h
@@ -44,6 +44,6 @@ class SectionLog {
  SERIAL_ECHOPGM_P(the_msg);
  }
  SERIAL_CHAR(' ');
- print_xyz(current_position);
+ print_pos(current_position);
  }
 };
diff --git a/Marlin/src/core/language.h b/Marlin/src/core/language.h
@@ -140,25 +140,7 @@
 #define STR_RESEND "Resend: "
 #define STR_UNKNOWN_COMMAND "Unknown command: \""
 #define STR_ACTIVE_EXTRUDER "Active Extruder: "
-#define STR_X_MIN "x_min"
-#define STR_X_MAX "x_max"
-#define STR_X2_MIN "x2_min"
-#define STR_X2_MAX "x2_max"
-#define STR_Y_MIN "y_min"
-#define STR_Y_MAX "y_max"
-#define STR_Y2_MIN "y2_min"
-#define STR_Y2_MAX "y2_max"
-#define STR_Z_MIN "z_min"
-#define STR_Z_MAX "z_max"
-#define STR_Z2_MIN "z2_min"
-#define STR_Z2_MAX "z2_max"
-#define STR_Z3_MIN "z3_min"
-#define STR_Z3_MAX "z3_max"
-#define STR_Z4_MIN "z4_min"
-#define STR_Z4_MAX "z4_max"
-#define STR_Z_PROBE "z_probe"
-#define STR_PROBE_EN "probe_en"
-#define STR_FILAMENT_RUNOUT_SENSOR "filament"
+
 #define STR_PROBE_OFFSET "Probe Offset"
 #define STR_SKEW_MIN "min_skew_factor: "
 #define STR_SKEW_MAX "max_skew_factor: "
@@ -277,14 +259,30 @@
 #define STR_REMINDER_SAVE_SETTINGS "Remember to save!"
 #define STR_PASSWORD_SET "Password is "
 
-// LCD Menu Messages
-
-#define LANGUAGE_DATA_INCL_(M) STRINGIFY_(fontdata/langdata_##M.h)
-#define LANGUAGE_DATA_INCL(M) LANGUAGE_DATA_INCL_(M)
-
-#define LANGUAGE_INCL_(M) STRINGIFY_(../lcd/language/language_##M.h)
-#define LANGUAGE_INCL(M) LANGUAGE_INCL_(M)
+//
+// Endstop Names used by Endstops::report_states
+//
+#define STR_X_MIN "x_min"
+#define STR_X_MAX "x_max"
+#define STR_X2_MIN "x2_min"
+#define STR_X2_MAX "x2_max"
+#define STR_Y_MIN "y_min"
+#define STR_Y_MAX "y_max"
+#define STR_Y2_MIN "y2_min"
+#define STR_Y2_MAX "y2_max"
+#define STR_Z_MIN "z_min"
+#define STR_Z_MAX "z_max"
+#define STR_Z2_MIN "z2_min"
+#define STR_Z2_MAX "z2_max"
+#define STR_Z3_MIN "z3_min"
+#define STR_Z3_MAX "z3_max"
+#define STR_Z4_MIN "z4_min"
+#define STR_Z4_MAX "z4_max"
+#define STR_Z_PROBE "z_probe"
+#define STR_PROBE_EN "probe_en"
+#define STR_FILAMENT_RUNOUT_SENSOR "filament"
 
+// General axis names
 #define STR_X "X"
 #define STR_Y "Y"
 #define STR_Z "Z"
@@ -386,6 +384,14 @@
 #define LCD_STR_E6 "E" LCD_STR_N6
 #define LCD_STR_E7 "E" LCD_STR_N7
 
+// Include localized LCD Menu Messages
+
+#define LANGUAGE_DATA_INCL_(M) STRINGIFY_(fontdata/langdata_##M.h)
+#define LANGUAGE_DATA_INCL(M) LANGUAGE_DATA_INCL_(M)
+
+#define LANGUAGE_INCL_(M) STRINGIFY_(../lcd/language/language_##M.h)
+#define LANGUAGE_INCL(M) LANGUAGE_INCL_(M)
+
 // Use superscripts, if possible. Evaluated at point of use.
 #define SUPERSCRIPT_TWO TERN(NOT_EXTENDED_ISO10646_1_5X7, "^2", "²")
 #define SUPERSCRIPT_THREE TERN(NOT_EXTENDED_ISO10646_1_5X7, "^3", "³")

diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
@@ -195,6 +195,11 @@
 #define __TERN(T,V...) ___TERN(_CAT(_NO,T),V) // Prepend '_NO' to get '_NOT_0' or '_NOT_1'
 #define ___TERN(P,V...) THIRD(P,V) // If first argument has a comma, A. Else B.
 
+#define _OPTARG(A) , A
+#define OPTARG(O,A) TERN_(O,DEFER4(_OPTARG)(A))
+#define _OPTCODE(A) A;
+#define OPTCODE(O,A) TERN_(O,DEFER4(_OPTCODE)(A))
+
 // Macros to avoid 'f + 0.0' which is not always optimized away. Minus included for symmetry.
 // Compiler flags -fno-signed-zeros -ffinite-math-only also cover 'f * 1.0', 'f - f', etc.
 #define PLUS_TERN0(O,A) _TERN(_ENA_1(O),,+ (A)) // OPTION ? '+ (A)' : '<nul>'

diff --git a/Marlin/src/core/serial.cpp b/Marlin/src/core/serial.cpp
@@ -101,8 +101,11 @@ void print_bin(uint16_t val) {
  }
 }
 
-void print_xyz(const_float_t x, const_float_t y, const_float_t z, PGM_P const prefix/*=nullptr*/, PGM_P const suffix/*=nullptr*/) {
+void print_pos(
+ LINEAR_AXIS_LIST(const_float_t x, const_float_t y, const_float_t z)
+ , PGM_P const prefix/*=nullptr*/, PGM_P const suffix/*=nullptr*/
+) {
  if (prefix) serialprintPGM(prefix);
- SERIAL_ECHOPAIR_P(SP_X_STR, x, SP_Y_STR, y, SP_Z_STR, z);
+ SERIAL_ECHOPAIR_P(LIST_N(DOUBLE(LINEAR_AXES), SP_X_STR, x, SP_Y_STR, y, SP_Z_STR, z));
  if (suffix) serialprintPGM(suffix); else SERIAL_EOL();
 }
diff --git a/Marlin/src/core/serial.h b/Marlin/src/core/serial.h
@@ -310,11 +310,14 @@ void serialprint_truefalse(const bool tf);
 void serial_spaces(uint8_t count);
 
 void print_bin(const uint16_t val);
-void print_xyz(const_float_t x, const_float_t y, const_float_t z, PGM_P const prefix=nullptr, PGM_P const suffix=nullptr);
+void print_pos(
+ LINEAR_AXIS_LIST(const_float_t x, const_float_t y, const_float_t z),
+ PGM_P const prefix=nullptr, PGM_P const suffix=nullptr
+);
 
-inline void print_xyz(const xyz_pos_t &xyz, PGM_P const prefix=nullptr, PGM_P const suffix=nullptr) {
- print_xyz(xyz.x, xyz.y, xyz.z, prefix, suffix);
+inline void print_pos(const xyz_pos_t &xyz, PGM_P const prefix=nullptr, PGM_P const suffix=nullptr) {
+ print_pos(LINEAR_AXIS_LIST(xyz.x, xyz.y, xyz.z), prefix, suffix);
 }
 
-#define SERIAL_POS(SUFFIX,VAR) do { print_xyz(VAR, PSTR(" " STRINGIFY(VAR) "="), PSTR(" : " SUFFIX "\n")); }while(0)
-#define SERIAL_XYZ(PREFIX,V...) do { print_xyz(V, PSTR(PREFIX), nullptr); }while(0)
+#define SERIAL_POS(SUFFIX,VAR) do { print_pos(VAR, PSTR(" " STRINGIFY(VAR) "="), PSTR(" : " SUFFIX "\n")); }while(0)
+#define SERIAL_XYZ(PREFIX,V...) do { print_pos(V, PSTR(PREFIX), nullptr); }while(0)