Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fysetc s6 board update #16830

Merged
merged 6 commits into from
Feb 14, 2020
Merged

Fysetc s6 board update #16830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7cef4f5
Support ftdi screen for FYSETC S6
GerogeFu Feb 11, 2020
dfc81f0
Update FYSETC S6 pins
GerogeFu Feb 11, 2020
a853b8b
Update pin_mappings.h
thinkyhead Feb 11, 2020
4df410c
Update pins_FYSETC_S6.h
thinkyhead Feb 14, 2020
3931e1c
Update Configuration_adv.h
thinkyhead Feb 14, 2020
a6f5802
Update pin_mappings.h
thinkyhead Feb 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Marlin/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 4 additions & 0 deletions Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/compat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();};
Expand Down
9 changes: 9 additions & 0 deletions Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/pin_mappings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
14 changes: 10 additions & 4 deletions Marlin/src/pins/stm32/pins_FYSETC_S6.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@
#define E2END 0xFFF // 4KB
#endif

//
// Servos
//
#define SERVO0_PIN PA3

//
// Limit Switches
//
Expand All @@ -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
Expand Down Expand Up @@ -160,6 +166,7 @@
//#define KILL_PIN PC5

#define SDSS PA4
#define SD_DETECT_PIN PB10

//
// LCD / Controller
Expand Down Expand Up @@ -189,7 +196,6 @@

#define BTN_EN1 PC6
#define BTN_EN2 PC7
#define SD_DETECT_PIN PB10

#define LCD_SDSS PA4

Expand Down