bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

TFT Presets, Generic options, Sanity checks (#19723)

Browse Source
This commit is contained in:
Scott Lahteine
2020-10-15 03:00:27 -05:00
committed by GitHub
parent 04c27573d6
commit f6ffbe548c
116 changed files with 593 additions and 599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/pins/ramps/pins_3DRAG.h
View File

@ -78,7 +78,7 @@
//
// LCD / Controller
//
#if BOTH(ULTRA_LCD, NEWPANEL)
#if IS_ULTRA_LCD && IS_NEWPANEL
#undef BEEPER_PIN
#undef LCD_PINS_RS
@ -106,7 +106,7 @@
#define BEEPER_PIN 33
#endif // ULTRA_LCD && NEWPANEL
#endif // IS_ULTRA_LCD && IS_NEWPANEL
/**
* M3/M4/M5 - Spindle/Laser Control
@ -157,7 +157,7 @@
#define SPINDLE_LASER_PWM_PIN 46 // Hardware PWM
#define SPINDLE_LASER_ENA_PIN 62 // Pullup!
#define SPINDLE_DIR_PIN 48
#elif !BOTH(ULTRA_LCD, NEWPANEL) // use expansion header if no LCD in use
#elif !BOTH(IS_ULTRA_LCD, IS_NEWPANEL) // use expansion header if no LCD in use
#define SPINDLE_LASER_ENA_PIN 16 // Pullup or pulldown!
#define SPINDLE_DIR_PIN 17
#endif

4
Marlin/src/pins/ramps/pins_FELIX2.h
View File

@ -49,11 +49,11 @@
//
// LCD / Controller
//
#if BOTH(ULTRA_LCD, NEWPANEL)
#if IS_ULTRA_LCD && IS_NEWPANEL
#define SD_DETECT_PIN 6
#endif // NEWPANEL && ULTRA_LCD
#endif
//
// M3/M4/M5 - Spindle/Laser Control

2
Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h
View File

@ -181,7 +181,7 @@
//
// Formbot only supports REPRAP_DISCOUNT_SMART_CONTROLLER
//
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#if IS_RRD_SC
#define BEEPER_PIN 37
#define BTN_EN1 31
#define BTN_EN2 33

2
Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
View File

@ -175,7 +175,7 @@
//
// Formbot only supports REPRAP_DISCOUNT_SMART_CONTROLLER
//
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#if IS_RRD_SC
#ifndef BEEPER_PIN
#define BEEPER_PIN 37
#endif

2
Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h
View File

@ -155,7 +155,7 @@
//
// Formbot only supports REPRAP_DISCOUNT_SMART_CONTROLLER
//
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#if IS_RRD_SC
#define LCD_PINS_RS 16
#define LCD_PINS_ENABLE 17
#define LCD_PINS_D4 23

2
Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
View File

@ -277,7 +277,7 @@
#endif
#if ENABLED(NEWPANEL)
#if IS_NEWPANEL
#define BTN_EN1 31
#define BTN_EN2 33
#define BTN_ENC 35

2
Marlin/src/pins/ramps/pins_K8600.h
View File

@ -96,7 +96,7 @@
//
// LCD / Controller
//
#if BOTH(ULTRA_LCD, NEWPANEL)
#if IS_ULTRA_LCD && IS_NEWPANEL
#undef BEEPER_PIN
#undef LCD_PINS_RS

2
Marlin/src/pins/ramps/pins_K8800.h
View File

@ -113,7 +113,7 @@
#define LCD_CONTRAST_MAX 100
#define DEFAULT_LCD_CONTRAST 30
#if ENABLED(NEWPANEL)
#if IS_NEWPANEL
#define BTN_EN1 17
#define BTN_EN2 16
#define BTN_ENC 23

2
Marlin/src/pins/ramps/pins_ORTUR_4.h
View File

@ -91,7 +91,7 @@
//
// LCD / Controller
//
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#if IS_RRD_FG_SC
#undef BEEPER_PIN
#define BEEPER_PIN 35

19
Marlin/src/pins/ramps/pins_RAMPS.h
View File

@ -441,7 +441,7 @@
#define LCD_PINS_ENABLE 51 // SID (MOSI)
#define LCD_PINS_D4 52 // SCK (CLK) clock
#elif BOTH(NEWPANEL, PANEL_ONE)
#elif BOTH(IS_NEWPANEL, PANEL_ONE)
#define LCD_PINS_RS 40
#define LCD_PINS_ENABLE 42
@ -462,7 +462,7 @@
#define LCD_PINS_ENABLE 29
#define LCD_PINS_D4 25
#if DISABLED(NEWPANEL)
#if !IS_NEWPANEL
#define BEEPER_PIN 37
#endif
@ -481,10 +481,10 @@
#define LCD_PINS_DC 25 // Set as output on init
#define LCD_PINS_RS 27 // Pull low for 1s to init
// DOGM SPI LCD Support
#define DOGLCD_A0 LCD_PINS_DC
#define DOGLCD_CS 16
#define DOGLCD_MOSI 17
#define DOGLCD_SCK 23
#define DOGLCD_A0 LCD_PINS_DC
#else
#define LCD_PINS_RS 16
#define LCD_PINS_ENABLE 17
@ -495,13 +495,13 @@
#define LCD_PINS_D7 29
#if DISABLED(NEWPANEL)
#if !IS_NEWPANEL
#define BEEPER_PIN 33
#endif
#endif
#if DISABLED(NEWPANEL)
#if !IS_NEWPANEL
// Buttons attached to a shift register
// Not wired yet
//#define SHIFT_CLK 38
@ -515,9 +515,9 @@
//
// LCD Display input pins
//
#if ENABLED(NEWPANEL)
#if IS_NEWPANEL
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#if IS_RRD_SC
#define BEEPER_PIN 37
@ -685,6 +685,7 @@
#elif ENABLED(AZSMZ_12864)
// Pins only defined for RAMPS_SMART currently
#error "No pins defined for RAMPS with AZSMZ_12864."
#elif IS_TFTGLCD_PANEL
@ -712,11 +713,11 @@
#endif
#endif
#endif // NEWPANEL
#endif // IS_NEWPANEL
#endif // HAS_WIRED_LCD
#if ENABLED(REPRAPWORLD_KEYPAD) && DISABLED(ADC_KEYPAD)
#if IS_RRW_KEYPAD && !HAS_ADC_BUTTONS
#define SHIFT_OUT 40
#define SHIFT_CLK 44
#define SHIFT_LD 42

2
Marlin/src/pins/ramps/pins_RAMPS_PLUS.h
View File

@ -73,7 +73,7 @@
#undef E0_CS_PIN
#undef E1_CS_PIN
#if ENABLED(ULTRA_LCD) && NONE(REPRAPWORLD_GRAPHICAL_LCD, CR10_STOCKDISPLAY) && !BOTH(NEWPANEL, PANEL_ONE)
#if IS_ULTRA_LCD && NONE(REPRAPWORLD_GRAPHICAL_LCD, CR10_STOCKDISPLAY) && !BOTH(IS_NEWPANEL, PANEL_ONE)
#if DISABLED(MKS_12864OLED) || ENABLED(MKS_12864OLED_SSD1306)
#undef LCD_PINS_RS
#define LCD_PINS_RS 42 // 3DYMY boards pin 16 -> 42

2
Marlin/src/pins/ramps/pins_RIGIDBOARD.h
View File

@ -124,7 +124,7 @@
#undef SD_DETECT_PIN
#define SD_DETECT_PIN 22
#elif ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#elif IS_RRD_SC
#undef SD_DETECT_PIN
#define SD_DETECT_PIN 22

2
Marlin/src/pins/ramps/pins_RUMBA.h
View File

@ -227,7 +227,7 @@
#define SD_DETECT_PIN 49
#endif
#if ENABLED(NEWPANEL)
#if IS_NEWPANEL
#define BTN_EN1 11
#define BTN_EN2 12
#define BTN_ENC 43

4
Marlin/src/pins/ramps/pins_TENLOG_D3_HERO.h
View File

@ -163,7 +163,7 @@
// LCD / Controller
//
//#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
//#if IS_RRD_SC
#define LCD_PINS_RS -1
#define LCD_PINS_ENABLE -1
@ -182,4 +182,4 @@
#define BEEPER_PIN -1
//#endif
//#endif // REPRAP_DISCOUNT_SMART_CONTROLLER
//#endif // IS_RRD_SC

4
Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
View File

@ -131,13 +131,13 @@
#if 0 && HAS_WIRED_LCD
// LCD Display output pins
#if BOTH(NEWPANEL, PANEL_ONE)
#if BOTH(IS_NEWPANEL, PANEL_ONE)
#undef LCD_PINS_D6
#define LCD_PINS_D6 57
#endif
// LCD Display input pins
#if ENABLED(NEWPANEL)
#if IS_NEWPANEL
#if ANY(VIKI2, miniVIKI)
#undef DOGLCD_A0
#define DOGLCD_A0 23

16
Marlin/src/pins/ramps/pins_TT_OSCAR.h
View File

@ -282,7 +282,7 @@
#define LCD_PINS_ENABLE 51 // SID (MOSI)
#define LCD_PINS_D4 52 // SCK (CLK) clock
#elif BOTH(NEWPANEL, PANEL_ONE)
#elif BOTH(IS_NEWPANEL, PANEL_ONE)
#define LCD_PINS_RS 40
#define LCD_PINS_ENABLE 42
@ -309,7 +309,7 @@
#define LCD_PINS_ENABLE 29
#define LCD_PINS_D4 25
#if DISABLED(NEWPANEL)
#if !IS_NEWPANEL
#define BEEPER_PIN 37
#endif
@ -333,13 +333,13 @@
#define LCD_PINS_D7 29
#if DISABLED(NEWPANEL)
#if !IS_NEWPANEL
#define BEEPER_PIN 33
#endif
#endif
#if DISABLED(NEWPANEL)
#if !IS_NEWPANEL
// Buttons attached to a shift register
// Not wired yet
//#define SHIFT_CLK 38
@ -353,9 +353,9 @@
//
// LCD Display input pins
//
#if ENABLED(NEWPANEL)
#if IS_NEWPANEL
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#if IS_RRD_SC
#define BEEPER_PIN 37
@ -486,7 +486,7 @@
#define BEEPER_PIN 33
// Buttons are directly attached to AUX-2
#if ENABLED(REPRAPWORLD_KEYPAD)
#if IS_RRW_KEYPAD
#define SHIFT_OUT 40
#define SHIFT_CLK 44
#define SHIFT_LD 42
@ -510,6 +510,6 @@
#endif
#endif // NEWPANEL
#endif // IS_NEWPANEL
#endif

6
Marlin/src/pins/ramps/pins_ULTIMAKER.h
View File

@ -123,7 +123,7 @@
#define BEEPER_PIN 18
#if ENABLED(NEWPANEL)
#if IS_NEWPANEL
#define LCD_PINS_RS 20
#define LCD_PINS_ENABLE 17
@ -139,7 +139,7 @@
#define SD_DETECT_PIN 38
#else // !NEWPANEL - Old style panel with shift register
#else // !IS_NEWPANEL - Old style panel with shift register
// Buttons attached to a shift register
#define SHIFT_CLK 38
@ -156,7 +156,7 @@
#define SD_DETECT_PIN -1
#endif // !NEWPANEL
#endif // !IS_NEWPANEL
#endif // HAS_WIRED_LCD

8
Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h
View File

@ -174,11 +174,11 @@
#define LCD_PINS_D6 32
#define LCD_PINS_D7 30
#elif BOTH(BOARD_REV_1_5, ULTRA_LCD)
#elif BOTH(BOARD_REV_1_5, IS_ULTRA_LCD)
#define BEEPER_PIN 18
#if ENABLED(NEWPANEL)
#if IS_NEWPANEL
#define LCD_PINS_RS 20
#define LCD_PINS_ENABLE 17
@ -194,7 +194,7 @@
#define SD_DETECT_PIN 38
#else // !NEWPANEL - Old style panel with shift register
#else // !IS_NEWPANEL - Old style panel with shift register
// Buttons attached to a shift register
#define SHIFT_CLK 38
@ -209,7 +209,7 @@
#define LCD_PINS_D6 20
#define LCD_PINS_D7 19
#endif // !NEWPANEL
#endif // !IS_NEWPANEL
#endif