Skip to content

Commit 490ea8c

Browse files
houseofbugshouseofbugs
authored
Merge pull request #193 from th3dstudio/2.0.x
Fix Beeper issue from Marlin 2.1.2.4 pins file
2 parents e3d82bd + 500f6fc commit 490ea8c

File tree

7 files changed

+219
-10
lines changed

7 files changed

+219
-10
lines changed

‎Board_Configs/TH3D_EZBoardLite/Firmware/Marlin/Configuration.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
#pragma once
66
#define CONFIGURATION_H_VERSION 02010204
77

8-
#define UNIFIED_VERSION "TH3D UFW 2.90"
9-
#define STRING_DISTRIBUTION_DATE "2024-09-04"
8+
#define UNIFIED_VERSION "TH3D UFW 2.90a"
9+
#define STRING_DISTRIBUTION_DATE "2024-09-05"
1010

1111
//#@CONFIGURATION_START_FLAG
1212

‎Board_Configs/TH3D_EZBoardLite_DIY/Firmware/Marlin/Configuration.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
#pragma once
88
#define CONFIGURATION_H_VERSION 02010204
99

10-
#define UNIFIED_VERSION "TH3D UFW 2.90"
11-
#define STRING_DISTRIBUTION_DATE "2024-09-04"
10+
#define UNIFIED_VERSION "TH3D UFW 2.90a"
11+
#define STRING_DISTRIBUTION_DATE "2024-09-05"
1212

1313
//#@CONFIGURATION_START_FLAG
1414

‎Board_Configs/TH3D_EZBoardV2/Firmware/Marlin/Configuration.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
#pragma once
66
#define CONFIGURATION_H_VERSION 02010204
77

8-
#define UNIFIED_VERSION "TH3D UFW 2.90"
9-
#define STRING_DISTRIBUTION_DATE "2024-09-04"
8+
#define UNIFIED_VERSION "TH3D UFW 2.90a"
9+
#define STRING_DISTRIBUTION_DATE "2024-09-05"
1010

1111
//#@CONFIGURATION_START_FLAG
1212

‎Board_Configs/TH3D_EZBoardV2_DIY/Firmware/Marlin/Configuration.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
#pragma once
88
#define CONFIGURATION_H_VERSION 02010204
99

10-
#define UNIFIED_VERSION "TH3D UFW 2.90"
11-
#define STRING_DISTRIBUTION_DATE "2024-09-04"
10+
#define UNIFIED_VERSION "TH3D UFW 2.90a"
11+
#define STRING_DISTRIBUTION_DATE "2024-09-05"
1212

1313
//#@CONFIGURATION_START_FLAG
1414

‎Firmware/CoreFilesChangeList.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ To disable any menu customization we've made just add `#define DISABLE_TH3D_MODS
3030
- `menu_advanced.cpp` - Moved menus around for easier use.
3131
- **pins**
3232
- `pins.h`
33+
- **gd32f1**
34+
- `pins_SOVOL_V131.h`
3335
- **ramps**
3436
- `pins_RAMPS.h`
3537
- `pins_RAMPS_CREALITY.h`

‎Firmware/Marlin/Configuration_backend.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//===========================================================================
88

99
#ifndef UNIFIED_VERSION
10-
#define UNIFIED_VERSION "TH3D UFW 2.90"
10+
#define UNIFIED_VERSION "TH3D UFW 2.90a"
1111
#endif
1212

1313
/**

‎Firmware/Marlin/src/pins/gd32f1/pins_SOVOL_V131.h

Lines changed: 208 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,214 @@
3939
#define DEFAULT_MACHINE_NAME "Sovol SV06"
4040
#endif
4141

42-
#include "../stm32f1/pins_CREALITY_V4.h"
42+
/**
43+
* Marlin 3D Printer Firmware
44+
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
45+
*
46+
* Based on Sprinter and grbl.
47+
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
48+
*
49+
* This program is free software: you can redistribute it and/or modify
50+
* it under the terms of the GNU General Public License as published by
51+
* the Free Software Foundation, either version 3 of the License, or
52+
* (at your option) any later version.
53+
*
54+
* This program is distributed in the hope that it will be useful,
55+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
56+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
57+
* GNU General Public License for more details.
58+
*
59+
* You should have received a copy of the GNU General Public License
60+
* along with this program. If not, see <https://www.gnu.org/licenses/>.
61+
*
62+
*/
63+
#pragma once
64+
65+
// Required on the V4 boards - Added by TH3D
66+
#ifndef FAN_SOFT_PWM
67+
#define FAN_SOFT_PWM
68+
#endif
69+
#ifndef SOFT_PWM_SCALE
70+
#define SOFT_PWM_SCALE 0
71+
#endif
72+
73+
#include "env_validate.h"
74+
75+
#if !E_ERROR && (HAS_MULTI_HOTEND || E_STEPPERS > 1)
76+
#error "Sovol V1.3.1 only supports 1 hotend / E stepper."
77+
#endif
78+
79+
#define BOARD_NO_NATIVE_USB
80+
81+
//
82+
// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
83+
//
84+
#ifndef DISABLE_DEBUG
85+
#define DISABLE_DEBUG
86+
#endif
87+
88+
//
89+
// EEPROM
90+
//
91+
#if NO_EEPROM_SELECTED
92+
#define IIC_BL24CXX_EEPROM // EEPROM on I2C-0
93+
//#define SDCARD_EEPROM_EMULATION
94+
#undef NO_EEPROM_SELECTED
95+
#endif
96+
97+
#if ENABLED(IIC_BL24CXX_EEPROM)
98+
#define IIC_EEPROM_SDA PA11
99+
#define IIC_EEPROM_SCL PA12
100+
#define MARLIN_EEPROM_SIZE 0x800 // 2K (24C16)
101+
#elif ENABLED(SDCARD_EEPROM_EMULATION)
102+
#define MARLIN_EEPROM_SIZE 0x800 // 2K
103+
#endif
104+
105+
//
106+
// Servos
107+
//
108+
#ifndef SERVO0_PIN
109+
#ifndef HAS_PIN_27_BOARD
110+
#define SERVO0_PIN PB0 // BLTouch IN - Fixed by TH3D
111+
#else
112+
#define SERVO0_PIN PC6
113+
#endif
114+
#endif
115+
116+
//
117+
// Limit Switches
118+
//
119+
#ifndef X_STOP_PIN
120+
#define X_STOP_PIN PA5
121+
#endif
122+
#ifndef Y_STOP_PIN
123+
#define Y_STOP_PIN PA6
124+
#endif
125+
#ifndef Z_STOP_PIN
126+
#define Z_STOP_PIN PA7
127+
#endif
128+
129+
#ifndef Z_MIN_PROBE_PIN
130+
#define Z_MIN_PROBE_PIN PB1 // BLTouch OUT - Fixed by TH3D
131+
#endif
132+
133+
//
134+
// Filament Runout Sensor
135+
//
136+
#ifndef FIL_RUNOUT_PIN
137+
#define FIL_RUNOUT_PIN PA4 // "Pulled-high"
138+
#endif
139+
140+
//
141+
// Steppers
142+
//
143+
#ifndef X_STEP_PIN
144+
#define X_STEP_PIN PC2
145+
#endif
146+
#ifndef X_DIR_PIN
147+
#define X_DIR_PIN PB9
148+
#endif
149+
#define X_ENABLE_PIN PC3 // Shared
150+
151+
#ifndef Y_STEP_PIN
152+
#define Y_STEP_PIN PB8
153+
#endif
154+
#ifndef Y_DIR_PIN
155+
#define Y_DIR_PIN PB7
156+
#endif
157+
#define Y_ENABLE_PIN X_ENABLE_PIN
158+
159+
#ifndef Z_STEP_PIN
160+
#define Z_STEP_PIN PB6
161+
#endif
162+
#ifndef Z_DIR_PIN
163+
#define Z_DIR_PIN PB5
164+
#endif
165+
#define Z_ENABLE_PIN X_ENABLE_PIN
166+
167+
#ifndef E0_STEP_PIN
168+
#define E0_STEP_PIN PB4
169+
#endif
170+
#ifndef E0_DIR_PIN
171+
#define E0_DIR_PIN PB3
172+
#endif
173+
#define E0_ENABLE_PIN X_ENABLE_PIN
174+
175+
//
176+
// Temperature Sensors
177+
//
178+
#define TEMP_0_PIN PC5 // TH1
179+
#define TEMP_BED_PIN PC4 // TB1
180+
181+
//
182+
// Heaters / Fans
183+
//
184+
#ifndef HEATER_0_PIN
185+
#define HEATER_0_PIN PA1 // HEATER1
186+
#endif
187+
#ifndef HEATER_BED_PIN
188+
#define HEATER_BED_PIN PA2 // HOT BED
189+
#endif
190+
#ifndef FAN0_PIN
191+
#define FAN0_PIN PA0 // FAN
192+
#endif
193+
#define FAN_SOFT_PWM_REQUIRED
194+
195+
//
196+
// SD Card
197+
//
198+
#define SD_DETECT_PIN PC7
199+
#define SDCARD_CONNECTION ONBOARD
200+
#define ONBOARD_SDIO
201+
#define NO_SD_HOST_DRIVE // This board's SD is only seen by the printer
202+
203+
#if ENABLED(CR10_STOCKDISPLAY)
204+
205+
/**
206+
* RET6 12864 LCD
207+
* ------
208+
* PC6 | 1 2 | PB2
209+
* PB10 | 3 4 | PB11
210+
* PB14 5 6 | PB13
211+
* PB12 | 7 8 | PB15
212+
* GND | 9 10 | 5V
213+
* ------
214+
*/
215+
#define EXP3_01_PIN PC6
216+
#define EXP3_02_PIN PB2
217+
#define EXP3_03_PIN PB10
218+
#define EXP3_04_PIN PB11
219+
#define EXP3_05_PIN PB14
220+
#define EXP3_06_PIN PB13
221+
#define EXP3_07_PIN PB12
222+
#define EXP3_08_PIN PB15
223+
224+
#define LCD_PINS_RS EXP3_07_PIN
225+
#define LCD_PINS_EN EXP3_08_PIN
226+
#define LCD_PINS_D4 EXP3_06_PIN
227+
228+
#define BTN_ENC EXP3_02_PIN
229+
#define BTN_EN1 EXP3_03_PIN
230+
#define BTN_EN2 EXP3_05_PIN
231+
232+
#define BEEPER_PIN EXP3_01_PIN
233+
234+
#endif
235+
236+
// Pins for documentation and sanity checks only.
237+
// Changing these will not change the pin they are on.
238+
239+
// Hardware UART pins
240+
#define UART1_TX_PIN PA9 // default uses CH340 RX
241+
#define UART1_RX_PIN PA10 // default uses CH340 TX
242+
#define UART2_TX_PIN PA2 // default uses HEATER_BED_PIN
243+
#define UART2_RX_PIN PA3 // not connected
244+
#define UART3_TX_PIN PB10 // default uses LCD connector
245+
#define UART3_RX_PIN PB11 // default uses LCD connector
246+
#define UART4_TX_PIN PC10 // default uses sdcard SDIO_D2
247+
#define UART4_RX_PIN PC11 // default uses sdcard SDIO_D3
248+
#define UART5_TX_PIN PC12 // default uses sdcard SDIO_CK
249+
#define UART5_RX_PIN PD2 // default uses sdcard SDIO_CMD
43250

44251
#if HAS_TMC_UART
45252

0 commit comments

Comments
 (0)