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

Zonestar ZM3E2, ZM3E4 V1, ZM3E4 V2 #22498

Merged
merged 21 commits into from
Aug 8, 2021
+1,083 −22
Merged

Zonestar ZM3E2, ZM3E4 V1, ZM3E4 V2 #22498

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
dc14e6e
add ZONESTAR_ZM3E boaards
Aug 3, 2021
db92d97
add text formatting
Aug 3, 2021
0b2279c
more formatting
Aug 3, 2021
c8a7b7d
Update (c)
thinkyhead Aug 4, 2021
313e577
Simplification - level 1
thinkyhead Aug 4, 2021
a04427c
Simplification - level 2
thinkyhead Aug 4, 2021
e41e5a6
Maybe this can replace several others
thinkyhead Aug 4, 2021
ede6c83
detab, clean up pins
thinkyhead Aug 4, 2021
71fc709
use MARLIN_EEPROM_SIZE
Aug 4, 2021
df544c7
Bring pins mostly up to date
thinkyhead Aug 4, 2021
219d7f0
Test and override of LD_MAX_SIZE
thinkyhead Aug 4, 2021
3aa46ec
add non malpe envs
Aug 4, 2021
ca7d137
Update prcessors
Aug 4, 2021
81306e2
set TONE_TIMER and TONE_CHANNEL
Aug 4, 2021
9c2d581
minor comments formatting
ellensp Aug 4, 2021
fcfe868
Fix JGAURORA_A5S_A1 eeprom options
thinkyhead Aug 4, 2021
4b712a1
revert LD_MAX_SIZE define
thinkyhead Aug 4, 2021
83fcf8a
Maple LD is not flexible
thinkyhead Aug 4, 2021
8ef57b0
Define EXP pins, update tone timer
thinkyhead Aug 5, 2021
5acb2b7
Non-Maple timer flags
thinkyhead Aug 6, 2021
21b67a7
Update pins_BTT_SKR_MINI_E3_V2_0.h
thinkyhead Aug 7, 2021
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
Prev Previous commit
Next Next commit
detab, clean up pins
@thinkyhead
thinkyhead committed Aug 8, 2021
commit ede6c83ba42fe31c8271d4c03973b0ca59e7589a
138 changes: 69 additions & 69 deletions Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h
View file
Original file line number Diff line number Diff line change
@@ -34,51 +34,51 @@
//=============================================================================
// ZONESTAR ZM3E2 V1.0 (STM32F130RCT6) board pin assignments
//=============================================================================
// PA0 PWR_HOLD // PB0 BEEP // PC0 HEATER_0
// PA1 FAN_PIN // PB1 KILL // PC1 HEATER_BED
// PA2 TX2 // PB2 LCD_SDA // PC2 TEMP_BED
// PA3 RX2 // PB3 E1_EN // PC3 TEMP_E0
// PA4 SD_CS // PB4 Z_STOP // PC4 SD_DETECT
// PA5 SD_SCK // PB5 Z_DIR // PC5 BTN_EN2
// PA6 SD_MISO // PB6 Z_STEP // PC6 FAN1
// PA7 SD_MOSI // PB7 Z_EN // PC7 FIL_RUNOUT
// PA8 X_DIR // PB8 Y_STEP // PC8 X_EN
// PA9 LCD_RS // PB9 Y_DIR // PC9 X_STEP
// PA10 LCD_SCK // PB10 BTN_ENC // PC10 Z_MIN_PROBE_PIN
// PA11 USB_D- // PB11 BTN_EN1 // PC11 FIL_RUNOUT2
// PA12 USB_D+ // PB12 LED // PC12 E1_DIR
// PA13 MS1 // PB13 E0_EN // PC13 Y_STOP
// PA14 MS2 // PB14 E0_STEP // PC14 Y_EN
// PA15 PWM // PB15 E0_DIR // PC15 X_STOP
// PD0 NC
// PD1 NC
// PD2 E1_STEP
// PA0 PWR_HOLD // PB0 BEEP // PC0 HEATER_0
// PA1 FAN_PIN // PB1 KILL // PC1 HEATER_BED
// PA2 TX2 // PB2 LCD_SDA // PC2 TEMP_BED
// PA3 RX2 // PB3 E1_EN // PC3 TEMP_E0
// PA4 SD_CS // PB4 Z_STOP // PC4 SD_DETECT
// PA5 SD_SCK // PB5 Z_DIR // PC5 BTN_EN2
// PA6 SD_MISO // PB6 Z_STEP // PC6 FAN1
// PA7 SD_MOSI // PB7 Z_EN // PC7 FIL_RUNOUT
// PA8 X_DIR // PB8 Y_STEP // PC8 X_EN
// PA9 LCD_RS // PB9 Y_DIR // PC9 X_STEP
// PA10 LCD_SCK // PB10 BTN_ENC // PC10 Z_MIN_PROBE_PIN
// PA11 USB_D- // PB11 BTN_EN1 // PC11 FIL_RUNOUT2
// PA12 USB_D+ // PB12 LED // PC12 E1_DIR
// PA13 MS1 // PB13 E0_EN // PC13 Y_STOP
// PA14 MS2 // PB14 E0_STEP // PC14 Y_EN
// PA15 PWM // PB15 E0_DIR // PC15 X_STOP
// PD0 NC
// PD1 NC
// PD2 E1_STEP
//=============================================================================

//EXP1 connector
// MARK I/O ZONESTAR_12864LCD ZONESTAR_12864OLED
// 10 MOSI PB1 KILL SDA
// 9 SCK PB0 BEEP SCK
// 8 TX1 PA9 DOGLCD_CS CS
// 7 RX1 PA10 DOGLCD_SCK DC
// 6 ENA PC5 BTN_EN2 KNOB_ENB
// 5 DAT PB2 DOGLCD_MOSI RESET
// 4 TX3 PB10 BTN_ENC KNOB_ENC
// 3 RX3 PB11 BTN_EN1 KNOB_ENA
// 2 +5V
// 1 GND
// MARK I/O ZONESTAR_12864LCD ZONESTAR_12864OLED
// 10 MOSI PB1 KILL SDA
// 9 SCK PB0 BEEP SCK
// 8 TX1 PA9 DOGLCD_CS CS
// 7 RX1 PA10 DOGLCD_SCK DC
// 6 ENA PC5 BTN_EN2 KNOB_ENB
// 5 DAT PB2 DOGLCD_MOSI RESET
// 4 TX3 PB10 BTN_ENC KNOB_ENC
// 3 RX3 PB11 BTN_EN1 KNOB_ENA
// 2 +5V
// 1 GND

//AUX1 connector
// 1 +5V
// 2 TX2 PA2 UART2_TX
// 3 RX2 PA3 UART2_RX
// 4 GND
// 1 +5V
// 2 TX2 PA2 UART2_TX
// 3 RX2 PA3 UART2_RX
// 4 GND

//AUX2 connector to BLtouch
// 1 +5V
// 2 SEN PC10
// 3 PWM PA15
// 4 GND
// 1 +5V
// 2 SEN PC10
// 3 PWM PA15
// 4 GND
//=============================================================================

//
@@ -159,20 +159,20 @@
//LCD 128x64
//================================================================================
//EXP1 connector
// MARK I/O ZONESTAR_12864LCD
// 10 MOSI PB1 KILL
// 9 SCK PB0 BEEP
// 8 TX1 PA9 LCD_PINS_RS
// 7 RX1 PA10 LCD_PINS_D4
// 6 ENA PC5 BTN_EN2
// 5 DAT PB2 LCD_PINS_ENABLE
// 4 TX3 PB10 BTN_ENC
// 3 RX3 PB11 BTN_EN1
// 2 +5V
// 1 GND
// MARK I/O ZONESTAR_12864LCD
// 10 MOSI PB1 KILL
// 9 SCK PB0 BEEP
// 8 TX1 PA9 LCD_PINS_RS
// 7 RX1 PA10 LCD_PINS_D4
// 6 ENA PC5 BTN_EN2
// 5 DAT PB2 LCD_PINS_ENABLE
// 4 TX3 PB10 BTN_ENC
// 3 RX3 PB11 BTN_EN1
// 2 +5V
// 1 GND

#if ENABLED(ZONESTAR_12864LCD)
#define LCDSCREEN_NAME "ZONESTAR LCD12864"
#define LCDSCREEN_NAME "ZONESTAR LCD12864"
#define LCD_PINS_RS PA9
#define LCD_PINS_ENABLE PB2
#define LCD_PINS_D4 PA10
@@ -189,28 +189,28 @@
//================================================================================
//OLED 128x64
//================================================================================
// 10 MOSI PB1 OLED_SDA
// 9 SCK PB0 OLED_SCK
// 8 TX1 PA9 OLED_CS
// 7 RX1 PA10 OLED_DC
// 6 ENA PC5 KNOB_ENA
// 5 DAT PB2 OLED_RESET
// 4 TX3 PB10 KNOB_ENC
// 3 RX3 PB11 KNOB_ENB
// 10 MOSI PB1 OLED_SDA
// 9 SCK PB0 OLED_SCK
// 8 TX1 PA9 OLED_CS
// 7 RX1 PA10 OLED_DC
// 6 ENA PC5 KNOB_ENA
// 5 DAT PB2 OLED_RESET
// 4 TX3 PB10 KNOB_ENC
// 3 RX3 PB11 KNOB_ENB

#if EITHER(ZONESTAR_12864OLED,ZONESTAR_12864OLED_SSD1306)
#ifndef FORCE_SOFT_SPI
#define FORCE_SOFT_SPI
#endif
#define LCDSCREEN_NAME "ZONESTAR 12864OLED"
#define LCD_PINS_RS PB2 // = LCD_RESET_PIN
#define LCD_PINS_DC PA10 // DC
#define DOGLCD_CS PA9 // CS
#define DOGLCD_A0 LCD_PINS_DC // A0 = DC
#define DOGLCD_MOSI PB1 // SDA
#define DOGLCD_SCK PB0 // SCK
//Knob
#define BTN_EN1 PB11
#define BTN_EN2 PC5
#define BTN_ENC PB10
#define LCDSCREEN_NAME "ZONESTAR 12864OLED"
#define LCD_PINS_RS PB2 // = LCD_RESET_PIN
#define LCD_PINS_DC PA10 // DC
#define DOGLCD_CS PA9 // CS
#define DOGLCD_A0 LCD_PINS_DC // A0 = DC
#define DOGLCD_MOSI PB1 // SDA
#define DOGLCD_SCK PB0 // SCK
//Knob
#define BTN_EN1 PB11
#define BTN_EN2 PC5
#define BTN_ENC PB10
#endif//ENABLED(ZONESTAR_OLED12864)
217 changes: 105 additions & 112 deletions Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h
View file
Original file line number Diff line number Diff line change
@@ -22,8 +22,8 @@
#pragma once

// =====================NOTE=====================
// #define TONE_TIMER 1
// #define TONE_CHANNEL 2
// #define TONE_TIMER 1
// #define TONE_CHANNEL 2
// Please redefine the TONE_TIMER and TONE_CHANNEL in
// .platformio\packages\framework-arduinoststm32-maple\STM32F1\cores\maple\tone.cpp
// line 31 and line 34
@@ -43,109 +43,92 @@
//=============================================================================
// ZONESTAR ZM3E4 V1.0 (STM32F130RCT6) board pin assignments
//=============================================================================
// PA0 // PB0 HEAT_1 // PC0 AXU_SDA
// PA1 // PB1 FAN1 // PC1 TEMP_E1
// PA2 HEAT_BED // PB2 BOOT1 // PC2 TEMP_E0
// PA3 PWR_HOLD // PB3 SPI3_SCK // PC3 TEMP_BED
// PA4 SD_CS // PB4 SPI3_MISO // PC4 SD_DETECT
// PA5 SD_SCK // PB5 SPI3_MOSI // PC5 HEAT_0
// PA6 SD_MISO // PB6 SERVO3 // PC6 E1_STEP
// PA7 SD_MOSI // PB7 SERVO2 // PC7 E1_EN
// PA8 X_DIR // PB8 FAN2/SERVO1 // PC8 FIL_RUNOUT_PIN
// PA9 UART1_RX // PB9 SERVO0 // PC9 E0_DIR
// PA10 UART1_TX // PB10 TX3 // PC10 E0_EN
// PA11 USB_D- // PB11 RX3 // PC11 Z2_EN
// PA12 USB_D+ // PB12 LED // PC12 Z2_STEP
// PA13 SWD_SDO // PB13 Z1_MAX // PC13 X_MIN
// PA14 SWD_SCK // PB14 Y_MAX // PC14 WIFI_RST
// PA15 SPI3_CS // PB15 PWR_DET // PC15 WIFI_CS
// PD0 Z2_DIR // PE0 Y_EN
// PD1 Z2_MIN // PE1 Y_STEP
// PD2 Z1_EN // PE2 Y_DIR
// PD3 Z1_STEP // PE3 Y_MIN
// PD4 Z1_DIR // PE4 X_DIR
// PD5 WIFI_RXD // PE5 X_STEP
// PD6 WIFI_TXD // PE6 X_EN
// PD7 Z1_MIN // PE7 AXU_SCL
// PD8 X_MAX // PE8 BTN_EN1
// PD9 E3_DIR // PE9 LCD_SCK
// PD10 E3_STEP // PE10 LCD_MOSI
// PD11 E3_EN // PE11 BEEPER
// PD12 E2_DIR // PE12 LCD_EN
// PD13 E2_STEP // PE13 KILL
// PD14 E2_EN // PE14 BTN_EN2
// PD15 E1_DIR // PE15 BTN_ENC
// PA0 // PB0 HEAT_1 // PC0 AXU_SDA
// PA1 // PB1 FAN1 // PC1 TEMP_E1
// PA2 HEAT_BED // PB2 BOOT1 // PC2 TEMP_E0
// PA3 PWR_HOLD // PB3 SPI3_SCK // PC3 TEMP_BED
// PA4 SD_CS // PB4 SPI3_MISO // PC4 SD_DETECT
// PA5 SD_SCK // PB5 SPI3_MOSI // PC5 HEAT_0
// PA6 SD_MISO // PB6 SERVO3 // PC6 E1_STEP
// PA7 SD_MOSI // PB7 SERVO2 // PC7 E1_EN
// PA8 X_DIR // PB8 FAN2/SERVO1 // PC8 FIL_RUNOUT_PIN
// PA9 UART1_RX // PB9 SERVO0 // PC9 E0_DIR
// PA10 UART1_TX // PB10 TX3 // PC10 E0_EN
// PA11 USB_D- // PB11 RX3 // PC11 Z2_EN
// PA12 USB_D+ // PB12 LED // PC12 Z2_STEP
// PA13 SWD_SDO // PB13 Z1_MAX // PC13 X_MIN
// PA14 SWD_SCK // PB14 Y_MAX // PC14 WIFI_RST
// PA15 SPI3_CS // PB15 PWR_DET // PC15 WIFI_CS
// PD0 Z2_DIR // PE0 Y_EN
// PD1 Z2_MIN // PE1 Y_STEP
// PD2 Z1_EN // PE2 Y_DIR
// PD3 Z1_STEP // PE3 Y_MIN
// PD4 Z1_DIR // PE4 X_DIR
// PD5 WIFI_RXD // PE5 X_STEP
// PD6 WIFI_TXD // PE6 X_EN
// PD7 Z1_MIN // PE7 AXU_SCL
// PD8 X_MAX // PE8 BTN_EN1
// PD9 E3_DIR // PE9 LCD_SCK
// PD10 E3_STEP // PE10 LCD_MOSI
// PD11 E3_EN // PE11 BEEPER
// PD12 E2_DIR // PE12 LCD_EN
// PD13 E2_STEP // PE13 KILL
// PD14 E2_EN // PE14 BTN_EN2
// PD15 E1_DIR // PE15 BTN_ENC
//=============================================================================

//EXP1 connector
// MARK I/O ZONESTAR_LCD12864 REPRAPDISCOUNT_LCD12864
// 10 RS PE13 KILL BTN_ENC
// 9 BP PE11 BEEP BEEP
// 8 EN PE12 DOGLCD_CS LCDRS
// 7 MOSI PE10 DOGLCD_SCK LCDE
// 6 EN1 PE8 BTN_EN1 NC
// 5 SCK PE9 DOGLCD_MOSI LCD4
// 4 ENC PE15 BTN_ENC NC
// 3 EN2 PE14 BTN_EN2 NC
// 2 +5V +5V
// 1 GND GND
// MARK I/O ZONESTAR_LCD12864 REPRAPDISCOUNT_LCD12864
// 10 RS PE13 KILL BTN_ENC
// 9 BP PE11 BEEP BEEP
// 8 EN PE12 DOGLCD_CS LCDRS
// 7 MOSI PE10 DOGLCD_SCK LCDE
// 6 EN1 PE8 BTN_EN1 NC
// 5 SCK PE9 DOGLCD_MOSI LCD4
// 4 ENC PE15 BTN_ENC NC
// 3 EN2 PE14 BTN_EN2 NC
// 2 +5V +5V
// 1 GND GND

//EXP2 connector
// MARK I/O ZONESTAR_LCD12864 REPRAPDISCOUNT_LCD12864
// 10
// 9
// 8 RX0 PA9 UART1_RX
// 7 TX0 PA10 UART1_TX BTN_EN2
// 6 CS3 PA15
// 5 MISO3 PB4 BTN_EN1
// 4 MOSI3 PB5 KILL
// 3 SCK3 PB3
// 2 +5V +5V
// 1 GND GND
// MARK I/O ZONESTAR_LCD12864 REPRAPDISCOUNT_LCD12864
// 10
// 9
// 8 RX0 PA9 UART1_RX
// 7 TX0 PA10 UART1_TX BTN_EN2
// 6 CS3 PA15
// 5 MISO3 PB4 BTN_EN1
// 4 MOSI3 PB5 KILL
// 3 SCK3 PB3
// 2 +5V +5V
// 1 GND GND

//AUX1 connector
// 1 +5V
// 2 GND
// 3 RX3 PB11 UART3_RX
// 4 TX3 PB10 UART3_TX
// 5 SCL PE7
// 6 SDA PC0
// 1 +5V
// 2 GND
// 3 RX3 PB11 UART3_RX
// 4 TX3 PB10 UART3_TX
// 5 SCL PE7
// 6 SDA PC0

//WiFi
// 1 +5V
// 2 GND
// 3 WIFI_TXD PD5 UART2_RX
// 4 WIFI_RXD PD6 UART2_TX
// 5 WIFI_RST PC14
// 6 WIFI_CS PC15
// 1 +5V
// 2 GND
// 3 WIFI_TXD PD5 UART2_RX
// 4 WIFI_RXD PD6 UART2_TX
// 5 WIFI_RST PC14
// 6 WIFI_CS PC15
//=============================================================================

//
// Limit Switches
//
#ifdef USE_XMIN_PLUG
#define X_STOP_PIN PC13
#endif

#ifdef USE_YMIN_PLUG
#define Y_STOP_PIN PE3
#endif

#ifdef USE_ZMIN_PLUG
#define Z_MIN_PIN PD7
#endif

#ifdef USE_XMAX_PLUG
#define X_MAX_PIN PD8
#endif

#ifdef USE_YMAX_PLUG
#define Y_MAX_PIN PB14
#endif

#ifdef USE_ZMAX_PLUG
#define Z_MAX_PIN PB13
#endif
#define X_MIN_PIN PC13
#define X_MAX_PIN PD8
#define Y_MIN_PIN PE3
#define Y_MAX_PIN PB14
#define Z_MIN_PIN PD7
#define Z_MAX_PIN PB13

//
// Steppers
@@ -177,38 +160,45 @@
#endif

#ifdef OPTION_Z2_ENDSTOP
#define Z2_MIN_PIN PD1 //Z2_MIN_PIN
#define Z2_MIN_PIN PD1 // Z2_MIN_PIN
#endif

//#define Z2_MAX_PIN PB12

#ifdef SWITCH_EXTRUDER_SQUENCY
#ifdef SWITCH_EXTRUDER_SEQUENCE
#define E3_ENABLE_PIN PC10
#define E3_STEP_PIN PA8
#define E3_DIR_PIN PC9

#define E2_STEP_PIN PC6
#define E2_DIR_PIN PD15
#define E2_ENABLE_PIN PC7

#define E1_STEP_PIN PD13
#define E1_DIR_PIN PD12
#define E1_ENABLE_PIN PD14

#define E0_STEP_PIN PD10
#define E0_DIR_PIN PD9
#define E0_ENABLE_PIN PD11
#else
#define E0_ENABLE_PIN PC10
#define E0_STEP_PIN PA8
#define E0_DIR_PIN PC9

#define E1_STEP_PIN PC6
#define E1_DIR_PIN PD15
#define E1_ENABLE_PIN PC7

#define E2_STEP_PIN PD13
#define E2_DIR_PIN PD12
#define E2_ENABLE_PIN PD14

#define E3_STEP_PIN PD10
#define E3_DIR_PIN PD9
#define E3_ENABLE_PIN PD11
#endif

//
// Temperature Sensors
//
@@ -239,7 +229,7 @@
//
// Misc. Functions
//
//#define POWER_LOSS_PIN PB15 //
//#define POWER_LOSS_PIN PB15
#define LED_PIN PA0
#define SUICIDE_PIN PA3
#define FIL_RUNOUT_PIN PC8
@@ -259,16 +249,16 @@
// LCD / Controller
//
#if ENABLED(ZONESTAR_12864LCD)
#define LCDSCREEN_NAME "ZONESTAR LCD12864"
#define LCD_PINS_RS PE12 //7 CS make sure for zonestar zm3e4!
#define LCD_PINS_ENABLE PE9 //6 DATA make sure for zonestar zm3e4!
#define LCD_PINS_D4 PE10 //8 SCK make sure for zonestar zm3e4!
#define LCD_PINS_D5 -1 //mosi
#define LCDSCREEN_NAME "ZONESTAR LCD12864"
#define LCD_PINS_RS PE12 // 7 CS make sure for zonestar zm3e4!
#define LCD_PINS_ENABLE PE9 // 6 DATA make sure for zonestar zm3e4!
#define LCD_PINS_D4 PE10 // 8 SCK make sure for zonestar zm3e4!
#define LCD_PINS_D5 -1 // MOSI
#define LCD_PINS_D6 -1
#define LCD_PINS_D7 -1
#define LCD_RESET_PIN -1
#define BEEPER_PIN PE11
#define KILL_PIN -1 //PE13
#define KILL_PIN -1 // PE13
#define BTN_EN1 PE8
#define BTN_EN2 PE14
#define BTN_ENC PE15
@@ -279,11 +269,11 @@
#endif

#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define LCDSCREEN_NAME "REPRAPDISCOUNT LCD12864"
#define LCD_PINS_RS PE12 //7 CS make sure for zonestar zm3e4!
#define LCD_PINS_ENABLE PE10 //6 DATA make sure for zonestar zm3e4!
#define LCD_PINS_D4 PE9 //8 SCK make sure for zonestar zm3e4!
#define LCD_PINS_D5 -1 //mosi
#define LCDSCREEN_NAME "REPRAPDISCOUNT LCD12864"
#define LCD_PINS_RS PE12 // 7 CS make sure for zonestar zm3e4!
#define LCD_PINS_ENABLE PE10 // 6 DATA make sure for zonestar zm3e4!
#define LCD_PINS_D4 PE9 // 8 SCK make sure for zonestar zm3e4!
#define LCD_PINS_D5 -1 // MOSI
#define LCD_PINS_D6 -1
#define LCD_PINS_D7 -1
#define LCD_RESET_PIN -1
@@ -299,7 +289,7 @@
#endif

#if ENABLED(ZONESTAR_LCD2004_KNOB)
#define LCDSCREEN_NAME "LCD2004 KNOB"
#define LCDSCREEN_NAME "LCD2004 KNOB"
#define LCD_PINS_RS PE12
#define LCD_PINS_ENABLE PE10
#define LCD_PINS_D4 PE9
@@ -314,19 +304,19 @@
#endif

#if ENABLED(ZONESTAR_LCD2004_ADCKEY)
#define LCDSCREEN_NAME "LCD2004 5KEY"
#define LCDSCREEN_NAME "LCD2004 5KEY"
#define LCD_PINS_RS PE12
#define LCD_PINS_ENABLE PE10
#define LCD_PINS_D4 PE9
#define LCD_PINS_D5 PE8
#define LCD_PINS_D6 PE14
#define LCD_PINS_D7 PE15
#define ADC_KEYPAD_PIN PC0 //PIN6 of AUX1
#define ADC_KEYPAD_PIN PC0 // PIN6 of AUX1
#endif

#if ENABLED(ZONESTAR_DWIN_LCD)
//Connect to EXP2 connector
#define LCDSCREEN_NAME "ZONESTAR DWIN LCD"
// Connect to EXP2 connector
#define LCDSCREEN_NAME "ZONESTAR DWIN LCD"
#define BEEPER_PIN PA15
#define KILL_PIN PC0
#define BTN_EN1 PB3
@@ -340,8 +330,11 @@
#define BOARD_ST7920_DELAY_3 DELAY_NS(125)
#endif

//SERVO
//Remap SERVO0 PIN for BLTouch
//
// Servos
//

// Remap SERVO0 PIN for BLTouch
#if ENABLED(BLTOUCH_ON_EXP1)
//BLTouch connect to EXP1
#define BLTOUCH_PROBE_PIN PE8
215 changes: 102 additions & 113 deletions Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h
View file
Original file line number Diff line number Diff line change
@@ -22,8 +22,8 @@
#pragma once

// =====================NOTE=====================
// #define TONE_TIMER 1
// #define TONE_CHANNEL 2
// #define TONE_TIMER 1
// #define TONE_CHANNEL 2
// Please redefine the TONE_TIMER and TONE_CHANNEL in
// .platformio\packages\framework-arduinoststm32-maple\STM32F1\cores\maple\tone.cpp
// line 31 and line 34
@@ -44,108 +44,91 @@
//=============================================================================
// ZONESTAR ZM3E4 V1.0 (STM32F130RCT6) board pin assignments
//=============================================================================
// PA0 // PB0 HEAT_1 // PC0 AXU_SDA
// PA1 // PB1 FAN1 // PC1 TEMP_E1
// PA2 HEAT_BED // PB2 BOOT1 // PC2 TEMP_E0
// PA3 PWR_HOLD // PB3 SPI3_SCK // PC3 TEMP_BED
// PA4 SD_CS // PB4 SPI3_MISO // PC4 SD_DETECT
// PA5 SD_SCK // PB5 SPI3_MOSI // PC5 HEAT_0
// PA6 SD_MISO // PB6 SERVO3 // PC6 E1_STEP
// PA7 SD_MOSI // PB7 SERVO2 // PC7 E1_EN
// PA8 X_DIR // PB8 FAN2/SERVO1 // PC8 FIL_RUNOUT_PIN
// PA9 UART1_RX // PB9 SERVO0 // PC9 E0_DIR
// PA10 UART1_TX // PB10 TX3 // PC10 E0_EN
// PA11 USB_D- // PB11 RX3 // PC11 Z2_EN
// PA12 USB_D+ // PB12 LED // PC12 Z2_STEP
// PA13 SWD_SDO // PB13 Z1_MAX // PC13 X_MIN
// PA14 SWD_SCK // PB14 Y_MAX // PC14 WIFI_RST
// PA15 SPI3_CS // PB15 PWR_DET // PC15 WIFI_CS
// PD0 Z2_DIR // PE0 Y_EN
// PD1 Z2_MIN // PE1 Y_STEP
// PD2 Z1_EN // PE2 Y_DIR
// PD3 Z1_STEP // PE3 Y_MIN
// PD4 Z1_DIR // PE4 X_DIR
// PD5 WIFI_RXD // PE5 X_STEP
// PD6 WIFI_TXD // PE6 X_EN
// PD7 Z1_MIN // PE7 AXU_SCL
// PD8 X_MAX // PE8 BTN_EN1
// PD9 E3_DIR // PE9 LCD_SCK
// PD10 E3_STEP // PE10 LCD_MOSI
// PD11 E3_EN // PE11 BEEPER
// PD12 E2_DIR // PE12 LCD_EN
// PD13 E2_STEP // PE13 KILL
// PD14 E2_EN // PE14 BTN_EN2
// PD15 E1_DIR // PE15 BTN_ENC
// PA0 // PB0 HEAT_1 // PC0 AXU_SDA
// PA1 // PB1 FAN1 // PC1 TEMP_E1
// PA2 HEAT_BED // PB2 BOOT1 // PC2 TEMP_E0
// PA3 PWR_HOLD // PB3 SPI3_SCK // PC3 TEMP_BED
// PA4 SD_CS // PB4 SPI3_MISO // PC4 SD_DETECT
// PA5 SD_SCK // PB5 SPI3_MOSI // PC5 HEAT_0
// PA6 SD_MISO // PB6 SERVO3 // PC6 E1_STEP
// PA7 SD_MOSI // PB7 SERVO2 // PC7 E1_EN
// PA8 X_DIR // PB8 FAN2/SERVO1 // PC8 FIL_RUNOUT_PIN
// PA9 UART1_RX // PB9 SERVO0 // PC9 E0_DIR
// PA10 UART1_TX // PB10 TX3 // PC10 E0_EN
// PA11 USB_D- // PB11 RX3 // PC11 Z2_EN
// PA12 USB_D+ // PB12 LED // PC12 Z2_STEP
// PA13 SWD_SDO // PB13 Z1_MAX // PC13 X_MIN
// PA14 SWD_SCK // PB14 Y_MAX // PC14 WIFI_RST
// PA15 SPI3_CS // PB15 PWR_DET // PC15 WIFI_CS
// PD0 Z2_DIR // PE0 Y_EN
// PD1 Z2_MIN // PE1 Y_STEP
// PD2 Z1_EN // PE2 Y_DIR
// PD3 Z1_STEP // PE3 Y_MIN
// PD4 Z1_DIR // PE4 X_DIR
// PD5 WIFI_RXD // PE5 X_STEP
// PD6 WIFI_TXD // PE6 X_EN
// PD7 Z1_MIN // PE7 AXU_SCL
// PD8 X_MAX // PE8 BTN_EN1
// PD9 E3_DIR // PE9 LCD_SCK
// PD10 E3_STEP // PE10 LCD_MOSI
// PD11 E3_EN // PE11 BEEPER
// PD12 E2_DIR // PE12 LCD_EN
// PD13 E2_STEP // PE13 KILL
// PD14 E2_EN // PE14 BTN_EN2
// PD15 E1_DIR // PE15 BTN_ENC
//=============================================================================
//EXP1 connector
// MARK I/O ZONESTAR_LCD12864 REPRAPDISCOUNT_LCD12864
// 10 RS PE13 KILL BTN_ENC
// 9 BP PE11 BEEP BEEP
// 8 EN PE12 DOGLCD_CS LCDRS
// 7 MOSI PE10 DOGLCD_SCK LCDE
// 6 EN1 PE8 BTN_EN1 NC
// 5 SCK PE9 DOGLCD_MOSI LCD4
// 4 ENC PE15 BTN_ENC NC
// 3 EN2 PE14 BTN_EN2 NC
// 2 +5V +5V
// 1 GND GND
// MARK I/O ZONESTAR_LCD12864 REPRAPDISCOUNT_LCD12864
// 10 RS PE13 KILL BTN_ENC
// 9 BP PE11 BEEP BEEP
// 8 EN PE12 DOGLCD_CS LCDRS
// 7 MOSI PE10 DOGLCD_SCK LCDE
// 6 EN1 PE8 BTN_EN1 NC
// 5 SCK PE9 DOGLCD_MOSI LCD4
// 4 ENC PE15 BTN_ENC NC
// 3 EN2 PE14 BTN_EN2 NC
// 2 +5V +5V
// 1 GND GND

//EXP2 connector
// MARK I/O ZONESTAR_LCD12864 REPRAPDISCOUNT_LCD12864
// 10 SDA PC0
// 9 SCL PE7
// 8 RX1 PA9 UART1_RX
// 7 TX1 PA10 UART1_TX BTN_EN2
// 6 CS3 PA15
// 5 MISO3 PB4 BTN_EN1
// 4 MOSI3 PB5 KILL
// 3 SCK3 PB3
// 2 +5V +5V
// 1 GND GND
// MARK I/O ZONESTAR_LCD12864 REPRAPDISCOUNT_LCD12864
// 10 SDA PC0
// 9 SCL PE7
// 8 RX1 PA9 UART1_RX
// 7 TX1 PA10 UART1_TX BTN_EN2
// 6 CS3 PA15
// 5 MISO3 PB4 BTN_EN1
// 4 MOSI3 PB5 KILL
// 3 SCK3 PB3
// 2 +5V +5V
// 1 GND GND

//AUX1 connector
// 1 +5V
// 2 GND
// 3 RX3 PB11 UART3_RX
// 4 TX3 PB10 UART3_TX
// 5 SCL PE7
// 6 SDA PC0
// 1 +5V
// 2 GND
// 3 RX3 PB11 UART3_RX
// 4 TX3 PB10 UART3_TX
// 5 SCL PE7
// 6 SDA PC0

//WiFi
// 1 +5V
// 2 GND
// 3 WIFI_TXD PD5 UART2_RX
// 4 WIFI_RXD PD6 UART2_TX
// 5 WIFI_RST PC14
// 6 WIFI_CS PC15
// 1 +5V
// 2 GND
// 3 WIFI_TXD PD5 UART2_RX
// 4 WIFI_RXD PD6 UART2_TX
// 5 WIFI_RST PC14
// 6 WIFI_CS PC15
//=============================================================================

//
// Limit Switches
//
#ifdef USE_XMIN_PLUG
#define X_STOP_PIN PC13
#endif

#ifdef USE_YMIN_PLUG
#define Y_STOP_PIN PE3
#endif

#ifdef USE_ZMIN_PLUG
#define Z_MIN_PIN PD7
#endif

#ifdef USE_XMAX_PLUG
#define X_MAX_PIN PD8
#endif

#ifdef USE_YMAX_PLUG
#define Y_MAX_PIN PB14
#endif

#ifdef USE_ZMAX_PLUG
#define Z_MAX_PIN PB13
#endif
#define X_MIN_PIN PC13
#define Y_MIN_PIN PE3
#define Z_MIN_PIN PD7
#define X_MAX_PIN PD8
#define Y_MAX_PIN PB14
#define Z_MAX_PIN PB13

//
// Steppers
@@ -177,38 +160,44 @@
#endif

#ifdef OPTION_Z2_ENDSTOP
#define Z2_MIN_PIN PD1 //Z2_MIN_PIN
#define Z2_MIN_PIN PD1 // Z2_MIN_PIN
#endif

#ifdef OPTION_REPEAT_PRINTING
#define REPRINT_STOP_PIN PD8 //X_MAX_PIN
#define REPRINT_STOP_PIN PD8 // X_MAX_PIN
#endif

//#define Z2_MAX_PIN PB12

#ifdef SWITCH_EXTRUDER_SQUENCY
#ifdef SWITCH_EXTRUDER_SEQUENCE
#define E3_ENABLE_PIN PC10
#define E3_STEP_PIN PA8
#define E3_DIR_PIN PC9

#define E2_STEP_PIN PC6
#define E2_DIR_PIN PD15
#define E2_ENABLE_PIN PC7

#define E1_STEP_PIN PD13
#define E1_DIR_PIN PD12
#define E1_ENABLE_PIN PD14

#define E0_STEP_PIN PD10
#define E0_DIR_PIN PD9
#define E0_ENABLE_PIN PD11
#else
#define E0_ENABLE_PIN PC10
#define E0_STEP_PIN PA8
#define E0_DIR_PIN PC9

#define E1_STEP_PIN PC6
#define E1_DIR_PIN PD15
#define E1_ENABLE_PIN PC7

#define E2_STEP_PIN PD13
#define E2_DIR_PIN PD12
#define E2_ENABLE_PIN PD14

#define E3_STEP_PIN PD10
#define E3_DIR_PIN PD9
#define E3_ENABLE_PIN PD11
@@ -237,7 +226,7 @@
//
// Misc. Functions
//
//#define POWER_LOSS_PIN PB15 //
//#define POWER_LOSS_PIN PB15
#define LED_PIN PA0
#define SUICIDE_PIN PA3
#define FIL_RUNOUT_PIN PC8
@@ -259,22 +248,22 @@
#endif

#if ENABLED(ZONESTAR_12864LCD)
#define LCDSCREEN_NAME "ZONESTAR LCD12864"
#define LCD_PINS_RS PE12 //7 CS make sure for zonestar zm3e4!
#define LCD_PINS_ENABLE PE9 //6 DATA make sure for zonestar zm3e4!
#define LCD_PINS_D4 PE10 //8 SCK make sure for zonestar zm3e4!
#define LCDSCREEN_NAME "ZONESTAR LCD12864"
#define LCD_PINS_RS PE12 // 7 CS make sure for zonestar zm3e4!
#define LCD_PINS_ENABLE PE9 // 6 DATA make sure for zonestar zm3e4!
#define LCD_PINS_D4 PE10 // 8 SCK make sure for zonestar zm3e4!
#define BEEPER_PIN PE11
#define KILL_PIN -1 //PE13
#define KILL_PIN -1 // PE13
#define BTN_EN1 PE8
#define BTN_EN2 PE14
#define BTN_ENC PE15
#endif

#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define LCDSCREEN_NAME "REPRAPDISCOUNT LCD12864"
#define LCD_PINS_RS PA9 //7 CS make sure for zonestar zm3e4!
#define LCD_PINS_ENABLE PB4 //6 DATA make sure for zonestar zm3e4!
#define LCD_PINS_D4 PA10 //8 SCK make sure for zonestar zm3e4!
#define LCDSCREEN_NAME "REPRAPDISCOUNT LCD12864"
#define LCD_PINS_RS PA9 // 7 CS make sure for zonestar zm3e4!
#define LCD_PINS_ENABLE PB4 // 6 DATA make sure for zonestar zm3e4!
#define LCD_PINS_D4 PA10 // 8 SCK make sure for zonestar zm3e4!
#define LCD_PINS_D5 -1
#define LCD_PINS_D6 -1
#define LCD_PINS_D7 -1
@@ -292,18 +281,18 @@

#if ENABLED(ZONESTAR_DWIN_LCD)
//Connect to EXP2 connector
#define LCDSCREEN_NAME "ZONESTAR DWIN LCD"
#define BEEPER_PIN PA15 //PE11
#define KILL_PIN -1 //PE13
#define BTN_EN2 PB5 //PE8
#define BTN_EN1 PB3 //PE14
#define BTN_ENC PB4 //PE15
#define LCDSCREEN_NAME "ZONESTAR DWIN LCD"
#define BEEPER_PIN PA15 // PE11
#define KILL_PIN -1 // PE13
#define BTN_EN2 PB5 // PE8
#define BTN_EN1 PB3 // PE14
#define BTN_ENC PB4 // PE15
#endif

#if HAS_MARLINUI_U8GLIB
#define BOARD_ST7920_DELAY_1 DELAY_NS(200) //Tclk_fall <200ns
#define BOARD_ST7920_DELAY_2 DELAY_NS(250) //Tdata_width >200ns
#define BOARD_ST7920_DELAY_3 DELAY_NS(200) //Tclk_rise <200ns
#define BOARD_ST7920_DELAY_1 DELAY_NS(200) // Tclk_fall <200ns
#define BOARD_ST7920_DELAY_2 DELAY_NS(250) // Tdata_width >200ns
#define BOARD_ST7920_DELAY_3 DELAY_NS(200) // Tclk_rise <200ns
#endif

//SERVO