소스 검색

Fysetc S6 pins / LCD updates (#16830)

George Fu 4 년 전
부모
커밋
63dd0f249d
No account linked to committer's email address

+ 3
- 1
Marlin/Configuration_adv.h 파일 보기

@@ -1333,9 +1333,11 @@
1333 1333
   //#define AO_EXP1_PINMAP    // AlephObjects CLCD UI EXP1 mapping
1334 1334
   //#define AO_EXP2_PINMAP    // AlephObjects CLCD UI EXP2 mapping
1335 1335
   //#define CR10_TFT_PINMAP   // Rudolph Riedel's CR10 pin mapping
1336
+  //#define S6_TFT_PINMAP     // FYSETC S6 pin mapping
1337
+
1336 1338
   //#define OTHER_PIN_LAYOUT  // Define pins manually below
1337 1339
   #if ENABLED(OTHER_PIN_LAYOUT)
1338
-    // The pins for CS and MOD_RESET (PD) must be chosen.
1340
+    // Pins for CS and MOD_RESET (PD) must be chosen
1339 1341
     #define CLCD_MOD_RESET  9
1340 1342
     #define CLCD_SPI_CS    10
1341 1343
 

+ 4
- 0
Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/compat.h 파일 보기

@@ -37,6 +37,10 @@
37 37
 #ifdef __MARLIN_FIRMWARE__
38 38
   // __MARLIN_FIRMWARE__ exists when compiled within Marlin.
39 39
   #include "pin_mappings.h"
40
+  #undef max
41
+  #define max(a,b) ((a)>(b)?(a):(b))
42
+  #undef min
43
+  #define min(a,b) ((a)<(b)?(a):(b))
40 44
 #else
41 45
   namespace UI {
42 46
     static inline uint32_t safe_millis() {return millis();};

+ 9
- 0
Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/pin_mappings.h 파일 보기

@@ -27,6 +27,15 @@
27 27
  * without adding new pin definitions to the board.
28 28
  */
29 29
 
30
+#ifdef S6_TFT_PINMAP
31
+  #ifndef __MARLIN_FIRMWARE__
32
+    #error "This pin mapping requires Marlin."
33
+  #endif
34
+
35
+  #define CLCD_SPI_CS         PC7
36
+  #define CLCD_MOD_RESET      PC6
37
+#endif
38
+
30 39
 #ifdef CR10_TFT_PINMAP
31 40
   #ifndef __MARLIN_FIRMWARE__
32 41
     #error "This pin mapping requires Marlin."

+ 10
- 4
Marlin/src/pins/stm32/pins_FYSETC_S6.h 파일 보기

@@ -49,6 +49,11 @@
49 49
 #endif
50 50
 
51 51
 //
52
+// Servos
53
+//
54
+#define SERVO0_PIN         PA3
55
+
56
+//
52 57
 // Limit Switches
53 58
 //
54 59
 #define X_MIN_PIN          PB14
@@ -59,10 +64,11 @@
59 64
 #define Z_MAX_PIN          PA3
60 65
 
61 66
 //
62
-// Servos
63
-// share with Z_MAX_PIN
67
+// Filament Sensor
64 68
 //
65
-#define SERVO0_PIN         PA3
69
+#ifndef FIL_RUNOUT_PIN
70
+  #define FIL_RUNOUT_PIN   PA1
71
+#endif
66 72
 
67 73
 //
68 74
 // Steppers
@@ -160,6 +166,7 @@
160 166
 //#define KILL_PIN           PC5
161 167
 
162 168
 #define SDSS               PA4
169
+#define SD_DETECT_PIN  	   PB10
163 170
 
164 171
 //
165 172
 // LCD / Controller
@@ -189,7 +196,6 @@
189 196
 
190 197
     #define BTN_EN1        PC6
191 198
     #define BTN_EN2        PC7
192
-    #define SD_DETECT_PIN  PB10
193 199
 
194 200
     #define LCD_SDSS       PA4
195 201
 

Loading…
취소
저장