thomas
/
marlin
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Define short pin names in fastio for STM32 (#10461)

Scott Lahteine 7 years ago
parent
65a6a86d19
commit
dea686cf55
No account linked to committer's email address
5 changed files with 368 additions and 169 deletions
Split View Show Diff Stats
  1. 93
    0
      Marlin/src/HAL/HAL_STM32F4/fastio_STM32F4.h
  2. 129
    0
      Marlin/src/HAL/HAL_STM32F7/fastio_STM32F7.h
  3. 4
    5
      Marlin/src/HAL/HAL_STM32F7/spi_pins.h
  4. 62
    72
      Marlin/src/pins/pins_STM32F4.h
  5. 80
    92
      Marlin/src/pins/pins_THE_BORG.h

+ 93
- 0
Marlin/src/HAL/HAL_STM32F4/fastio_STM32F4.h View File 

@@ -51,4 +51,97 @@
51 51
52 52 
 #define OUT_WRITE(IO, v) { _SET_OUTPUT(IO); WRITE(IO, v); }
53 53
54 
+#define PORTA 0
55 
+#define PORTB 1
56 
+#define PORTC 2
57 
+#define PORTD 3
58 
+#define PORTE 4
59 
+
60 
+#define _STM32_PIN(_PORT,_PIN) ((PORT##_PORT * 16) + _PIN)
61 
+
62 
+#define PA0  _STM32_PIN(A,  0)
63 
+#define PA1  _STM32_PIN(A,  1)
64 
+#define PA2  _STM32_PIN(A,  2)
65 
+#define PA3  _STM32_PIN(A,  3)
66 
+#define PA4  _STM32_PIN(A,  4)
67 
+#define PA5  _STM32_PIN(A,  5)
68 
+#define PA6  _STM32_PIN(A,  6)
69 
+#define PA7  _STM32_PIN(A,  7)
70 
+#define PA8  _STM32_PIN(A,  8)
71 
+#define PA9  _STM32_PIN(A,  9)
72 
+#define PA10 _STM32_PIN(A, 10)
73 
+#define PA11 _STM32_PIN(A, 11)
74 
+#define PA12 _STM32_PIN(A, 12)
75 
+#define PA13 _STM32_PIN(A, 13)
76 
+#define PA14 _STM32_PIN(A, 14)
77 
+#define PA15 _STM32_PIN(A, 15)
78 
+
79 
+#define PB0  _STM32_PIN(B,  0)
80 
+#define PB1  _STM32_PIN(B,  1)
81 
+#define PB2  _STM32_PIN(B,  2)
82 
+#define PB3  _STM32_PIN(B,  3)
83 
+#define PB4  _STM32_PIN(B,  4)
84 
+#define PB5  _STM32_PIN(B,  5)
85 
+#define PB6  _STM32_PIN(B,  6)
86 
+#define PB7  _STM32_PIN(B,  7)
87 
+#define PB8  _STM32_PIN(B,  8)
88 
+#define PB9  _STM32_PIN(B,  9)
89 
+#define PB10 _STM32_PIN(B, 10)
90 
+#define PB11 _STM32_PIN(B, 11)
91 
+#define PB12 _STM32_PIN(B, 12)
92 
+#define PB13 _STM32_PIN(B, 13)
93 
+#define PB14 _STM32_PIN(B, 14)
94 
+#define PB15 _STM32_PIN(B, 15)
95 
+
96 
+#define PC0  _STM32_PIN(C,  0)
97 
+#define PC1  _STM32_PIN(C,  1)
98 
+#define PC2  _STM32_PIN(C,  2)
99 
+#define PC3  _STM32_PIN(C,  3)
100 
+#define PC4  _STM32_PIN(C,  4)
101 
+#define PC5  _STM32_PIN(C,  5)
102 
+#define PC6  _STM32_PIN(C,  6)
103 
+#define PC7  _STM32_PIN(C,  7)
104 
+#define PC8  _STM32_PIN(C,  8)
105 
+#define PC9  _STM32_PIN(C,  9)
106 
+#define PC10 _STM32_PIN(C, 10)
107 
+#define PC11 _STM32_PIN(C, 11)
108 
+#define PC12 _STM32_PIN(C, 12)
109 
+#define PC13 _STM32_PIN(C, 13)
110 
+#define PC14 _STM32_PIN(C, 14)
111 
+#define PC15 _STM32_PIN(C, 15)
112 
+
113 
+#define PD0  _STM32_PIN(D,  0)
114 
+#define PD1  _STM32_PIN(D,  1)
115 
+#define PD2  _STM32_PIN(D,  2)
116 
+#define PD3  _STM32_PIN(D,  3)
117 
+#define PD4  _STM32_PIN(D,  4)
118 
+#define PD5  _STM32_PIN(D,  5)
119 
+#define PD6  _STM32_PIN(D,  6)
120 
+#define PD7  _STM32_PIN(D,  7)
121 
+#define PD8  _STM32_PIN(D,  8)
122 
+#define PD9  _STM32_PIN(D,  9)
123 
+#define PD10 _STM32_PIN(D, 10)
124 
+#define PD11 _STM32_PIN(D, 11)
125 
+#define PD12 _STM32_PIN(D, 12)
126 
+#define PD13 _STM32_PIN(D, 13)
127 
+#define PD14 _STM32_PIN(D, 14)
128 
+#define PD15 _STM32_PIN(D, 15)
129 
+
130 
+#define PE0  _STM32_PIN(E,  0)
131 
+#define PE1  _STM32_PIN(E,  1)
132 
+#define PE2  _STM32_PIN(E,  2)
133 
+#define PE3  _STM32_PIN(E,  3)
134 
+#define PE4  _STM32_PIN(E,  4)
135 
+#define PE5  _STM32_PIN(E,  5)
136 
+#define PE6  _STM32_PIN(E,  6)
137 
+#define PE7  _STM32_PIN(E,  7)
138 
+#define PE8  _STM32_PIN(E,  8)
139 
+#define PE9  _STM32_PIN(E,  9)
140 
+#define PE10 _STM32_PIN(E, 10)
141 
+#define PE11 _STM32_PIN(E, 11)
142 
+#define PE12 _STM32_PIN(E, 12)
143 
+#define PE13 _STM32_PIN(E, 13)
144 
+#define PE14 _STM32_PIN(E, 14)
145 
+#define PE15 _STM32_PIN(E, 15)
146 
+
54 147 
 #endif // _FASTIO_STM32F4_H

+ 129
- 0
Marlin/src/HAL/HAL_STM32F7/fastio_STM32F7.h View File 

@@ -51,4 +51,133 @@
51 51
52 52 
 #define OUT_WRITE(IO, v) { _SET_OUTPUT(IO); WRITE(IO, v); }
53 53
54 
+#define PORTA 0
55 
+#define PORTB 1
56 
+#define PORTC 2
57 
+#define PORTD 3
58 
+#define PORTE 4
59 
+#define PORTF 5
60 
+#define PORTG 6
61 
+
62 
+#define _STM32_PIN(_PORT,_PIN) ((PORT##_PORT * 16) + _PIN)
63 
+
64 
+#define PA0  _STM32_PIN(A,  0)
65 
+#define PA1  _STM32_PIN(A,  1)
66 
+#define PA2  _STM32_PIN(A,  2)
67 
+#define PA3  _STM32_PIN(A,  3)
68 
+#define PA4  _STM32_PIN(A,  4)
69 
+#define PA5  _STM32_PIN(A,  5)
70 
+#define PA6  _STM32_PIN(A,  6)
71 
+#define PA7  _STM32_PIN(A,  7)
72 
+#define PA8  _STM32_PIN(A,  8)
73 
+#define PA9  _STM32_PIN(A,  9)
74 
+#define PA10 _STM32_PIN(A, 10)
75 
+#define PA11 _STM32_PIN(A, 11)
76 
+#define PA12 _STM32_PIN(A, 12)
77 
+#define PA13 _STM32_PIN(A, 13)
78 
+#define PA14 _STM32_PIN(A, 14)
79 
+#define PA15 _STM32_PIN(A, 15)
80 
+
81 
+#define PB0  _STM32_PIN(B,  0)
82 
+#define PB1  _STM32_PIN(B,  1)
83 
+#define PB2  _STM32_PIN(B,  2)
84 
+#define PB3  _STM32_PIN(B,  3)
85 
+#define PB4  _STM32_PIN(B,  4)
86 
+#define PB5  _STM32_PIN(B,  5)
87 
+#define PB6  _STM32_PIN(B,  6)
88 
+#define PB7  _STM32_PIN(B,  7)
89 
+#define PB8  _STM32_PIN(B,  8)
90 
+#define PB9  _STM32_PIN(B,  9)
91 
+#define PB10 _STM32_PIN(B, 10)
92 
+#define PB11 _STM32_PIN(B, 11)
93 
+#define PB12 _STM32_PIN(B, 12)
94 
+#define PB13 _STM32_PIN(B, 13)
95 
+#define PB14 _STM32_PIN(B, 14)
96 
+#define PB15 _STM32_PIN(B, 15)
97 
+
98 
+#define PC0  _STM32_PIN(C,  0)
99 
+#define PC1  _STM32_PIN(C,  1)
100 
+#define PC2  _STM32_PIN(C,  2)
101 
+#define PC3  _STM32_PIN(C,  3)
102 
+#define PC4  _STM32_PIN(C,  4)
103 
+#define PC5  _STM32_PIN(C,  5)
104 
+#define PC6  _STM32_PIN(C,  6)
105 
+#define PC7  _STM32_PIN(C,  7)
106 
+#define PC8  _STM32_PIN(C,  8)
107 
+#define PC9  _STM32_PIN(C,  9)
108 
+#define PC10 _STM32_PIN(C, 10)
109 
+#define PC11 _STM32_PIN(C, 11)
110 
+#define PC12 _STM32_PIN(C, 12)
111 
+#define PC13 _STM32_PIN(C, 13)
112 
+#define PC14 _STM32_PIN(C, 14)
113 
+#define PC15 _STM32_PIN(C, 15)
114 
+
115 
+#define PD0  _STM32_PIN(D,  0)
116 
+#define PD1  _STM32_PIN(D,  1)
117 
+#define PD2  _STM32_PIN(D,  2)
118 
+#define PD3  _STM32_PIN(D,  3)
119 
+#define PD4  _STM32_PIN(D,  4)
120 
+#define PD5  _STM32_PIN(D,  5)
121 
+#define PD6  _STM32_PIN(D,  6)
122 
+#define PD7  _STM32_PIN(D,  7)
123 
+#define PD8  _STM32_PIN(D,  8)
124 
+#define PD9  _STM32_PIN(D,  9)
125 
+#define PD10 _STM32_PIN(D, 10)
126 
+#define PD11 _STM32_PIN(D, 11)
127 
+#define PD12 _STM32_PIN(D, 12)
128 
+#define PD13 _STM32_PIN(D, 13)
129 
+#define PD14 _STM32_PIN(D, 14)
130 
+#define PD15 _STM32_PIN(D, 15)
131 
+
132 
+#define PE0  _STM32_PIN(E,  0)
133 
+#define PE1  _STM32_PIN(E,  1)
134 
+#define PE2  _STM32_PIN(E,  2)
135 
+#define PE3  _STM32_PIN(E,  3)
136 
+#define PE4  _STM32_PIN(E,  4)
137 
+#define PE5  _STM32_PIN(E,  5)
138 
+#define PE6  _STM32_PIN(E,  6)
139 
+#define PE7  _STM32_PIN(E,  7)
140 
+#define PE8  _STM32_PIN(E,  8)
141 
+#define PE9  _STM32_PIN(E,  9)
142 
+#define PE10 _STM32_PIN(E, 10)
143 
+#define PE11 _STM32_PIN(E, 11)
144 
+#define PE12 _STM32_PIN(E, 12)
145 
+#define PE13 _STM32_PIN(E, 13)
146 
+#define PE14 _STM32_PIN(E, 14)
147 
+#define PE15 _STM32_PIN(E, 15)
148 
+
149 
+#define PF0  _STM32_PIN(F,  0)
150 
+#define PF1  _STM32_PIN(F,  1)
151 
+#define PF2  _STM32_PIN(F,  2)
152 
+#define PF3  _STM32_PIN(F,  3)
153 
+#define PF4  _STM32_PIN(F,  4)
154 
+#define PF5  _STM32_PIN(F,  5)
155 
+#define PF6  _STM32_PIN(F,  6)
156 
+#define PF7  _STM32_PIN(F,  7)
157 
+#define PF8  _STM32_PIN(F,  8)
158 
+#define PF9  _STM32_PIN(F,  9)
159 
+#define PF10 _STM32_PIN(F, 10)
160 
+#define PF11 _STM32_PIN(F, 11)
161 
+#define PF12 _STM32_PIN(F, 12)
162 
+#define PF13 _STM32_PIN(F, 13)
163 
+#define PF14 _STM32_PIN(F, 14)
164 
+#define PF15 _STM32_PIN(F, 15)
165 
+
166 
+#define PG0  _STM32_PIN(G,  0)
167 
+#define PG1  _STM32_PIN(G,  1)
168 
+#define PG2  _STM32_PIN(G,  2)
169 
+#define PG3  _STM32_PIN(G,  3)
170 
+#define PG4  _STM32_PIN(G,  4)
171 
+#define PG5  _STM32_PIN(G,  5)
172 
+#define PG6  _STM32_PIN(G,  6)
173 
+#define PG7  _STM32_PIN(G,  7)
174 
+#define PG8  _STM32_PIN(G,  8)
175 
+#define PG9  _STM32_PIN(G,  9)
176 
+#define PG10 _STM32_PIN(G, 10)
177 
+#define PG11 _STM32_PIN(G, 11)
178 
+#define PG12 _STM32_PIN(G, 12)
179 
+#define PG13 _STM32_PIN(G, 13)
180 
+#define PG14 _STM32_PIN(G, 14)
181 
+#define PG15 _STM32_PIN(G, 15)
182 
+
54 183 
 #endif // _FASTIO_STM32F7_H

+ 4
- 5
Marlin/src/HAL/HAL_STM32F7/spi_pins.h View File 

@@ -20,14 +20,13 @@
20 20 
 #ifndef SPI_PINS_H_
21 21 
 #define SPI_PINS_H_
22 22
23 
-
24 23 
 /**
25 24 
  * Define SPI Pins: SCK, MISO, MOSI, SS
26 25 
  *
27 26 
  */
28 
-#define SCK_PIN   _STM32_PIN(PORTA, 5)
29 
-#define MISO_PIN  _STM32_PIN(PORTA, 6)
30 
-#define MOSI_PIN  _STM32_PIN(PORTA, 7)
31 
-#define SS_PIN    _STM32_PIN(PORTA, 8)
27 
+#define SCK_PIN   PA5
28 
+#define MISO_PIN  PA6
29 
+#define MOSI_PIN  PA7
30 
+#define SS_PIN    PA8
32 31
33 32 
 #endif // SPI_PINS_H_

+ 62
- 72
Marlin/src/pins/pins_STM32F4.h View File 

@@ -25,12 +25,10 @@
25 25 
 #endif
26 26
27 27 
 #define DEFAULT_MACHINE_NAME "STM32F407VET6"
28 
-#define BOARD_NAME "Marlin for STM32"
28 
+#define BOARD_NAME "STM32F4 Board"
29 29
30 30 
 // #define I2C_EEPROM
31 31
32 
-// #define LARGE_FLASH true
33 
-
34 32 
 #define E2END 0xFFF // EEPROM end address (4kB)
35 33
36 34 
 // Ignore temp readings during develpment.
 
@@ -40,22 +38,14 @@
40 38 
   #error "STM32F4 supports up to 2 hotends / E-steppers."
41 39 
 #endif
42 40
43 
-#define PORTA 0
44 
-#define PORTB 1
45 
-#define PORTC 2
46 
-#define PORTD 3
47 
-#define PORTE 4
48 
-
49 
-#define _STM32_PIN(_PORT,_PIN) ((_PORT * 16) + _PIN)
50 
-
51 41 
 //
52 42 
 // Limit Switches
53 43 
 //
54 
-#define X_MIN_PIN          _STM32_PIN(PORTE, 0)
44 
+#define X_MIN_PIN          PE0
55 45 
 #define X_MAX_PIN          -1
56 
-#define Y_MIN_PIN          _STM32_PIN(PORTE, 1)
46 
+#define Y_MIN_PIN          PE1
57 47 
 #define Y_MAX_PIN          -1
58 
-#define Z_MIN_PIN          _STM32_PIN(PORTE, 14)
48 
+#define Z_MIN_PIN          PE14
59 49 
 #define Z_MAX_PIN          -1
60 50
61 51 
 //
 
@@ -63,71 +53,71 @@
63 53 
 //
64 54
65 55 
 // #ifndef Z_MIN_PROBE_PIN
66 
-//   #define Z_MIN_PROBE_PIN  _STM32_PIN(PORTA, 4)
56 
+//   #define Z_MIN_PROBE_PIN  PA4
67 57 
 // #endif
68 58
69 59 
 //
70 60 
 // Steppers
71 61 
 //
72 62
73 
-#define X_STEP_PIN         _STM32_PIN(PORTD, 3)
74 
-#define X_DIR_PIN          _STM32_PIN(PORTD, 2)
75 
-#define X_ENABLE_PIN       _STM32_PIN(PORTD, 0)
63 
+#define X_STEP_PIN         PD3
64 
+#define X_DIR_PIN          PD2
65 
+#define X_ENABLE_PIN       PD0
76 66 
 // #ifndef X_CS_PIN
77 
-//   #define X_CS_PIN         _STM32_PIN(PORTD, 1)
67 
+//   #define X_CS_PIN         PD1
78 68 
 // #endif
79 69
80 
-#define Y_STEP_PIN         _STM32_PIN(PORTE, 11)
81 
-#define Y_DIR_PIN          _STM32_PIN(PORTE, 10)
82 
-#define Y_ENABLE_PIN       _STM32_PIN(PORTE, 13)
70 
+#define Y_STEP_PIN         PE11
71 
+#define Y_DIR_PIN          PE10
72 
+#define Y_ENABLE_PIN       PE13
83 73 
 // #ifndef Y_CS_PIN
84 
-//   #define Y_CS_PIN         _STM32_PIN(PORTE, 12)
74 
+//   #define Y_CS_PIN         PE12
85 75 
 // #endif
86 76
87 
-#define Z_STEP_PIN         _STM32_PIN(PORTD, 6)
88 
-#define Z_DIR_PIN          _STM32_PIN(PORTD, 7)
89 
-#define Z_ENABLE_PIN       _STM32_PIN(PORTD, 4)
77 
+#define Z_STEP_PIN         PD6
78 
+#define Z_DIR_PIN          PD7
79 
+#define Z_ENABLE_PIN       PD4
90 80 
 // #ifndef Z_CS_PIN
91 
-//   #define Z_CS_PIN         _STM32_PIN(PORTD, 5)
81 
+//   #define Z_CS_PIN         PD5
92 82 
 // #endif
93 83
94 
-#define E0_STEP_PIN        _STM32_PIN(PORTB, 5)
95 
-#define E0_DIR_PIN         _STM32_PIN(PORTB, 6)
96 
-#define E0_ENABLE_PIN      _STM32_PIN(PORTB, 3)
84 
+#define E0_STEP_PIN        PB5
85 
+#define E0_DIR_PIN         PB6
86 
+#define E0_ENABLE_PIN      PB3
97 87 
 // #ifndef E0_CS_PIN
98 
-//   #define E0_CS_PIN         _STM32_PIN(PORTB, 4)
88 
+//   #define E0_CS_PIN         PB4
99 89 
 // #endif
100 90
101 
-#define E1_STEP_PIN        _STM32_PIN(PORTE, 4)
102 
-#define E1_DIR_PIN         _STM32_PIN(PORTE, 2)
103 
-#define E1_ENABLE_PIN      _STM32_PIN(PORTE, 3)
91 
+#define E1_STEP_PIN        PE4
92 
+#define E1_DIR_PIN         PE2
93 
+#define E1_ENABLE_PIN      PE3
104 94 
 // #ifndef E1_CS_PIN
105 
-//   #define E1_CS_PIN         _STM32_PIN(PORTE, 5)
95 
+//   #define E1_CS_PIN         PE5
106 96 
 // #endif
107 97
108 
-#define SCK_PIN            _STM32_PIN(PORTA, 5)
109 
-#define MISO_PIN           _STM32_PIN(PORTA, 6)
110 
-#define MOSI_PIN           _STM32_PIN(PORTA, 7)
98 
+#define SCK_PIN            PA5
99 
+#define MISO_PIN           PA6
100 
+#define MOSI_PIN           PA7
111 101
112 102 
 //
113 103 
 // Temperature Sensors
114 104 
 //
115 105
116 
-#define TEMP_0_PIN         _STM32_PIN(PORTC, 0)   // Analog Input
117 
-#define TEMP_1_PIN         _STM32_PIN(PORTC, 1)   // Analog Input
118 
-#define TEMP_BED_PIN       _STM32_PIN(PORTC, 2)   // Analog Input
106 
+#define TEMP_0_PIN         PC0   // Analog Input
107 
+#define TEMP_1_PIN         PC1   // Analog Input
108 
+#define TEMP_BED_PIN       PC2   // Analog Input
119 109
120 110 
 //
121 111 
 // Heaters / Fans
122 112 
 //
123 113
124 
-#define HEATER_0_PIN       _STM32_PIN(PORTA, 1)
125 
-#define HEATER_1_PIN       _STM32_PIN(PORTA, 2)
126 
-#define HEATER_BED_PIN     _STM32_PIN(PORTA, 0)
114 
+#define HEATER_0_PIN       PA1
115 
+#define HEATER_1_PIN       PA2
116 
+#define HEATER_BED_PIN     PA0
127 117
128 
-#define FAN_PIN            _STM32_PIN(PORTC, 6)
129 
-#define FAN1_PIN           _STM32_PIN(PORTC, 7)
130 
-#define FAN2_PIN           _STM32_PIN(PORTC, 8)
118 
+#define FAN_PIN            PC6
119 
+#define FAN1_PIN           PC7
120 
+#define FAN2_PIN           PC8
131 121
132 122 
 #define ORIG_E0_AUTO_FAN_PIN  FAN1_PIN // Use this by NOT overriding E0_AUTO_FAN_PIN
133 123 
 
@@ -135,53 +125,53 @@
135 125 
 // Misc. Functions
136 126 
 //
137 127
138 
-//#define CASE_LIGHT_PIN_CI _STM32_PIN(PORTF, 13)
139 
-//#define CASE_LIGHT_PIN_DO _STM32_PIN(PORTF, 14)
140 
-//#define NEOPIXEL_PIN      _STM32_PIN(PORTF, 13)
128 
+//#define CASE_LIGHT_PIN_CI PF13
129 
+//#define CASE_LIGHT_PIN_DO PF14
130 
+//#define NEOPIXEL_PIN      PF13
141 131
142 132 
 //
143 133 
 // Prusa i3 MK2 Multi Material Multiplexer Support
144 134 
 //
145 135
146 
-// #define E_MUX0_PIN         _STM32_PIN(PORTG, 3)
147 
-// #define E_MUX1_PIN         _STM32_PIN(PORTG, 4)
136 
+// #define E_MUX0_PIN         PG3
137 
+// #define E_MUX1_PIN         PG4
148 138
149 139 
 //
150 140 
 // Servos
151 141 
 //
152 142
153 
-// #define SERVO0_PIN         _STM32_PIN(PORTE, 13)
154 
-// #define SERVO1_PIN         _STM32_PIN(PORTE, 14)
143 
+// #define SERVO0_PIN         PE13
144 
+// #define SERVO1_PIN         PE14
155 145
156 146
157 
-#define SDSS               _STM32_PIN(PORTE, 7)
158 
-#define SS_PIN             _STM32_PIN(PORTE, 7)
159 
-#define LED_PIN            _STM32_PIN(PORTB, 7)         //Alive
160 
-#define PS_ON_PIN          _STM32_PIN(PORTA, 10)
161 
-#define KILL_PIN           _STM32_PIN(PORTA, 8)
162 
-#define PWR_LOSS           _STM32_PIN(PORTA, 4)         //Power loss / nAC_FAULT
147 
+#define SDSS               PE7
148 
+#define SS_PIN             PE7
149 
+#define LED_PIN            PB7         //Alive
150 
+#define PS_ON_PIN          PA10
151 
+#define KILL_PIN           PA8
152 
+#define PWR_LOSS           PA4         //Power loss / nAC_FAULT
163 153
164 154 
 //
165 155 
 // LCD / Controller
166 156 
 //
167 157
168 
-#define SD_DETECT_PIN      _STM32_PIN(PORTA, 15)
169 
-#define BEEPER_PIN         _STM32_PIN(PORTC, 9)
170 
-#define LCD_PINS_RS        _STM32_PIN(PORTE, 9)
171 
-#define LCD_PINS_ENABLE    _STM32_PIN(PORTE, 8)
172 
-#define LCD_PINS_D4        _STM32_PIN(PORTB, 12)
173 
-#define LCD_PINS_D5        _STM32_PIN(PORTB, 13)
174 
-#define LCD_PINS_D6        _STM32_PIN(PORTB, 14)
175 
-#define LCD_PINS_D7        _STM32_PIN(PORTB, 15)
176 
-#define BTN_EN1            _STM32_PIN(PORTC, 4)
177 
-#define BTN_EN2            _STM32_PIN(PORTC, 5)
178 
-#define BTN_ENC            _STM32_PIN(PORTC, 3)
158 
+#define SD_DETECT_PIN      PA15
159 
+#define BEEPER_PIN         PC9
160 
+#define LCD_PINS_RS        PE9
161 
+#define LCD_PINS_ENABLE    PE8
162 
+#define LCD_PINS_D4        PB12
163 
+#define LCD_PINS_D5        PB13
164 
+#define LCD_PINS_D6        PB14
165 
+#define LCD_PINS_D7        PB15
166 
+#define BTN_EN1            PC4
167 
+#define BTN_EN2            PC5
168 
+#define BTN_ENC            PC3
179 169
180 170 
 //
181 171 
 // Filament runout
182 172 
 //
183 173
184 
-#define FIL_RUNOUT_PIN     _STM32_PIN(PORTA, 3)
174 
+#define FIL_RUNOUT_PIN     PA3
185 175
186 176 
 //
187 177 
 // ST7920 Delays

+ 80
- 92
Marlin/src/pins/pins_THE_BORG.h View File 

@@ -27,8 +27,6 @@
27 27 
 #define DEFAULT_MACHINE_NAME "The-Borge"
28 28 
 #define BOARD_NAME "The-Borge"
29 29
30 
-#define LARGE_FLASH true
31 
-
32 30 
 #define E2END 0xFFF   // EEPROM end address
33 31
34 32 
 // Ignore temp readings during develpment.
 
@@ -38,159 +36,149 @@
38 36 
   #error "The-Borg supports up to 3 hotends / E-steppers."
39 37 
 #endif
40 38
41 
-#define PORTA 0
42 
-#define PORTB 1
43 
-#define PORTC 2
44 
-#define PORTD 3
45 
-#define PORTE 4
46 
-#define PORTF 5
47 
-#define PORTG 6
48 
-
49 
-#define _STM32_PIN(_PORT,_PIN) ((_PORT * 16) + _PIN)
50 
-
51 39 
 //
52 40 
 // Limit Switches
53 41 
 //
54 
-#define X_MIN_PIN          _STM32_PIN(PORTE,  9)
55 
-#define X_MAX_PIN          _STM32_PIN(PORTE, 10)
56 
-#define Y_MIN_PIN          _STM32_PIN(PORTE,  7)
57 
-#define Y_MAX_PIN          _STM32_PIN(PORTE,  8)
58 
-#define Z_MIN_PIN          _STM32_PIN(PORTF, 15)
59 
-#define Z_MAX_PIN          _STM32_PIN(PORTG,  0)
60 
-#define E_MIN_PIN          _STM32_PIN(PORTE,  2)
61 
-#define E_MAX_PIN          _STM32_PIN(PORTE,  3)
42 
+#define X_MIN_PIN          PE9
43 
+#define X_MAX_PIN          PE10
44 
+#define Y_MIN_PIN          PE7
45 
+#define Y_MAX_PIN          PE8
46 
+#define Z_MIN_PIN          PF15
47 
+#define Z_MAX_PIN          PG0
48 
+#define E_MIN_PIN          PE2
49 
+#define E_MAX_PIN          PE3
62 50
63 51 
 //
64 52 
 // Z Probe (when not Z_MIN_PIN)
65 53 
 //
66 54 
 #ifndef Z_MIN_PROBE_PIN
67 
-  #define Z_MIN_PROBE_PIN  _STM32_PIN(PORTA,  4)
55 
+  #define Z_MIN_PROBE_PIN  PA4
68 56 
 #endif
69 57
70 58 
 //
71 59 
 // Steppers
72 60 
 //
73 
-#define STEPPER_ENABLE_PIN _STM32_PIN(PORTE,  0)
61 
+#define STEPPER_ENABLE_PIN PE0
74 62
75 
-#define X_STEP_PIN         _STM32_PIN(PORTC,  6)   // 96, 39 in Arduino
76 
-#define X_DIR_PIN          _STM32_PIN(PORTC,  7)
77 
-#define X_ENABLE_PIN       _STM32_PIN(PORTC,  8)
63 
+#define X_STEP_PIN         PC6   // 96, 39 in Arduino
64 
+#define X_DIR_PIN          PC7
65 
+#define X_ENABLE_PIN       PC8
78 66
79 67
80 
-#define Y_STEP_PIN         _STM32_PIN(PORTD,  9)
81 
-#define Y_DIR_PIN          _STM32_PIN(PORTD, 10)
82 
-#define Y_ENABLE_PIN       _STM32_PIN(PORTD, 11)
68 
+#define Y_STEP_PIN         PD9
69 
+#define Y_DIR_PIN          PD10
70 
+#define Y_ENABLE_PIN       PD11
83 71
84 
-#define Z_STEP_PIN         _STM32_PIN(PORTE, 15)
85 
-#define Z_DIR_PIN          _STM32_PIN(PORTG,  1)
86 
-#define Z_ENABLE_PIN       _STM32_PIN(PORTD,  8)
72 
+#define Z_STEP_PIN         PE15
73 
+#define Z_DIR_PIN          PG1
74 
+#define Z_ENABLE_PIN       PD8
87 75
88 76
89 
-#define E0_STEP_PIN        _STM32_PIN(PORTB,  1)
90 
-#define E0_DIR_PIN         _STM32_PIN(PORTB,  2)
91 
-#define E0_ENABLE_PIN      _STM32_PIN(PORTE, 11)
77 
+#define E0_STEP_PIN        PB1
78 
+#define E0_DIR_PIN         PB2
79 
+#define E0_ENABLE_PIN      PE11
92 80
93 81
94 
-#define E1_STEP_PIN        _STM32_PIN(PORTC,  4)
95 
-#define E1_DIR_PIN         _STM32_PIN(PORTC,  5)
96 
-#define E1_ENABLE_PIN      _STM32_PIN(PORTB,  0)
82 
+#define E1_STEP_PIN        PC4
83 
+#define E1_DIR_PIN         PC5
84 
+#define E1_ENABLE_PIN      PB0
97 85
98 86
99 
-#define E2_STEP_PIN        _STM32_PIN(PORTC, 13)
100 
-#define E2_DIR_PIN         _STM32_PIN(PORTC, 14)
101 
-#define E2_ENABLE_PIN      _STM32_PIN(PORTC, 15)
87 
+#define E2_STEP_PIN        PC13
88 
+#define E2_DIR_PIN         PC14
89 
+#define E2_ENABLE_PIN      PC15
102 90
103 
-#define Z2_STEP_PIN        _STM32_PIN(PORTC, 13)
104 
-#define Z2_DIR_PIN         _STM32_PIN(PORTC, 14)
105 
-#define Z2_ENABLE_PIN      _STM32_PIN(PORTC, 15)
91 
+#define Z2_STEP_PIN        PC13
92 
+#define Z2_DIR_PIN         PC14
93 
+#define Z2_ENABLE_PIN      PC15
106 94
107 95
108 
-#define SCK_PIN            _STM32_PIN(PORTA,  5)
109 
-#define MISO_PIN           _STM32_PIN(PORTA,  6)
110 
-#define MOSI_PIN           _STM32_PIN(PORTA,  7)
96 
+#define SCK_PIN            PA5
97 
+#define MISO_PIN           PA6
98 
+#define MOSI_PIN           PA7
111 99
112 
-#define SPI1_SCK_PIN       _STM32_PIN(PORTA,  5)
113 
-#define SPI1_MISO_PIN      _STM32_PIN(PORTA,  6)
114 
-#define SPI1_MOSI_PIN      _STM32_PIN(PORTA,  7)
100 
+#define SPI1_SCK_PIN       PA5
101 
+#define SPI1_MISO_PIN      PA6
102 
+#define SPI1_MOSI_PIN      PA7
115 103
116 
-#define SPI6_SCK_PIN       _STM32_PIN(PORTG, 13)
117 
-#define SPI6_MISO_PIN      _STM32_PIN(PORTG, 12)
118 
-#define SPI6_MOSI_PIN      _STM32_PIN(PORTG, 14)
104 
+#define SPI6_SCK_PIN       PG13
105 
+#define SPI6_MISO_PIN      PG12
106 
+#define SPI6_MOSI_PIN      PG14
119 107
120 108 
 //
121 109 
 // Temperature Sensors
122 110 
 //
123 111
124 
-#define TEMP_0_PIN         _STM32_PIN(PORTC,  3)   // Analog Input
125 
-#define TEMP_1_PIN         _STM32_PIN(PORTC,  2)   // Analog Input
126 
-#define TEMP_2_PIN         _STM32_PIN(PORTC,  1)   // Analog Input
127 
-#define TEMP_3_PIN         _STM32_PIN(PORTC,  0)   // Analog Input
112 
+#define TEMP_0_PIN         PC3   // Analog Input
113 
+#define TEMP_1_PIN         PC2   // Analog Input
114 
+#define TEMP_2_PIN         PC1   // Analog Input
115 
+#define TEMP_3_PIN         PC0   // Analog Input
128 116
129 
-#define TEMP_BED_PIN       _STM32_PIN(PORTF, 10)   // Analog Input
117 
+#define TEMP_BED_PIN       PF10  // Analog Input
130 118
131 
-#define TEMP_5_PIN         _STM32_PIN(PORTE, 12)   // Analog Input, Probe temp
119 
+#define TEMP_5_PIN         PE12  // Analog Input, Probe temp
132 120
133 121 
 //
134 122 
 // Heaters / Fans
135 123 
 //
136 
-#define HEATER_0_PIN       _STM32_PIN(PORTD, 15)
137 
-#define HEATER_1_PIN       _STM32_PIN(PORTD, 14)
138 
-#define HEATER_BED_PIN     _STM32_PIN(PORTF,  6)
124 
+#define HEATER_0_PIN       PD15
125 
+#define HEATER_1_PIN       PD14
126 
+#define HEATER_BED_PIN     PF6
139 127
140 
-#define FAN_PIN            _STM32_PIN(PORTD, 13)
141 
-#define FAN1_PIN           _STM32_PIN(PORTA,  0)
142 
-#define FAN2_PIN           _STM32_PIN(PORTA,  1)
128 
+#define FAN_PIN            PD13
129 
+#define FAN1_PIN           PA0
130 
+#define FAN2_PIN           PA1
143 131
144 
-#define ORIG_E0_AUTO_FAN_PIN  _STM32_PIN(PORTA, 1)   // Use this by NOT overriding E0_AUTO_FAN_PIN
132 
+#define ORIG_E0_AUTO_FAN_PIN  PA1   // Use this by NOT overriding E0_AUTO_FAN_PIN
145 133
146 134 
 //
147 135 
 // Misc. Functions
148 136 
 //
149 137
150 
-//#define CASE_LIGHT_PIN_CI _STM32_PIN(PORTF, 13)
151 
-//#define CASE_LIGHT_PIN_DO _STM32_PIN(PORTF, 14)
152 
-//#define NEOPIXEL_PIN     _STM32_PIN(PORTF, 13)
138 
+//#define CASE_LIGHT_PIN_CI PF13
139 
+//#define CASE_LIGHT_PIN_DO PF14
140 
+//#define NEOPIXEL_PIN      PF13
153 141
154 142 
 //
155 143 
 // Prusa i3 MK2 Multi Material Multiplexer Support
156 144 
 //
157 145
158 
-#define E_MUX0_PIN         _STM32_PIN(PORTG,  3)
159 
-#define E_MUX1_PIN         _STM32_PIN(PORTG,  4)
146 
+#define E_MUX0_PIN         PG3
147 
+#define E_MUX1_PIN         PG4
160 148
161 149 
 //
162 150 
 // Servos
163 151 
 //
164 152
165 
-#define SERVO0_PIN         _STM32_PIN(PORTE, 13)
166 
-#define SERVO1_PIN         _STM32_PIN(PORTE, 14)
153 
+#define SERVO0_PIN         PE13
154 
+#define SERVO1_PIN         PE14
167 155
168 156
169 
-#define SDSS               _STM32_PIN(PORTA,  8)
170 
-#define SS_PIN             _STM32_PIN(PORTA,  8)
171 
-#define LED_PIN            _STM32_PIN(PORTA,  2)   // Alive
172 
-#define PS_ON_PIN          _STM32_PIN(PORTA,  3)
173 
-#define KILL_PIN           -1//_STM32_PIN(PORTD,  5)   // EXP2-10
174 
-#define PWR_LOSS           _STM32_PIN(PORTG,  5)   // Power loss / nAC_FAULT
157 
+#define SDSS               PA8
158 
+#define SS_PIN             PA8
159 
+#define LED_PIN            PA2   // Alive
160 
+#define PS_ON_PIN          PA3
161 
+#define KILL_PIN           -1 //PD5   // EXP2-10
162 
+#define PWR_LOSS           PG5   // Power loss / nAC_FAULT
175 163
176 164 
 //
177 165 
 // MAX7219_DEBUG
178 166 
 //
179 
-#define MAX7219_CLK_PIN    _STM32_PIN(PORTG, 10)   // EXP1-1
180 
-#define MAX7219_DIN_PIN    _STM32_PIN(PORTD,  7)   // EXP1-3
181 
-#define MAX7219_LOAD_PIN   _STM32_PIN(PORTD,  1)   // EXP1-5
167 
+#define MAX7219_CLK_PIN    PG10  // EXP1-1
168 
+#define MAX7219_DIN_PIN    PD7   // EXP1-3
169 
+#define MAX7219_LOAD_PIN   PD1   // EXP1-5
182 170
183 171 
 //
184 172 
 // LCD / Controller
185 173 
 //
186 
-//#define SD_DETECT_PIN      -1 //_STM32_PIN(PORTB, 6))     // EXP2-4
187 
-#define BEEPER_PIN         _STM32_PIN(PORTG, 10)   // EXP1-1
188 
-#define LCD_PINS_RS        _STM32_PIN(PORTG,  9)   // EXP1-4
189 
-#define LCD_PINS_ENABLE    _STM32_PIN(PORTD,  7)   // EXP1-3
190 
-#define LCD_PINS_D4        _STM32_PIN(PORTD,  1)   // EXP1-5
191 
-#define LCD_PINS_D5        _STM32_PIN(PORTF,  0)   // EXP1-6
192 
-#define LCD_PINS_D6        _STM32_PIN(PORTD,  3)   // EXP1-7
193 
-#define LCD_PINS_D7        _STM32_PIN(PORTD,  4)   // EXP1-8
194 
-#define BTN_EN1            _STM32_PIN(PORTD,  6)   // EXP2-5
195 
-#define BTN_EN2            _STM32_PIN(PORTD,  0)   // EXP2-3
196 
-#define BTN_ENC            _STM32_PIN(PORTG, 11)   // EXP1-2
174 
+//#define SD_DETECT_PIN      -1 //PB6)     // EXP2-4
175 
+#define BEEPER_PIN         PG10  // EXP1-1
176 
+#define LCD_PINS_RS        PG9   // EXP1-4
177 
+#define LCD_PINS_ENABLE    PD7   // EXP1-3
178 
+#define LCD_PINS_D4        PD1   // EXP1-5
179 
+#define LCD_PINS_D5        PF0   // EXP1-6
180 
+#define LCD_PINS_D6        PD3   // EXP1-7
181 
+#define LCD_PINS_D7        PD4   // EXP1-8
182 
+#define BTN_EN1            PD6   // EXP2-5
183 
+#define BTN_EN2            PD0   // EXP2-3
184 
+#define BTN_ENC            PG11  // EXP1-2

Write Preview
Loading…
Cancel
Save