SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use LCD conditionals in pins files (#14428)

Browse source
This commit is contained in:
Scott Lahteine 2019-06-27 22:14:43 -05:00 committed by GitHub
parent 8b63e3701f
commit 7e16835c83
Signed by: GitHub
GPG key ID: 4AEE18F83AFDEB23
51 changed files with 193 additions and 203 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/Marlin.cpp
View file

@ -1093,7 +1093,7 @@ void setup() {
init_closedloop();
#endif
#if ENABLED(INIT_SDCARD_ON_BOOT) && DISABLED(ULTRA_LCD)
#if ENABLED(INIT_SDCARD_ON_BOOT) && !HAS_SPI_LCD
card.beginautostart();
#endif

17
Marlin/src/pins/pins.h
View file

@ -878,14 +878,21 @@
#ifndef LCD_PINS_D4
#define LCD_PINS_D4 -1
#endif
#ifndef LCD_PINS_D5
#if HAS_CHARACTER_LCD
#ifndef LCD_PINS_D5
#define LCD_PINS_D5 -1
#endif
#ifndef LCD_PINS_D6
#endif
#ifndef LCD_PINS_D6
#define LCD_PINS_D6 -1
#endif
#ifndef LCD_PINS_D7
#endif
#ifndef LCD_PINS_D7
#define LCD_PINS_D7 -1
#endif
#else
#undef LCD_PINS_D5
#undef LCD_PINS_D6
#undef LCD_PINS_D7
#endif
/**

2
Marlin/src/pins/pins_3DRAG.h
View file

@ -103,7 +103,7 @@
#define BEEPER_PIN 33
#endif // ULTRA_LCD && NEWPANEL
#endif // HAS_SPI_LCD && NEWPANEL
/**
* M3/M4/M5 - Spindle/Laser Control

2
Marlin/src/pins/pins_ANET_10.h
View file

@ -151,7 +151,7 @@
* REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
*/
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
#define LCD_SDSS 28
#if ENABLED(ADC_KEYPAD)
#define SERVO0_PIN 27 // free for BLTouch/3D-Touch

4
Marlin/src/pins/pins_ARCHIM1.h
View file

@ -175,7 +175,7 @@
//
// LCD / Controller
//
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
#define BEEPER_PIN 23 // D24 PA15_CTS1
#define LCD_PINS_RS 17 // D17 PA12_RXD1
#define LCD_PINS_ENABLE 24 // D23 PA14_RTS1
@ -192,4 +192,4 @@
#define BTN_EN2 13 // D13 PB27_TIOB0
#define BTN_ENC 16 // D16 PA13_TXD1
#endif // NEWPANEL
#endif // ULTRA_LCD
#endif // HAS_SPI_LCD

4
Marlin/src/pins/pins_ARCHIM2.h
View file

@ -224,7 +224,7 @@
//
// LCD / Controller
//
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
#define BEEPER_PIN 23 // D24 PA15_CTS1
#define LCD_PINS_RS 17 // D17 PA12_RXD1
#define LCD_PINS_ENABLE 24 // D23 PA14_RTS1
@ -241,4 +241,4 @@
#define BTN_EN2 13 // D13 PB27_TIOB0
#define BTN_ENC 16 // D16 PA13_TXD1 // the click
#endif // NEWPANEL
#endif // ULTRA_LCD
#endif // HAS_SPI_LCD

4
Marlin/src/pins/pins_AZTEEG_X5_MINI.h
View file

@ -108,7 +108,7 @@
//
// Display
//
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
#if ENABLED(CR10_STOCKDISPLAY)
@ -184,7 +184,7 @@
#endif
#endif // ULTRA_LCD
#endif // HAS_SPI_LCD
//
// SD Support

4
Marlin/src/pins/pins_BEAST.h
View file

@ -120,7 +120,7 @@
//
// LCD Pins
//
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
#if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
#define LCD_PINS_RS 49 // CS chip select /SS chip slave select
@ -282,7 +282,7 @@
#endif
#endif // NEWPANEL
#endif // ULTRA_LCD
#endif // HAS_SPI_LCD
#define U_MIN_PIN -1
#define V_MIN_PIN -1

4
Marlin/src/pins/pins_BIGTREE_SKR_MINI_V1_1.h
View file

@ -102,7 +102,7 @@
* EXP2 EXP1
*/
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
#define BEEPER_PIN PC10
#define BTN_ENC PC11
#define LCD_PINS_RS PC12
@ -152,7 +152,7 @@
#endif // !FYSETC_MINI_12864
#endif // ULTRA_LCD
#endif // HAS_SPI_LCD
//
// SD Card

4
Marlin/src/pins/pins_BIGTREE_SKR_V1.3.h
View file

@ -179,7 +179,7 @@
| ￣￣ ￣￣
| EXP2 EXP1
*/
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
#define BEEPER_PIN P1_30 // (37) not 5V tolerant
#define BTN_ENC P0_28 // (58) open-drain
@ -249,7 +249,7 @@
#endif
#endif // ULTRA_LCD
#endif // HAS_SPI_LCD
//
// SD Support

10
Marlin/src/pins/pins_BIQU_B300_V1.0.h
View file

@ -119,7 +119,7 @@
* for the onboard SD card, and a chip select signal is not provided for the remote
* SD card.
*/
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
#define BEEPER_PIN P1_31 // EXP1-1
@ -132,15 +132,15 @@
#define LCD_PINS_ENABLE P0_18 // (MOSI) EXP1-3
#define LCD_PINS_D4 P0_15 // (SCK) EXP1-5
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && DISABLED(DOGLCD)
#error "REPRAP_DISCOUNT_SMART_CONTROLLER is not supported by the BIQU BQ111-A4"
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && HAS_CHARACTER_LCD
#error "REPRAP_DISCOUNT_SMART_CONTROLLER is not supported by the BIQU B300 v1.0"
#endif
#if ENABLED(SDSUPPORT)
#error "SDSUPPORT is not supported by the BIQU BQ111-A4 when an LCD controller is used"
#error "SDSUPPORT is not supported by the BIQU B300 v1.0 when an LCD controller is used"
#endif
#endif // ULTRA_LCD
#endif // HAS_SPI_LCD
/**
* SD Card Reader

6
Marlin/src/pins/pins_BIQU_BQ111_A4.h
View file

@ -99,7 +99,7 @@
* for the onboard SD card, and a chip select signal is not provided for the remote
* SD card.
*/
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
#define BEEPER_PIN P1_31 // EXP1-1
@ -112,7 +112,7 @@
#define LCD_PINS_ENABLE P0_18 // (MOSI) EXP1-3
#define LCD_PINS_D4 P0_15 // (SCK) EXP1-5
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && DISABLED(DOGLCD)
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && HAS_CHARACTER_LCD
#error "REPRAP_DISCOUNT_SMART_CONTROLLER is not supported by the BIQU BQ111-A4"
#endif
@ -120,7 +120,7 @@
#error "SDSUPPORT is not supported by the BIQU BQ111-A4 when an LCD controller is used"
#endif
#endif // ULTRA_LCD
#endif // HAS_SPI_LCD
/**

2
Marlin/src/pins/pins_BIQU_SKR_V1.1.h
View file

@ -94,7 +94,7 @@
* by redrawing the screen after SD card accesses.
*/
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
#define BEEPER_PIN P1_30
#define BTN_EN1 P3_26
#define BTN_EN2 P3_25

4
Marlin/src/pins/pins_CHITU3D.h
View file

@ -119,7 +119,7 @@
//
// LCD Pins
//
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
#if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
#define LCD_PINS_RS 49 // CS chip select /SS chip slave select
@ -280,7 +280,7 @@
#endif
#endif // NEWPANEL
#endif // ULTRA_LCD
#endif // HAS_SPI_LCD
#define U_MIN_PIN -1
#define V_MIN_PIN -1

4
Marlin/src/pins/pins_COHESION3D_MINI.h
View file

@ -135,7 +135,7 @@
// connector are shared with the onboard SD card, and Marlin does not support reading
// G-code files from the onboard SD card.
//
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
#define BEEPER_PIN P0_27 // EXP2-7 - open drain
@ -154,7 +154,7 @@
#error "SDSUPPORT is not currently supported by the Cohesion3D boards"
#endif
#endif // ULTRA_LCD
#endif // HAS_SPI_LCD
//
// Ethernet pins

4
Marlin/src/pins/pins_COHESION3D_REMIX.h
View file

@ -192,7 +192,7 @@
#define NEOPIXEL_PIN P1_16 // EXP1-6 => Ethernet pin 6 (top row, 3 from left)
#endif
#elif ENABLED(ULTRA_LCD)
#elif HAS_SPI_LCD
#define BEEPER_PIN P1_31 // EXP1-1
//#define SD_DETECT_PIN P0_27 // EXP2-7
@ -208,7 +208,7 @@
#define KILL_PIN P2_11 // EXP2-10
#endif // ULTRA_LCD
#endif // HAS_SPI_LCD
//
// SD Support

4
Marlin/src/pins/pins_DUE3DOM.h
View file

@ -112,7 +112,7 @@
//
// LCD / Controller
//
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
#define LCD_PINS_RS 42
#define LCD_PINS_ENABLE 43
@ -167,4 +167,4 @@
#define BEEPER_PIN -1
#endif // SPARK_FULL_GRAPHICS
#endif // ULTRA_LCD
#endif // HAS_SPI_LCD

4
Marlin/src/pins/pins_DUE3DOM_MINI.h
View file

@ -104,7 +104,7 @@
//
// LCD / Controller
//
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
#define LCD_PINS_RS 42
#define LCD_PINS_ENABLE 43
@ -170,4 +170,4 @@
#define DOGLCD_CS 45
#endif // SPARK_FULL_GRAPHICS
#endif // ULTRA_LCD
#endif // HAS_SPI_LCD

2
Marlin/src/pins/pins_DUPLICATOR_I3_PLUS.h
View file

@ -86,7 +86,7 @@
//
// LCDs and Controllers
//
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
#if ENABLED(ZONESTAR_LCD)
#define LCD_PINS_RS 2
#define LCD_PINS_ENABLE 36

4
Marlin/src/pins/pins_EINSY_RAMBO.h
View file

@ -148,7 +148,7 @@
//
// LCD / Controller
//
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
#define KILL_PIN 32
@ -176,4 +176,4 @@
#define SD_DETECT_PIN 15
#endif // NEWPANEL
#endif // ULTRA_LCD
#endif // HAS_SPI_LCD

4
Marlin/src/pins/pins_EINSY_RETRO.h
View file

@ -162,7 +162,7 @@
//
// LCD / Controller
//
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
#define KILL_PIN 32
@ -190,4 +190,4 @@
#define SD_DETECT_PIN 15
#endif // NEWPANEL
#endif // ULTRA_LCD
#endif // HAS_SPI_LCD

2
Marlin/src/pins/pins_FYSETC_AIO_II.h
View file

@ -121,7 +121,7 @@
//
// LCD Pins
//
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
#define BEEPER_PIN PC9

2
Marlin/src/pins/pins_FYSETC_CHEETAH.h
View file

@ -96,7 +96,7 @@
//
// LCD Pins
//
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
#define BEEPER_PIN PC9

4
Marlin/src/pins/pins_GT2560_REV_A.h
View file

@ -95,7 +95,7 @@
#define SUICIDE_PIN 54 // Must be enabled at startup to keep power flowing
#define KILL_PIN -1
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
#define BEEPER_PIN 18
@ -138,4 +138,4 @@
#endif // !NEWPANEL
#endif // ULTRA_LCD
#endif // HAS_SPI_LCD

4
Marlin/src/pins/pins_GTM32_PRO_VB.h
View file

@ -108,7 +108,7 @@
//
// LCD / Controller
//
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#define LCD_PINS_RS PE6 // CS chip select /SS chip slave select
@ -142,7 +142,7 @@
//#define LCD_PINS_D14 PD9 // RXD3
//#define LCD_PINS_D13 PD8 // TXD3
#endif // ULTRA_LCD
#endif // HAS_SPI_LCD
//
// SPI2 on LCD conn

2
Marlin/src/pins/pins_MEGATRONICS.h
View file

@ -120,7 +120,7 @@
#define SD_DETECT_PIN -1 // RAMPS doesn't use this
#endif // ULTRA_LCD && NEWPANEL
#endif // HAS_SPI_LCD && NEWPANEL
//
// M3/M4/M5 - Spindle/Laser Control

4
Marlin/src/pins/pins_MIGHTYBOARD_REVE.h
View file

@ -206,7 +206,7 @@
//
// LCD / Controller
//
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
@ -254,7 +254,7 @@
#define BTN_CENTER 15 // J0
#define BTN_ENC BTN_CENTER
#endif // ULTRA_LCD
#endif // HAS_SPI_LCD
//
// SD Card

4
Marlin/src/pins/pins_MINIRAMBO.h
View file

@ -140,7 +140,7 @@
//
// LCD / Controller
//
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
#if !MB(MINIRAMBO_10A)
#define KILL_PIN 32
@ -188,4 +188,4 @@
#endif // NEWPANEL
#endif // ULTRA_LCD
#endif // HAS_SPI_LCD

2
Marlin/src/pins/pins_MKS_SBASE.h
View file

@ -214,7 +214,7 @@
* that the garbage/lines are erased immediately after the SD card accesses are completed.
*/
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
#define BEEPER_PIN P1_31 // EXP1.1
#define BTN_ENC P1_30 // EXP1.2
#define BTN_EN1 P3_26 // EXP2.5

4
Marlin/src/pins/pins_MKS_SGEN_L.h
View file

@ -180,7 +180,7 @@
* ----- -----
* EXP1 EXP2
*/
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
#define BEEPER_PIN P1_31
#define BTN_ENC P1_30
@ -250,7 +250,7 @@
#endif
#endif // ULTRA_LCD
#endif // HAS_SPI_LCD
#ifndef SDCARD_CONNECTION
#define SDCARD_CONNECTION ONBOARD

2
Marlin/src/pins/pins_PRINTRBOARD.h
View file

@ -165,4 +165,4 @@
#endif
#endif // ULTRA_LCD && NEWPANEL
#endif // HAS_SPI_LCD && NEWPANEL

2
Marlin/src/pins/pins_PRINTRBOARD_REVF.h
View file

@ -200,7 +200,7 @@
//
//#define USE_INTERNAL_SD
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
#define LCD_PINS_RS 9 // E1 JP11-11
#define LCD_PINS_ENABLE 8 // E0 JP11-10
#define LCD_PINS_D4 7 // D7 JP11-8

4
Marlin/src/pins/pins_RADDS.h
View file

@ -207,7 +207,7 @@
//
// LCD / Controller
//
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
#if ENABLED(RADDS_DISPLAY)
@ -268,7 +268,7 @@
#endif // SPARK_FULL_GRAPHICS
#endif // ULTRA_LCD
#endif // HAS_SPI_LCD
#ifndef SDSS
#define SDSS 4

4
Marlin/src/pins/pins_RAMBO.h
View file

@ -168,7 +168,7 @@
//
// LCD / Controller
//
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
#define KILL_PIN 80
@ -234,4 +234,4 @@
#endif // !NEWPANEL
#endif // ULTRA_LCD
#endif // HAS_SPI_LCD

4
Marlin/src/pins/pins_RAMPS.h
View file

@ -360,7 +360,7 @@
// LCDs and Controllers //
//////////////////////////
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
//
// LCD Display output pins
@ -638,4 +638,4 @@
#endif
#endif // NEWPANEL
#endif // ULTRA_LCD
#endif // HAS_SPI_LCD

4
Marlin/src/pins/pins_RAMPS_DUO.h
View file

@ -74,7 +74,7 @@
//
// LCD / Controller
//
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
#if BOTH(NEWPANEL, PANEL_ONE)
#undef LCD_PINS_D4
@ -127,4 +127,4 @@
#endif // NEWPANEL
#endif // ULTRA_LCD
#endif // HAS_SPI_LCD

4
Marlin/src/pins/pins_RAMPS_FD_V1.h
View file

@ -138,7 +138,7 @@
//
// LCD / Controller
//
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
// ramps-fd lcd adaptor
#define BEEPER_PIN 37
@ -202,7 +202,7 @@
#define DOGLCD_MISO 74 // MISO_PIN
#endif
#endif // ULTRA_LCD
#endif // HAS_SPI_LCD
#if HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209)
/**

4
Marlin/src/pins/pins_RAMPS_LINUX.h
View file

@ -322,7 +322,7 @@
// LCDs and Controllers //
//////////////////////////
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
//
// LCD Display output pins
@ -565,4 +565,4 @@
#endif
#endif // NEWPANEL
#endif // ULTRA_LCD
#endif // HAS_SPI_LCD

4
Marlin/src/pins/pins_RAMPS_RE_ARM.h
View file

@ -296,7 +296,7 @@
#define LCD_PINS_ENABLE P0_18 // J3-10 & AUX-3 (SID, MOSI)
#define LCD_PINS_D4 P2_06 // J3-8 & AUX-3 (SCK, CLK)
#elif ENABLED(ULTRA_LCD)
#elif HAS_SPI_LCD
//#define SCK_PIN P0_15 // (52) system defined J3-9 & AUX-3
//#define MISO_PIN P0_17 // (50) system defined J3-10 & AUX-3
@ -392,7 +392,7 @@
//#define LCD_SCREEN_ROT_270
#endif
#endif // ULTRA_LCD
#endif // HAS_SPI_LCD
//
// Ethernet pins

4
Marlin/src/pins/pins_RURAMPS4D_11.h
View file

@ -200,7 +200,7 @@
//
// LCD / Controller
//
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
#if ANY(RADDS_DISPLAY, REPRAP_DISCOUNT_SMART_CONTROLLER, REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BEEPER_PIN 62
@ -271,4 +271,4 @@
#define BTN_ENC 40
#endif
#endif // ULTRA_LCD
#endif // HAS_SPI_LCD

4
Marlin/src/pins/pins_RURAMPS4D_13.h
View file

@ -186,7 +186,7 @@
//
// LCD / Controller
//
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
#if ANY(RADDS_DISPLAY, REPRAP_DISCOUNT_SMART_CONTROLLER, REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BEEPER_PIN 62
@ -255,4 +255,4 @@
#define BTN_ENC 40
#endif
#endif // ULTRA_LCD
#endif // HAS_SPI_LCD

10
Marlin/src/pins/pins_SANGUINOLOLU_11.h
View file

@ -153,9 +153,9 @@
//
// LCD / Controller
//
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
#if ENABLED(DOGLCD)
#if HAS_GRAPHICAL_LCD
#if ENABLED(U8GLIB_ST7920) // SPI GLCD 12864 ST7920 ( like [www.digole.com] ) For Melzi V2.0
@ -205,7 +205,7 @@
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
#else // !DOGLCD
#else // !HAS_GRAPHICAL_LCD
#define LCD_PINS_RS 4
#define LCD_PINS_ENABLE 17
@ -214,7 +214,7 @@
#define LCD_PINS_D6 28
#define LCD_PINS_D7 27
#endif // !DOGLCD
#endif // !HAS_GRAPHICAL_LCD
#if ENABLED(LCD_I2C_PANELOLU2)
@ -271,7 +271,7 @@
#define SD_DETECT_PIN -1
#endif // ULTRA_LCD
#endif // HAS_SPI_LCD
//
// M3/M4/M5 - Spindle/Laser Control

2
Marlin/src/pins/pins_SILVER_GATE.h
View file

@ -68,7 +68,7 @@
#define HEATER_BED_PIN 8
#define TEMP_BED_PIN 6
#if ENABLED(DOGLCD)
#if HAS_GRAPHICAL_LCD
#if ENABLED(U8GLIB_ST7920) // SPI GLCD 12864 ST7920
#define LCD_PINS_RS 30
#define LCD_PINS_ENABLE 20

4
Marlin/src/pins/pins_STM32F1R.h
View file

@ -99,7 +99,7 @@
//
// LCD Pins
//
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
#if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
#define LCD_PINS_RS 49 // CS chip select /SS chip slave select
@ -260,4 +260,4 @@
#endif
#endif // NEWPANEL
#endif // ULTRA_LCD
#endif // HAS_SPI_LCD

4
Marlin/src/pins/pins_STM3R_MINI.h
View file

@ -114,7 +114,7 @@
//
// LCD Pins
//
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
#if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
#define LCD_PINS_RS 49 // CS chip select /SS chip slave select
@ -276,4 +276,4 @@
#endif
#endif // NEWPANEL
#endif // ULTRA_LCD
#endif // HAS_SPI_LCD

2
Marlin/src/pins/pins_TEENSY35_36.h
View file

@ -139,7 +139,7 @@ D8 HEATER_BED_PIN CS1 RX4 A12 31 | 46 * * 47 | 34 A15 PWM
#endif
#endif
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
#define LCD_PINS_RS 40
#define LCD_PINS_ENABLE 41
#define LCD_PINS_D4 42

2
Marlin/src/pins/pins_TEENSYLU.h
View file

@ -153,7 +153,7 @@
#define SD_DETECT_PIN -1
#endif // ULTRA_LCD && NEWPANEL
#endif // HAS_SPI_LCD && NEWPANEL
//
// M3/M4/M5 - Spindle/Laser Control

4
Marlin/src/pins/pins_TRIGORILLA_14.h
View file

@ -81,7 +81,7 @@
// AnyCubic made the following changes to 1.1.0-RC8
// If these are appropriate for your LCD let us know.
//
#if 0 && ENABLED(ULTRA_LCD)
#if 0 && HAS_SPI_LCD
// LCD Display output pins
#if BOTH(NEWPANEL, PANEL_ONE)
@ -107,4 +107,4 @@
#define DOGLCD_A0 42
#endif
#endif // ULTRA_LCD
#endif // HAS_SPI_LCD

4
Marlin/src/pins/pins_ULTIMAKER.h
View file

@ -115,7 +115,7 @@
//
// LCD / Controller
//
#if ENABLED(ULTRA_LCD)
#if HAS_SPI_LCD
#define BEEPER_PIN 18
@ -154,7 +154,7 @@
#endif // !NEWPANEL
#endif // ULTRA_LCD
#endif // HAS_SPI_LCD
//
// M3/M4/M5 - Spindle/Laser Control

93
Marlin/src/pins/pins_ULTIMAKER_OLD.h
View file

@ -24,7 +24,7 @@
* Ultimaker pin assignments (Old electronics)
*/
/**
/**
* Rev B 3 JAN 2017
*
* Details on pin definitions for M3, M4 & M5 spindle control commands and for
@ -55,10 +55,9 @@
* and repeat steps 2 - 5
*/
#define board_rev_1_1_TO_1_3
//#define board_rev_1_0
//#define board_rev_1_5
#define BOARD_REV_1_1_TO_1_3
//#define BOARD_REV_1_0
//#define BOARD_REV_1_5
#if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
@ -71,7 +70,7 @@
//
// Limit Switches
//
#if ENABLED(board_rev_1_1_TO_1_3)
#if ENABLED(BOARD_REV_1_1_TO_1_3)
#define X_MIN_PIN 15 // SW1
#define X_MAX_PIN 14 // SW2
#define Y_MIN_PIN 17 // SW3
@ -80,16 +79,22 @@
#define Z_MAX_PIN 18 // SW6
#endif
#if ENABLED(board_rev_1_0)
#if ENABLED(BOARD_REV_1_0)
#if ENABLED(SPINDLE_LASER_ENABLE)
#define X_STOP_PIN 13 // SW1 (didn't change) - also has a useable hardware PWM
#define Y_STOP_PIN 12 // SW2
#define Z_STOP_PIN 11 // SW3
#else
#define X_MIN_PIN 13 // SW1
#define X_MAX_PIN 12 // SW2
#define Y_MIN_PIN 11 // SW3
#define Y_MAX_PIN 10 // SW4
#define Z_MIN_PIN 9 // SW5
#define Z_MAX_PIN 8 // SW6
#endif
#endif
#if ENABLED(board_rev_1_5)
#if ENABLED(BOARD_REV_1_5)
#define X_MIN_PIN 22
#define X_MAX_PIN 24
#define Y_MIN_PIN 26
@ -101,7 +106,7 @@
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
#if !defined(Z_MIN_PROBE_PIN) && !BOTH(SPINDLE_LASER_ENABLE, BOARD_REV_1_0)
#define Z_MIN_PROBE_PIN Z_MAX_PIN
#endif
@ -120,13 +125,20 @@
#define Z_DIR_PIN 39
#define Z_ENABLE_PIN 35
#define E0_STEP_PIN 43
#define E0_DIR_PIN 45
#define E0_ENABLE_PIN 41
#if BOTH(SPINDLE_LASER_ENABLE, BOARD_REV_1_1_TO_1_3) && EXTRUDERS == 1
// Move E0 to the spare and get Spindle/Laser signals from E0
#define E0_STEP_PIN 49
#define E0_DIR_PIN 47
#define E0_ENABLE_PIN 48
#else
#define E0_STEP_PIN 43
#define E0_DIR_PIN 45
#define E0_ENABLE_PIN 41
#define E1_STEP_PIN -1 // 49
#define E1_DIR_PIN -1 // 47
#define E1_ENABLE_PIN -1 // 48
#define E1_STEP_PIN 49
#define E1_DIR_PIN 47
#define E1_ENABLE_PIN 48
#endif
//
// Temperature Sensors
@ -144,7 +156,8 @@
//
// LCD / Controller
//
#if ANY(board_rev_1_0, board_rev_1_1_TO_1_3)
#if ANY(BOARD_REV_1_0, BOARD_REV_1_1_TO_1_3)
#define LCD_PINS_RS 24
#define LCD_PINS_ENABLE 22
#define LCD_PINS_D4 36
@ -152,7 +165,7 @@
#define LCD_PINS_D6 32
#define LCD_PINS_D7 30
#elif ENABLED(board_rev_1_5, ULTRA_LCD)
#elif ENABLED(BOARD_REV_1_5, ULTRA_LCD)
#define BEEPER_PIN 18
@ -187,16 +200,14 @@
#define LCD_PINS_D6 20
#define LCD_PINS_D7 19
#define SD_DETECT_PIN -1
#endif // !NEWPANEL
#endif // ULTRA_LCD
#endif
//
// case light - see spindle section for more info on available hardware PWMs
//
#if !PIN_EXISTS(CASE_LIGHT) && ENABLED(board_rev_1_5)
#if !PIN_EXISTS(CASE_LIGHT) && ENABLED(BOARD_REV_1_5)
#define CASE_LIGHT_PIN 7 // use PWM - MUST BE HARDWARE PWM
#endif
@ -204,33 +215,11 @@
// M3/M4/M5 - Spindle/Laser Control
//
#if ENABLED(SPINDLE_LASER_ENABLE)
#if ENABLED(board_rev_1_0) // use the last three SW positions
#undef Z_MIN_PROBE_PIN
#undef X_MIN_PIN // SW1
#undef X_MAX_PIN // SW2
#undef Y_MIN_PIN // SW3
#undef Y_MAX_PIN // SW4
#undef Z_MIN_PIN // SW5
#undef Z_MAX_PIN // SW6
#define X_STOP_PIN 13 // SW1 (didn't change) - also has a useable hardware PWM
#define Y_STOP_PIN 12 // SW2
#define Z_STOP_PIN 11 // SW3
#define SPINDLE_DIR_PIN 10 // SW4
#define SPINDLE_LASER_PWM_PIN 9 // SW5 MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENA_PIN 8 // SW6 Pin should have a pullup!
#elif ENABLED(board_rev_1_5) // use the same pins - but now they are on a different connector
#define SPINDLE_DIR_PIN 10 // EXP3-6 (silkscreen says 10)
#define SPINDLE_LASER_PWM_PIN 9 // EXP3-7 (silkscreen says 9) MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENA_PIN 8 // EXP3-8 (silkscreen says 8) Pin should have a pullup!
#elif ENABLED(board_rev_1_1_TO_1_3)
#if EITHER(BOARD_REV_1_0, BOARD_REV_1_5) // Use the last three SW positions
#define SPINDLE_DIR_PIN 10 // 1.0: SW4 1.5: EXP3-6 ("10")
#define SPINDLE_LASER_PWM_PIN 9 // 1.0: SW5 1.5: EXP3-7 ( "9") .. MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENA_PIN 8 // 1.0: SW6 1.5: EXP3-8 ( "8") .. Pin should have a pullup!
#elif ENABLED(BOARD_REV_1_1_TO_1_3)
/**
* Only four hardware PWMs physically connected to anything on these boards:
*
@ -242,13 +231,7 @@
* If one of the heaters is used then special precautions will usually be needed.
* They have an LED and resistor pullup to +24V which could damage 3.3V-5V ICs.
*/
#if EXTRUDERS == 1 // Move E0 stepper module to the spare and get signals from E0
#undef E0_STEP_PIN
#undef E0_DIR_PIN
#undef E0_ENABLE_PIN
#define E0_STEP_PIN 49
#define E0_DIR_PIN 47
#define E0_ENABLE_PIN 48
#if EXTRUDERS == 1
#define SPINDLE_DIR_PIN 43
#define SPINDLE_LASER_PWM_PIN 45 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENA_PIN 41 // Pin should have a pullup!

2
buildroot/share/tests/megaatmega2560-tests
View file

@ -43,7 +43,7 @@ opt_enable PIDTEMPBED FIX_MOUNTED_PROBE Z_SAFE_HOMING EEPROM_SETTINGS \
opt_enable SLOW_PWM_HEATERS THERMAL_PROTECTION_CHAMBER
opt_set TEMP_SENSOR_CHAMBER 3
opt_set HEATER_CHAMBER_PIN 45
exec_test $1 $2 "RAMPS with 2 extruders, RRDFGSC, Linear ABL, LEDs, and many options"
exec_test $1 $2 "RAMPS with 2 extruders, RepRap LCD, Linear ABL, LEDs, and many options"
#
# Test a probeless build of AUTO_BED_LEVELING_UBL, with lots of extruders