Skip to content

Commit 9666ee2

Browse files
thinkyheadthinkyhead
committed
Define EXP pins, update tone timer
1 parent 25af85c commit 9666ee2

12 files changed

+239
-203
lines changed

‎Marlin/src/pins/stm32f1/pins_MINGDA_MPX_ARM_MINI.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#pragma once
2323

2424
/**
25-
* MKS Robin mini (STM32F130VET6) board pin assignments
25+
* MKS Robin mini (STM32F103VET6) board pin assignments
2626
*/
2727

2828
#if NOT_TARGET(STM32F1, STM32F1xx)

‎Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#pragma once
2323

2424
/**
25-
* MKS Robin (STM32F130ZET6) board pin assignments
25+
* MKS Robin (STM32F103ZET6) board pin assignments
2626
* https://github.com/makerbase-mks/MKS-Robin/tree/master/MKS%20Robin/Hardware
2727
*/
2828

‎Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#pragma once
2323

2424
/**
25-
* MKS Robin nano (STM32F130VET6) board pin assignments
25+
* MKS Robin nano (STM32F103VET6) board pin assignments
2626
*/
2727

2828
#include "env_validate.h"

‎Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#pragma once
2323

2424
/**
25-
* MKS Robin mini (STM32F130VET6) board pin assignments
25+
* MKS Robin mini (STM32F103VET6) board pin assignments
2626
*/
2727

2828
#include "env_validate.h"

‎Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#pragma once
2323

2424
/**
25-
* MKS Robin nano (STM32F130VET6) board pin assignments
25+
* MKS Robin nano (STM32F103VET6) board pin assignments
2626
* https://github.com/makerbase-mks/MKS-Robin-Nano-V1.X/tree/master/hardware
2727
*/
2828

‎Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#pragma once
2323

2424
/**
25-
* MKS Robin nano (STM32F130VET6) board pin assignments
25+
* MKS Robin nano (STM32F103VET6) board pin assignments
2626
*/
2727

2828
#if NOT_TARGET(__STM32F1__, STM32F1)

‎Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#pragma once
2323

2424
/**
25-
* ANYCUBIC Trigorilla Pro (STM32F130ZET6) board pin assignments.
25+
* ANYCUBIC Trigorilla Pro (STM32F103ZET6) board pin assignments.
2626
* It is the same used by the Tronxy X5SA thanks to ftoz1 for sharing it
2727
* https://github.com/MarlinFirmware/Marlin/issues/14655
2828
* https://github.com/MarlinFirmware/Marlin/files/3401484/x5sa-main_board-2.pdf

‎Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h‎

Lines changed: 45 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -36,29 +36,29 @@
3636
#endif
3737

3838
//=============================================================================
39-
// ZONESTAR ZM3E2 V1.0 (STM32F103RCT6) board pin assignments
39+
// Zonestar ZM3E2 V1.0 (STM32F103RCT6) board pin assignments
4040
//=============================================================================
41-
// PA0 PWR_HOLD // PB0 BEEP // PC0 HEATER_0
42-
// PA1 FAN_PIN // PB1 KILL // PC1 HEATER_BED
43-
// PA2 TX2 // PB2 LCD_SDA // PC2 TEMP_BED
44-
// PA3 RX2 // PB3 E1_EN // PC3 TEMP_E0
45-
// PA4 SD_CS // PB4 Z_STOP // PC4 SD_DETECT
46-
// PA5 SD_SCK // PB5 Z_DIR // PC5 BTN_EN2
47-
// PA6 SD_MISO // PB6 Z_STEP // PC6 FAN1
48-
// PA7 SD_MOSI // PB7 Z_EN // PC7 FIL_RUNOUT
49-
// PA8 X_DIR // PB8 Y_STEP // PC8 X_EN
50-
// PA9 LCD_RS // PB9 Y_DIR // PC9 X_STEP
51-
// PA10 LCD_SCK // PB10 BTN_ENC // PC10 Z_MIN_PROBE_PIN
52-
// PA11 USB_D- // PB11 BTN_EN1 // PC11 FIL_RUNOUT2
53-
// PA12 USB_D+ // PB12 LED // PC12 E1_DIR
54-
// PA13 MS1 // PB13 E0_EN // PC13 Y_STOP
55-
// PA14 MS2 // PB14 E0_STEP // PC14 Y_EN
56-
// PA15 PWM // PB15 E0_DIR // PC15 X_STOP
41+
// PA0 PWR_HOLD | PB0 BEEP | PC0 HEATER_0
42+
// PA1 FAN_PIN | PB1 KILL | PC1 HEATER_BED
43+
// PA2 TX2 | PB2 LCD_SDA | PC2 TEMP_BED
44+
// PA3 RX2 | PB3 E1_EN | PC3 TEMP_E0
45+
// PA4 SD_CS | PB4 Z_STOP | PC4 SD_DETECT
46+
// PA5 SD_SCK | PB5 Z_DIR | PC5 BTN_EN2
47+
// PA6 SD_MISO | PB6 Z_STEP | PC6 FAN1
48+
// PA7 SD_MOSI | PB7 Z_EN | PC7 FIL_RUNOUT
49+
// PA8 X_DIR | PB8 Y_STEP | PC8 X_EN
50+
// PA9 LCD_RS | PB9 Y_DIR | PC9 X_STEP
51+
// PA10 LCD_SCK | PB10 BTN_ENC | PC10 Z_MIN_PROBE_PIN
52+
// PA11 USB_D- | PB11 BTN_EN1 | PC11 FIL_RUNOUT2
53+
// PA12 USB_D+ | PB12 LED | PC12 E1_DIR
54+
// PA13 MS1 | PB13 E0_EN | PC13 Y_STOP
55+
// PA14 MS2 | PB14 E0_STEP | PC14 Y_EN
56+
// PA15 PWM | PB15 E0_DIR | PC15 X_STOP
5757
// PD0 NC
5858
// PD1 NC
5959
// PD2 E1_STEP
60-
//=============================================================================
6160

61+
//=============================================================================
6262
// EXP1 connector
6363
// MARK I/O ZONESTAR_12864LCD ZONESTAR_12864OLED
6464
// 10 MOSI PB1 KILL SDA
@@ -72,13 +72,22 @@
7272
// 2 +5V
7373
// 1 GND
7474

75+
#define EXP1_03_PIN PB11
76+
#define EXP1_04_PIN PB10
77+
#define EXP1_05_PIN PB2
78+
#define EXP1_06_PIN PC5
79+
#define EXP1_07_PIN PA10
80+
#define EXP1_08_PIN PA9
81+
#define EXP1_09_PIN PB0
82+
#define EXP1_10_PIN PB1
83+
7584
// AUX1 connector
7685
// 1 +5V
7786
// 2 TX2 PA2 UART2_TX
7887
// 3 RX2 PA3 UART2_RX
7988
// 4 GND
8089

81-
// AUX2 connector to BLtouch
90+
// AUX2 connector to BLTouch
8291
// 1 +5V
8392
// 2 SEN PC10
8493
// 3 PWM PA15
@@ -184,14 +193,14 @@
184193
// 1 GND
185194

186195
#define LCDSCREEN_NAME "ZONESTAR LCD12864"
187-
#define LCD_PINS_RS PA9
188-
#define LCD_PINS_ENABLE PB2
189-
#define LCD_PINS_D4 PA10
190-
//#define KILL_PIN PB1
191-
#define BEEPER_PIN PB0
192-
#define BTN_EN1 PB11
193-
#define BTN_EN2 PC5
194-
#define BTN_ENC PB10
196+
#define LCD_PINS_RS EXP1_08_PIN
197+
#define LCD_PINS_ENABLE EXP1_05_PIN
198+
#define LCD_PINS_D4 EXP1_07_PIN
199+
//#define KILL_PIN EXP1_10_PIN
200+
#define BEEPER_PIN EXP1_09_PIN
201+
#define BTN_EN1 EXP1_03_PIN
202+
#define BTN_EN2 EXP1_06_PIN
203+
#define BTN_ENC EXP1_04_PIN
195204
#define BOARD_ST7920_DELAY_1 DELAY_NS(125)
196205
#define BOARD_ST7920_DELAY_2 DELAY_NS(200)
197206
#define BOARD_ST7920_DELAY_3 DELAY_NS(125)
@@ -212,15 +221,15 @@
212221

213222
#define FORCE_SOFT_SPI
214223
#define LCDSCREEN_NAME "ZONESTAR 12864OLED"
215-
#define LCD_PINS_RS PB2 // = LCD_RESET_PIN
216-
#define LCD_PINS_DC PA10 // DC
217-
#define DOGLCD_CS PA9 // CS
218-
#define DOGLCD_A0 LCD_PINS_DC // A0 = DC
219-
#define DOGLCD_MOSI PB1 // SDA
220-
#define DOGLCD_SCK PB0 // SCK
224+
#define LCD_PINS_RS EXP1_05_PIN // = LCD_RESET_PIN
225+
#define LCD_PINS_DC EXP1_07_PIN // DC
226+
#define DOGLCD_CS EXP1_08_PIN // CS
227+
#define DOGLCD_A0 LCD_PINS_DC // A0 = DC
228+
#define DOGLCD_MOSI EXP1_10_PIN // SDA
229+
#define DOGLCD_SCK EXP1_09_PIN // SCK
221230
// Encoder
222-
#define BTN_EN1 PB11
223-
#define BTN_EN2 PC5
224-
#define BTN_ENC PB10
231+
#define BTN_EN1 EXP1_03_PIN
232+
#define BTN_EN2 EXP1_06_PIN
233+
#define BTN_ENC EXP1_04_PIN
225234

226235
#endif

0 commit comments

Comments
 (0)