Merge upstream changes from Marlin 2.1.2

This commit is contained in:
Stefan Kalscheuer
2022-12-19 15:23:45 +01:00
parent fe9ea826a5
commit 67c7ce7b79
427 changed files with 10732 additions and 7834 deletions

View File

@@ -26,62 +26,37 @@
* V2 and V3 Boards only differ in USB controller, nothing affecting the pins.
*/
#include "pins_MKS_GEN_13.h" // ... RAMPS
#define ZRIB_V20_D6_PIN 6 // Fan
#define ZRIB_V20_D9_PIN 9 // Fan2
#define ZRIB_V20_A10_PIN 10
#define ZRIB_V20_D16_PIN 16
#define ZRIB_V20_D17_PIN 17
#define ZRIB_V20_D23_PIN 23
#define ZRIB_V20_D25_PIN 25
#define ZRIB_V20_D27_PIN 27
#define ZRIB_V20_D29_PIN 29
#define ZRIB_V20_D37_PIN 37
#ifndef FILWIDTH_PIN
#define FILWIDTH_PIN 11 // Analog Input
#endif
//
// Auto fans
//
#ifndef E0_AUTO_FAN_PIN
#define E0_AUTO_FAN_PIN ZRIB_V20_D6_PIN
#define E0_AUTO_FAN_PIN 6 // Fan
#endif
#ifndef E1_AUTO_FAN_PIN
#define E1_AUTO_FAN_PIN ZRIB_V20_D6_PIN
#define E1_AUTO_FAN_PIN 6
#endif
#ifndef E2_AUTO_FAN_PIN
#define E2_AUTO_FAN_PIN ZRIB_V20_D6_PIN
#define E2_AUTO_FAN_PIN 6
#endif
#ifndef E3_AUTO_FAN_PIN
#define E3_AUTO_FAN_PIN ZRIB_V20_D6_PIN
#endif
#ifndef FILWIDTH_PIN
#define FILWIDTH_PIN 11 // Analog Input
#define E3_AUTO_FAN_PIN 6
#endif
#if ENABLED(ZONESTAR_LCD)
#undef LCD_PINS_RS
#undef LCD_PINS_ENABLE
#undef LCD_PINS_D4
#undef LCD_PINS_D5
#undef LCD_PINS_D6
#undef LCD_PINS_D7
#undef ADC_KEYPAD_PIN
#undef BEEPER_PIN
#define LCD_PINS_RS 16
#define LCD_PINS_ENABLE 17
#define LCD_PINS_D4 23
#define LCD_PINS_D5 25
#define LCD_PINS_D6 27
#define LCD_PINS_D7 29
#define ADC_KEYPAD_PIN 10 // Analog Input
#define BEEPER_PIN 37
#undef SHIFT_OUT_PIN
#undef SHIFT_CLK_PIN
#undef SHIFT_LD_PIN
#undef BTN_EN1
#undef BTN_EN2
#undef BTN_ENC
#define LCD_PINS_RS ZRIB_V20_D16_PIN
#define LCD_PINS_ENABLE ZRIB_V20_D17_PIN
#define LCD_PINS_D4 ZRIB_V20_D23_PIN
#define LCD_PINS_D5 ZRIB_V20_D25_PIN
#define LCD_PINS_D6 ZRIB_V20_D27_PIN
#define LCD_PINS_D7 ZRIB_V20_D29_PIN
#define ADC_KEYPAD_PIN ZRIB_V20_A10_PIN
#define BEEPER_PIN ZRIB_V20_D37_PIN
#define LCD_PINS_DEFINED
#endif
#include "pins_MKS_GEN_13.h" // ... RAMPS