andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Support FT81050 with FYSETC F6 (#18678) 

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
vanilla_fb_2.0.x
George Fu 4 years ago
committed by GitHub
parent
4abad60bf1
commit
bd0430dc38
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 72 additions and 83 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      Marlin/Configuration_adv.h
  2. 154
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/pin_mappings.h

1
Marlin/Configuration_adv.h
View File

@ -1436,6 +1436,7 @@
//#define AO_EXP2_PINMAP // AlephObjects CLCD UI EXP2 mapping //#define AO_EXP2_PINMAP // AlephObjects CLCD UI EXP2 mapping
//#define CR10_TFT_PINMAP // Rudolph Riedel's CR10 pin mapping //#define CR10_TFT_PINMAP // Rudolph Riedel's CR10 pin mapping
//#define S6_TFT_PINMAP // FYSETC S6 pin mapping //#define S6_TFT_PINMAP // FYSETC S6 pin mapping
//#define F6_TFT_PINMAP // FYSETC F6 pin mapping
//#define OTHER_PIN_LAYOUT // Define pins manually below //#define OTHER_PIN_LAYOUT // Define pins manually below
#if ENABLED(OTHER_PIN_LAYOUT) #if ENABLED(OTHER_PIN_LAYOUT)

154
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/pin_mappings.h
View File

@ -27,19 +27,19 @@
* without adding new pin definitions to the board. * without adding new pin definitions to the board.
*/ */
#ifdef S6_TFT_PINMAP #include "../../../../inc/MarlinConfig.h"
#ifndef __MARLIN_FIRMWARE__
#error "This pin mapping requires Marlin." #if ENABLED(F6_TFT_PINMAP) // FYSETC F6 - ATmega2560
#endif
#define CLCD_SPI_CS 33
#define CLCD_MOD_RESET 31
#elif ENABLED(S6_TFT_PINMAP) // FYSETC S6 - STM32F4
#define CLCD_SPI_CS PC7 #define CLCD_SPI_CS PC7
#define CLCD_MOD_RESET PC6 #define CLCD_MOD_RESET PC6
#endif
#ifdef CR10_TFT_PINMAP #elif ENABLED(CR10_TFT_PINMAP) // FYSETC S6 - STM32F4 - with TOUCH_UI_ULTIPANEL
#ifndef __MARLIN_FIRMWARE__
#error "This pin mapping requires Marlin."
#endif
#define CLCD_USE_SOFT_SPI #define CLCD_USE_SOFT_SPI
#define CLCD_SOFT_SPI_SCLK LCD_PINS_D4 // PORTA1 Pin 6 #define CLCD_SOFT_SPI_SCLK LCD_PINS_D4 // PORTA1 Pin 6
@ -49,17 +49,13 @@
#define CLCD_MOD_RESET 11 // PORTD3 BTN_EN1 Pin 3 #define CLCD_MOD_RESET 11 // PORTD3 BTN_EN1 Pin 3
#define CLCD_AUX_0 10 // PORTD2 BTN_EN2 Pin 5 #define CLCD_AUX_0 10 // PORTD2 BTN_EN2 Pin 5
#define CLCD_AUX_1 BEEPER_PIN // PORTA4 Pin 1 #define CLCD_AUX_1 BEEPER_PIN // PORTA4 Pin 1
#endif
/** #elif ENABLED(AO_EXP1_DEPRECATED_PINMAP)
* The AlephObjects pinout for re-purposing the UltraLCD
* connector EXP1 for software SPI (rev B, obsolete)
*/
#ifdef AO_EXP1_DEPRECATED_PINMAP /**
#ifndef __MARLIN_FIRMWARE__ * This AlephObjects pinout re-purposes the UltraLCD
#error "This pin mapping requires Marlin." * connector EXP1 for Software SPI (rev B, obsolete)
#endif */
#define CLCD_MOD_RESET LCD_PINS_D4 #define CLCD_MOD_RESET LCD_PINS_D4
#define CLCD_SPI_CS LCD_PINS_D5 #define CLCD_SPI_CS LCD_PINS_D5
@ -72,34 +68,30 @@
#define CLCD_SOFT_SPI_SCLK LCD_PINS_D7 #define CLCD_SOFT_SPI_SCLK LCD_PINS_D7
#define CLCD_SOFT_SPI_MOSI LCD_PINS_D6 #define CLCD_SOFT_SPI_MOSI LCD_PINS_D6
#define CLCD_SOFT_SPI_MISO LCD_PINS_RS #define CLCD_SOFT_SPI_MISO LCD_PINS_RS
#endif
/** #elif ENABLED(AO_EXP1_PINMAP)
* AO_EXP1_PINMAP
* /**
* The AlephObjects mapping for re-purposing the UltraLCD * AO_EXP1_PINMAP with TOUCH_UI_ULTIPANEL
* connector EXP1 for software SPI for display (rev C): *
* * This AlephObjects mapping re-purposes the UltraLCD
* EXP2: FTDI: SD -or- USB [1]: ULTRA_LCD: * connector EXP1 for Software SPI for display (rev C):
* 1 MISO MISO MISO --> BEEPER *
* 2 SCLK SCLK SCLK --> BTN_ENC * EXP2: FTDI: SD -or- USB [1]: ULTRA_LCD:
* 3 PD_N - - --> LCDE * 1 MISO MISO MISO --> BEEPER
* 4 - CS_N CS_N --> LCDRS * 2 SCLK SCLK SCLK --> BTN_ENC
* 5 CS_N - - --> LCD4 * 3 PD_N - - --> LCDE
* 6 MOSI MOSI MOSI --> LCD5 * 4 - CS_N CS_N --> LCDRS
* 7 - SD_DET INT --> LCD6 * 5 CS_N - - --> LCD4
* 8 RESET - RESET --> LCD4 * 6 MOSI MOSI MOSI --> LCD5
* 9 GND GND GND --> GND * 7 - SD_DET INT --> LCD6
* 10 5V 5V 5V --> 5V * 8 RESET - RESET --> LCD4
* * 9 GND GND GND --> GND
* [1] At the moment, Marlin does not support SD or USB * 10 5V 5V 5V --> 5V
* functionality over software SPI. *
*/ * [1] At the moment, Marlin does not support SD or USB
* functionality over software SPI.
#ifdef AO_EXP1_PINMAP */
#ifndef __MARLIN_FIRMWARE__
#error "This pin mapping requires Marlin."
#endif
#define CLCD_MOD_RESET LCD_PINS_ENABLE #define CLCD_MOD_RESET LCD_PINS_ENABLE
#define CLCD_SPI_CS LCD_PINS_D4 #define CLCD_SPI_CS LCD_PINS_D4
@ -108,49 +100,45 @@
#define CLCD_SOFT_SPI_SCLK BTN_ENC #define CLCD_SOFT_SPI_SCLK BTN_ENC
#define CLCD_SOFT_SPI_MOSI LCD_PINS_D5 #define CLCD_SOFT_SPI_MOSI LCD_PINS_D5
#define CLCD_SOFT_SPI_MISO BEEPER_PIN #define CLCD_SOFT_SPI_MISO BEEPER_PIN
#endif
/** #elif ENABLED(AO_EXP2_PINMAP)
* AO_EXP2_PINMAP
* /**
* The AlephObjects mapping for re-purposing the UltraLCD * AO_EXP2_PINMAP with TOUCH_UI_ULTIPANEL
* connector EXP2 for hardware SPI for display and SD card *
* or USB (rev C): * The AlephObjects mapping for re-purposing the UltraLCD
* * connector EXP2 for hardware SPI for display and SD card
* EXP2: FTDI: SD -or- USB: ULTRA_LCD: * or USB (rev C):
* 1 MISO MISO MISO --> MISO *
* 2 SCLK SCLK SCLK --> SCLK * EXP2: FTDI: SD -or- USB: ULTRA_LCD:
* 3 PD_N - - --> BTN_EN2 * 1 MISO MISO MISO --> MISO
* 4 - CS_N CS_N --> SD_CSEL * 2 SCLK SCLK SCLK --> SCLK
* 5 CS_N - - --> BTN_EN1 * 3 PD_N - - --> BTN_EN2
* 6 MOSI MOSI MOSI --> MOSI * 4 - CS_N CS_N --> SD_CSEL
* 7 - SD_DET INT --> SD_DET * 5 CS_N - - --> BTN_EN1
* 8 RESET - RESET --> RESET * 6 MOSI MOSI MOSI --> MOSI
* 9 GND GND GND --> GND * 7 - SD_DET INT --> SD_DET
* 10 5V 5V 5V --> KILL [3] * 8 RESET - RESET --> RESET
* * 9 GND GND GND --> GND
* [1] This configuration allows daisy-chaining of the * 10 5V 5V 5V --> KILL [3]
* display and SD/USB on EXP2, except for [2] *
* * [1] This configuration allows daisy-chaining of the
* [2] The Ultimachine Einsy boards have a level shifter * display and SD/USB on EXP2, except for [2]
* on MISO enabled by SD_CSEL chip select, hence it *
* is not possible to run both the display and the * [2] The Ultimachine Einsy boards have a level shifter
* SD/USB on EXP2. * on MISO enabled by SD_CSEL chip select, hence it
* * is not possible to run both the display and the
* [3] Archim Rambo provides 5V on this pin. On any other * SD/USB on EXP2.
* board, divert this wire from the ribbon cable and *
* connect it to 5V at an endstop. * [3] Archim Rambo provides 5V on this pin. On any other
*/ * board, divert this wire from the ribbon cable and
* connect it to 5V at an endstop.
#ifdef AO_EXP2_PINMAP */
#ifndef __MARLIN_FIRMWARE__
#error "This pin mapping requires Marlin."
#endif
#define CLCD_SPI_CS BTN_EN1 #define CLCD_SPI_CS BTN_EN1
#define CLCD_MOD_RESET BTN_EN2 #define CLCD_MOD_RESET BTN_EN2
#if MB(EINSY_RAMBO, EINSY_RETRO) && DISABLED(SDSUPPORT) #if MB(EINSY_RAMBO, EINSY_RETRO) && DISABLED(SDSUPPORT)
#define CLCD_SPI_EXTRA_CS SDSS #define CLCD_SPI_EXTRA_CS SDSS
#endif #endif
#endif #endif

Write Preview
Loading…
Cancel
Save