Merge branch 'vanilla_fb_2.0.x' into MY_DEV

2021-11-22 19:38:32 +03:00
parent bf52f48673 798d12c2af
commit 70e489094e
9 changed files with 135 additions and 13 deletions
--- a/.github/workflows/check-pr.yml
+++ b/.github/workflows/check-pr.yml
@@ -6,7 +6,8 @@
 name: PR Bad Target

 on:
-  pull_request:
+  pull_request_target:
+    types: [opened]
    branches:
    - 1.0.x
    - 1.1.x
--- a/.gitignore
+++ b/.gitignore
@@ -171,4 +171,3 @@ __pycache__
 # Simulation / Native
 eeprom.dat
 imgui.ini
-
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1323,7 +1323,7 @@
 //#define FB_4S_STOCK
 //#define FB_5_STOCK
 //#define FB_5_NANO_S_V1_3
-#define FB_5_NANO_V1_3_4TMC
+//#define FB_5_NANO_V1_3_4TMC
 //#define FB_5_NANO_V1_3

 #ifdef ALL_DRV_2208
--- a/Marlin/src/feature/leds/leds.cpp
+++ b/Marlin/src/feature/leds/leds.cpp
@@ -170,9 +170,9 @@ void LEDLights::set_color(const LEDColor &incol

  #if ENABLED(NEO2_COLOR_PRESETS)
    const LEDColor LEDLights2::defaultLEDColor = LEDColor(
-      LED_USER_PRESET_RED, LED_USER_PRESET_GREEN, LED_USER_PRESET_BLUE
-      OPTARG(HAS_WHITE_LED2, LED_USER_PRESET_WHITE)
-      OPTARG(NEOPIXEL_LED, LED_USER_PRESET_BRIGHTNESS)
+      NEO2_USER_PRESET_RED, NEO2_USER_PRESET_GREEN, NEO2_USER_PRESET_BLUE
+      OPTARG(HAS_WHITE_LED2, NEO2_USER_PRESET_WHITE)
+      OPTARG(NEOPIXEL_LED, NEO2_USER_PRESET_BRIGHTNESS)
    );
  #endif

--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -3379,6 +3379,25 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
  #endif
 #endif

+#if ENABLED(MECHANICAL_GANTRY_CALIBRATION)
+  #if NONE(HAS_MOTOR_CURRENT_DAC, HAS_MOTOR_CURRENT_SPI, HAS_MOTOR_CURRENT_DAC, HAS_TRINAMIC_CONFIG, HAS_MOTOR_CURRENT_PWM)
+    #error "It is highly recommended to have adjustable current drivers to prevent damage. Disable this line to continue anyway."
+  #elif !defined(GANTRY_CALIBRATION_CURRENT)
+    #error "MECHANICAL_GANTRY_CALIBRATION Requires GANTRY_CALIBRATION_CURRENT to be set."
+  #elif !defined(GANTRY_CALIBRATION_EXTRA_HEIGHT)
+    #error "MECHANICAL_GANTRY_CALIBRATION Requires GANTRY_CALIBRATION_EXTRA_HEIGHT to be set."
+  #elif !defined(GANTRY_CALIBRATION_FEEDRATE)
+    #error "MECHANICAL_GANTRY_CALIBRATION Requires GANTRY_CALIBRATION_FEEDRATE to be set."
+  #elif ENABLED(Z_MULTI_ENDSTOPS)
+    #error "Sorry! MECHANICAL_GANTRY_CALIBRATION cannot be used with Z_MULTI_ENDSTOPS."
+  #elif ENABLED(Z_STEPPER_AUTO_ALIGN)
+    #error "Sorry! MECHANICAL_GANTRY_CALIBRATION cannot be used with Z_STEPPER_AUTO_ALIGN."
+  #endif
+  #if defined(GANTRY_CALIBRATION_SAFE_POSITION) && !defined(GANTRY_CALIBRATION_XY_PARK_FEEDRATE)
+    #error "GANTRY_CALIBRATION_SAFE_POSITION Requires GANTRY_CALIBRATION_XY_PARK_FEEDRATE to be set."
+  #endif
+#endif
+
 #if BOTH(Z_STEPPER_AUTO_ALIGN, MECHANICAL_GANTRY_CALIBRATION)
  #error "You cannot use Z_STEPPER_AUTO_ALIGN and MECHANICAL_GANTRY_CALIBRATION at the same time."
 #endif
--- a/Marlin/src/inc/Warnings.cpp
+++ b/Marlin/src/inc/Warnings.cpp
@@ -475,3 +475,8 @@
    #warning "Auto-assigned K_DIAG_PIN to E7_DIAG_PIN."
  #endif
 #endif
+
+// Ender 3 Pro (but, apparently all Creality 4.2.2 boards)
+#if ENABLED(EMIT_CREALITY_422_WARNING) || MB(CREALITY_V4)
+  #warning "Creality 4.2.2 boards may have A4988 or TMC2208_STANDALONE drivers. Check your board and make sure to select the correct DRIVER_TYPE!"
+#endif
--- a/Marlin/src/pins/pinsDebug_list.h
+++ b/Marlin/src/pins/pinsDebug_list.h
@@ -74,6 +74,16 @@
    REPORT_NAME_ANALOG(__LINE__, MAIN_VOLTAGE_MEASURE_PIN)
  #endif
 #endif
+#if PIN_EXISTS(POWER_MONITOR_CURRENT)
+  #if ANALOG_OK(POWER_MONITOR_CURRENT_PIN)
+    REPORT_NAME_ANALOG(__LINE__, POWER_MONITOR_CURRENT_PIN)
+  #endif
+#endif
+#if PIN_EXISTS(POWER_MONITOR_VOLTAGE)
+  #if ANALOG_OK(POWER_MONITOR_VOLTAGE_PIN)
+    REPORT_NAME_ANALOG(__LINE__, POWER_MONITOR_VOLTAGE_PIN)
+  #endif
+#endif
 #if !defined(ARDUINO_ARCH_SAM) && !defined(ARDUINO_ARCH_SAMD)  // TC1 & TC2 are macros in the SAM/SAMD tool chain
  #if _EXISTS(TC1)
    #if ANALOG_OK(TC1)
@@ -131,6 +141,11 @@
    REPORT_NAME_ANALOG(__LINE__, TEMP_BED_PIN)
  #endif
 #endif
+#if PIN_EXISTS(TEMP_BOARD)
+  #if ANALOG_OK(TEMP_BOARD_PIN)
+    REPORT_NAME_ANALOG(__LINE__, TEMP_BOARD_PIN)
+  #endif
+#endif
 #if PIN_EXISTS(TEMP_CHAMBER)
  #if ANALOG_OK(TEMP_CHAMBER_PIN)
    REPORT_NAME_ANALOG(__LINE__, TEMP_CHAMBER_PIN)
@@ -141,6 +156,11 @@
    REPORT_NAME_ANALOG(__LINE__, TEMP_COOLER_PIN)
  #endif
 #endif
+#if PIN_EXISTS(TEMP_PROBE)
+  #if ANALOG_OK(TEMP_PROBE_PIN)
+    REPORT_NAME_ANALOG(__LINE__, TEMP_PROBE_PIN)
+  #endif
+#endif
 #if PIN_EXISTS(ADC_KEYPAD)
  #if ANALOG_OK(ADC_KEYPAD_PIN)
    REPORT_NAME_ANALOG(__LINE__, ADC_KEYPAD_PIN)
@@ -370,6 +390,9 @@
 #if PIN_EXISTS(DIGIPOTSS)
  REPORT_NAME_DIGITAL(__LINE__, DIGIPOTSS_PIN)
 #endif
+#if PIN_EXISTS(LCD_RESET)
+  REPORT_NAME_DIGITAL(__LINE__, LCD_RESET_PIN)
+#endif
 #if _EXISTS(DOGLCD_A0)
  REPORT_NAME_DIGITAL(__LINE__, DOGLCD_A0)
 #endif
@@ -433,6 +456,9 @@
 #if PIN_EXISTS(E0_STEP)
  REPORT_NAME_DIGITAL(__LINE__, E0_STEP_PIN)
 #endif
+#if PIN_EXISTS(E0_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, E0_STDBY_PIN)
+#endif
 #if PIN_EXISTS(E1_AUTO_FAN)
  REPORT_NAME_DIGITAL(__LINE__, E1_AUTO_FAN_PIN)
 #endif
@@ -457,6 +483,9 @@
 #if PIN_EXISTS(E1_STEP)
  REPORT_NAME_DIGITAL(__LINE__, E1_STEP_PIN)
 #endif
+#if PIN_EXISTS(E1_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, E1_STDBY_PIN)
+#endif
 #if PIN_EXISTS(E2_AUTO_FAN)
  REPORT_NAME_DIGITAL(__LINE__, E2_AUTO_FAN_PIN)
 #endif
@@ -481,6 +510,9 @@
 #if PIN_EXISTS(E2_STEP)
  REPORT_NAME_DIGITAL(__LINE__, E2_STEP_PIN)
 #endif
+#if PIN_EXISTS(E2_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, E2_STDBY_PIN)
+#endif
 #if PIN_EXISTS(E3_AUTO_FAN)
  REPORT_NAME_DIGITAL(__LINE__, E3_AUTO_FAN_PIN)
 #endif
@@ -505,6 +537,9 @@
 #if PIN_EXISTS(E3_STEP)
  REPORT_NAME_DIGITAL(__LINE__, E3_STEP_PIN)
 #endif
+#if PIN_EXISTS(E3_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, E3_STDBY_PIN)
+#endif
 #if PIN_EXISTS(E4_AUTO_FAN)
  REPORT_NAME_DIGITAL(__LINE__, E4_AUTO_FAN_PIN)
 #endif
@@ -529,6 +564,9 @@
 #if PIN_EXISTS(E4_STEP)
  REPORT_NAME_DIGITAL(__LINE__, E4_STEP_PIN)
 #endif
+#if PIN_EXISTS(E4_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, E4_STDBY_PIN)
+#endif
 #if PIN_EXISTS(E5_AUTO_FAN)
  REPORT_NAME_DIGITAL(__LINE__, E5_AUTO_FAN_PIN)
 #endif
@@ -553,6 +591,9 @@
 #if PIN_EXISTS(E5_STEP)
  REPORT_NAME_DIGITAL(__LINE__, E5_STEP_PIN)
 #endif
+#if PIN_EXISTS(E5_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, E5_STDBY_PIN)
+#endif
 #if PIN_EXISTS(E6_AUTO_FAN)
  REPORT_NAME_DIGITAL(__LINE__, E6_AUTO_FAN_PIN)
 #endif
@@ -577,6 +618,9 @@
 #if PIN_EXISTS(E6_STEP)
  REPORT_NAME_DIGITAL(__LINE__, E6_STEP_PIN)
 #endif
+#if PIN_EXISTS(E6_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, E6_STDBY_PIN)
+#endif
 #if PIN_EXISTS(E7_AUTO_FAN)
  REPORT_NAME_DIGITAL(__LINE__, E7_AUTO_FAN_PIN)
 #endif
@@ -601,6 +645,9 @@
 #if PIN_EXISTS(E7_STEP)
  REPORT_NAME_DIGITAL(__LINE__, E7_STEP_PIN)
 #endif
+#if PIN_EXISTS(E7_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, E7_STDBY_PIN)
+#endif
 #if _EXISTS(ENET_CRS)
  REPORT_NAME_DIGITAL(__LINE__, ENET_CRS)
 #endif
@@ -704,6 +751,9 @@
 #if PIN_EXISTS(POWER_LOSS)
  REPORT_NAME_DIGITAL(__LINE__, POWER_LOSS_PIN)
 #endif
+#if PIN_EXISTS(SAFE_POWER)
+  REPORT_NAME_DIGITAL(__LINE__, SAFE_POWER_PIN)
+#endif
 #if PIN_EXISTS(FIL_RUNOUT)
  REPORT_NAME_DIGITAL(__LINE__, FIL_RUNOUT_PIN)
 #endif
@@ -806,6 +856,15 @@
 #if PIN_EXISTS(LED)
  REPORT_NAME_DIGITAL(__LINE__, LED_PIN)
 #endif
+#if PIN_EXISTS(LED2)
+  REPORT_NAME_DIGITAL(__LINE__, LED2_PIN)
+#endif
+#if PIN_EXISTS(LED3)
+  REPORT_NAME_DIGITAL(__LINE__, LED3_PIN)
+#endif
+#if PIN_EXISTS(LED4)
+  REPORT_NAME_DIGITAL(__LINE__, LED4_PIN)
+#endif
 #if PIN_EXISTS(LED_RED)
  REPORT_NAME_DIGITAL(__LINE__, LED_RED_PIN)
 #endif
@@ -870,6 +929,12 @@
 #if PIN_EXISTS(MOTOR_CURRENT_PWM_E)
  REPORT_NAME_DIGITAL(__LINE__, MOTOR_CURRENT_PWM_E_PIN)
 #endif
+#if PIN_EXISTS(MOTOR_CURRENT_PWM_E0)
+  REPORT_NAME_DIGITAL(__LINE__, MOTOR_CURRENT_PWM_E0_PIN)
+#endif
+#if PIN_EXISTS(MOTOR_CURRENT_PWM_E1)
+  REPORT_NAME_DIGITAL(__LINE__, MOTOR_CURRENT_PWM_E1_PIN)
+#endif
 #if PIN_EXISTS(MOTOR_CURRENT_PWM_X)
  REPORT_NAME_DIGITAL(__LINE__, MOTOR_CURRENT_PWM_X_PIN)
 #endif
@@ -1155,6 +1220,9 @@
 #if PIN_EXISTS(X_STEP)
  REPORT_NAME_DIGITAL(__LINE__, X_STEP_PIN)
 #endif
+#if PIN_EXISTS(X_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, X_STDBY_PIN)
+#endif
 #if PIN_EXISTS(X_STOP)
  REPORT_NAME_DIGITAL(__LINE__, X_STOP_PIN)
 #endif
@@ -1218,6 +1286,9 @@
 #if PIN_EXISTS(Y_STEP)
  REPORT_NAME_DIGITAL(__LINE__, Y_STEP_PIN)
 #endif
+#if PIN_EXISTS(Y_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, Y_STDBY_PIN)
+#endif
 #if PIN_EXISTS(Y_STOP)
  REPORT_NAME_DIGITAL(__LINE__, Y_STOP_PIN)
 #endif
@@ -1281,6 +1352,9 @@
 #if PIN_EXISTS(Z_STEP)
  REPORT_NAME_DIGITAL(__LINE__, Z_STEP_PIN)
 #endif
+#if PIN_EXISTS(Z_STDBY)
+  REPORT_NAME_DIGITAL(__LINE__, Z_STDBY_PIN)
+#endif
 #if PIN_EXISTS(Z_STOP)
  REPORT_NAME_DIGITAL(__LINE__, Z_STOP_PIN)
 #endif
@@ -1299,6 +1373,9 @@
 #if PIN_EXISTS(Z2_MIN)
  REPORT_NAME_DIGITAL(__LINE__, Z2_MIN_PIN)
 #endif
+#if PIN_EXISTS(Z2_DIAG)
+  REPORT_NAME_DIGITAL(__LINE__, Z2_DIAG_PIN)
+#endif
 #if PIN_EXISTS(Z2_MS1)
  REPORT_NAME_DIGITAL(__LINE__, Z2_MS1_PIN)
 #endif
@@ -1311,6 +1388,9 @@
 #if PIN_EXISTS(Z2_STEP)
  REPORT_NAME_DIGITAL(__LINE__, Z2_STEP_PIN)
 #endif
+#if PIN_EXISTS(Z2_STOP)
+  REPORT_NAME_DIGITAL(__LINE__, Z2_STOP_PIN)
+#endif
 #if PIN_EXISTS(Z3_CS)
  REPORT_NAME_DIGITAL(__LINE__, Z3_CS_PIN)
 #endif
@@ -1593,6 +1673,24 @@
 #if PIN_EXISTS(E7_SERIAL_RX)
  REPORT_NAME_DIGITAL(__LINE__, E7_SERIAL_RX_PIN)
 #endif
+#if PIN_EXISTS(I_SERIAL_TX)
+  REPORT_NAME_DIGITAL(__LINE__, I_SERIAL_TX_PIN)
+#endif
+#if PIN_EXISTS(I_SERIAL_RX)
+  REPORT_NAME_DIGITAL(__LINE__, I_SERIAL_RX_PIN)
+#endif
+#if PIN_EXISTS(J_SERIAL_TX)
+  REPORT_NAME_DIGITAL(__LINE__, J_SERIAL_TX_PIN)
+#endif
+#if PIN_EXISTS(J_SERIAL_RX)
+  REPORT_NAME_DIGITAL(__LINE__, J_SERIAL_RX_PIN)
+#endif
+#if PIN_EXISTS(K_SERIAL_TX)
+  REPORT_NAME_DIGITAL(__LINE__, K_SERIAL_TX_PIN)
+#endif
+#if PIN_EXISTS(K_SERIAL_RX)
+  REPORT_NAME_DIGITAL(__LINE__, K_SERIAL_RX_PIN)
+#endif
 #if PIN_EXISTS(L6470_CHAIN_SCK)
  REPORT_NAME_DIGITAL(__LINE__, L6470_CHAIN_SCK_PIN)
 #endif
--- a/Marlin/src/pins/pins_postprocess.h
+++ b/Marlin/src/pins/pins_postprocess.h
@@ -1260,22 +1260,22 @@
 // Disable unused endstop / probe pins
 //
 #define _STOP_IN_USE(N) (X2_USE_ENDSTOP == N || Y2_USE_ENDSTOP == N || Z2_USE_ENDSTOP == N || Z3_USE_ENDSTOP == N || Z4_USE_ENDSTOP == N)
-#if _STOP_IN_USE(_XMAX_)
+#if !defined(USE_XMAX_PLUG) && _STOP_IN_USE(_XMAX_)
  #define USE_XMAX_PLUG
 #endif
-#if _STOP_IN_USE(_YMAX_)
+#if !defined(USE_YMAX_PLUG) && _STOP_IN_USE(_YMAX_)
  #define USE_YMAX_PLUG
 #endif
-#if _STOP_IN_USE(_ZMAX_)
+#if !defined(USE_ZMAX_PLUG) && _STOP_IN_USE(_ZMAX_)
  #define USE_ZMAX_PLUG
 #endif
-#if _STOP_IN_USE(_XMIN_)
+#if !defined(USE_XMIN_PLUG) && _STOP_IN_USE(_XMIN_)
  #define USE_XMIN_PLUG
 #endif
-#if _STOP_IN_USE(_YMIN_)
+#if !defined(USE_YMIN_PLUG) && _STOP_IN_USE(_YMIN_)
  #define USE_YMIN_PLUG
 #endif
-#if _STOP_IN_USE(_ZMIN_)
+#if !defined(USE_ZMIN_PLUG) && _STOP_IN_USE(_ZMIN_)
  #define USE_ZMIN_PLUG
 #endif
 #undef _STOP_IN_USE
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
@@ -128,7 +128,7 @@
    #define Y_SERIAL_TX_PIN                 PE14
  #endif
  #ifndef Y_SERIAL_RX_PIN
-    #define Y_SERIAL_RX_PIN                 PE13
+    #define Y_SERIAL_RX_PIN                 PC4
  #endif
  #ifndef Z_SERIAL_TX_PIN
    #define Z_SERIAL_TX_PIN                 PD11