Fysetc S6 pins / LCD updates (#16830)
This commit is contained in:
parent
0b984519c3
commit
63dd0f249d
4 changed files with 26 additions and 5 deletions
|
@ -1333,9 +1333,11 @@
|
|||
//#define AO_EXP1_PINMAP // AlephObjects CLCD UI EXP1 mapping
|
||||
//#define AO_EXP2_PINMAP // AlephObjects CLCD UI EXP2 mapping
|
||||
//#define CR10_TFT_PINMAP // Rudolph Riedel's CR10 pin mapping
|
||||
//#define S6_TFT_PINMAP // FYSETC S6 pin mapping
|
||||
|
||||
//#define OTHER_PIN_LAYOUT // Define pins manually below
|
||||
#if ENABLED(OTHER_PIN_LAYOUT)
|
||||
// The pins for CS and MOD_RESET (PD) must be chosen.
|
||||
// Pins for CS and MOD_RESET (PD) must be chosen
|
||||
#define CLCD_MOD_RESET 9
|
||||
#define CLCD_SPI_CS 10
|
||||
|
||||
|
|
|
@ -37,6 +37,10 @@
|
|||
#ifdef __MARLIN_FIRMWARE__
|
||||
// __MARLIN_FIRMWARE__ exists when compiled within Marlin.
|
||||
#include "pin_mappings.h"
|
||||
#undef max
|
||||
#define max(a,b) ((a)>(b)?(a):(b))
|
||||
#undef min
|
||||
#define min(a,b) ((a)<(b)?(a):(b))
|
||||
#else
|
||||
namespace UI {
|
||||
static inline uint32_t safe_millis() {return millis();};
|
||||
|
|
|
@ -27,6 +27,15 @@
|
|||
* without adding new pin definitions to the board.
|
||||
*/
|
||||
|
||||
#ifdef S6_TFT_PINMAP
|
||||
#ifndef __MARLIN_FIRMWARE__
|
||||
#error "This pin mapping requires Marlin."
|
||||
#endif
|
||||
|
||||
#define CLCD_SPI_CS PC7
|
||||
#define CLCD_MOD_RESET PC6
|
||||
#endif
|
||||
|
||||
#ifdef CR10_TFT_PINMAP
|
||||
#ifndef __MARLIN_FIRMWARE__
|
||||
#error "This pin mapping requires Marlin."
|
||||
|
|
|
@ -48,6 +48,11 @@
|
|||
#define E2END 0xFFF // 4KB
|
||||
#endif
|
||||
|
||||
//
|
||||
// Servos
|
||||
//
|
||||
#define SERVO0_PIN PA3
|
||||
|
||||
//
|
||||
// Limit Switches
|
||||
//
|
||||
|
@ -59,10 +64,11 @@
|
|||
#define Z_MAX_PIN PA3
|
||||
|
||||
//
|
||||
// Servos
|
||||
// share with Z_MAX_PIN
|
||||
// Filament Sensor
|
||||
//
|
||||
#define SERVO0_PIN PA3
|
||||
#ifndef FIL_RUNOUT_PIN
|
||||
#define FIL_RUNOUT_PIN PA1
|
||||
#endif
|
||||
|
||||
//
|
||||
// Steppers
|
||||
|
@ -160,6 +166,7 @@
|
|||
//#define KILL_PIN PC5
|
||||
|
||||
#define SDSS PA4
|
||||
#define SD_DETECT_PIN PB10
|
||||
|
||||
//
|
||||
// LCD / Controller
|
||||
|
@ -189,7 +196,6 @@
|
|||
|
||||
#define BTN_EN1 PC6
|
||||
#define BTN_EN2 PC7
|
||||
#define SD_DETECT_PIN PB10
|
||||
|
||||
#define LCD_SDSS PA4
|
||||
|
||||
|
|
Reference in a new issue