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

4
Marlin/src/pins/sanguino/pins_ANET_10.h
View File

@@ -151,7 +151,7 @@
#if HAS_WIRED_LCD
#define LCD_SDSS 28
#if ENABLED(ADC_KEYPAD)
#if HAS_ADC_BUTTONS
#define SERVO0_PIN 27 // free for BLTouch/3D-Touch
#define LCD_PINS_RS 28
#define LCD_PINS_ENABLE 29
@@ -160,7 +160,7 @@
#define LCD_PINS_D6 16
#define LCD_PINS_D7 17
#define ADC_KEYPAD_PIN 1
#elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#elif IS_RRD_FG_SC
// Pin definitions for the Anet A6 Full Graphics display and the RepRapDiscount Full Graphics
// display using an adapter board // https://go.aisler.net/benlye/anet-lcd-adapter/pcb
// See below for alternative pin definitions for use with https://www.thingiverse.com/thing:2103748

8
Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
View File

@@ -136,7 +136,7 @@
#define LCD_BACKLIGHT_PIN 17 // LCD backlight LED
#endif
#if NONE(SPINDLE_FEATURE, LASER_FEATURE) && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(ULTRA_LCD, NEWPANEL)// try to use IO Header
#if NONE(SPINDLE_FEATURE, LASER_FEATURE) && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(IS_ULTRA_LCD, IS_NEWPANEL) // try to use IO Header
#define CASE_LIGHT_PIN 4 // Hardware PWM - see if IO Header is available
#endif
@@ -185,7 +185,7 @@
// with M42 instead of BEEPER_PIN.
#define BEEPER_PIN 27
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#if IS_RRD_FG_SC
#ifndef BOARD_ST7920_DELAY_1
#define BOARD_ST7920_DELAY_1 DELAY_NS(0)
#endif
@@ -283,7 +283,7 @@
#endif
#if ENABLED(NEWPANEL) && !defined(BTN_EN1)
#if IS_NEWPANEL && !defined(BTN_EN1)
#define BTN_EN1 11
#define BTN_EN2 10
#endif
@@ -294,7 +294,7 @@
// M3/M4/M5 - Spindle/Laser Control
//
#if HAS_CUTTER
#if !MB(AZTEEG_X1) && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(ULTRA_LCD, NEWPANEL)// try to use IO Header
#if !MB(AZTEEG_X1) && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(IS_ULTRA_LCD, IS_NEWPANEL) // try to use IO Header
#define SPINDLE_LASER_ENA_PIN 10 // Pullup or pulldown!
#define SPINDLE_LASER_PWM_PIN 4 // Hardware PWM

2
Marlin/src/pins/sanguino/pins_ZMIB_V2.h
View File

@@ -225,7 +225,7 @@
//
// All the above are also RRDSC with rotary encoder
//
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#if IS_RRD_SC
#define BTN_EN1 2
#define BTN_EN2 12
#define BTN_ENC 29