Merge pull request #193 from th3dstudio/2.0.x

Fix Beeper issue from Marlin 2.1.2.4 pins file

Board_Configs/TH3D_EZBoardLite/Firmware/Marlin/Configuration.h

@@ -5,8 +5,8 @@
 #pragma once
 #define CONFIGURATION_H_VERSION 02010204
 
-#define UNIFIED_VERSION "TH3D UFW 2.90"
-#define STRING_DISTRIBUTION_DATE "2024-09-04"
+#define UNIFIED_VERSION "TH3D UFW 2.90a"
+#define STRING_DISTRIBUTION_DATE "2024-09-05"
 
 //#@CONFIGURATION_START_FLAG
 

Board_Configs/TH3D_EZBoardLite_DIY/Firmware/Marlin/Configuration.h

@@ -7,8 +7,8 @@
 #pragma once
 #define CONFIGURATION_H_VERSION 02010204
 
-#define UNIFIED_VERSION "TH3D UFW 2.90"
-#define STRING_DISTRIBUTION_DATE "2024-09-04"
+#define UNIFIED_VERSION "TH3D UFW 2.90a"
+#define STRING_DISTRIBUTION_DATE "2024-09-05"
 
 //#@CONFIGURATION_START_FLAG
 

Board_Configs/TH3D_EZBoardV2/Firmware/Marlin/Configuration.h

@@ -5,8 +5,8 @@
 #pragma once
 #define CONFIGURATION_H_VERSION 02010204
 
-#define UNIFIED_VERSION "TH3D UFW 2.90"
-#define STRING_DISTRIBUTION_DATE "2024-09-04"
+#define UNIFIED_VERSION "TH3D UFW 2.90a"
+#define STRING_DISTRIBUTION_DATE "2024-09-05"
 
 //#@CONFIGURATION_START_FLAG
 

Board_Configs/TH3D_EZBoardV2_DIY/Firmware/Marlin/Configuration.h

@@ -7,8 +7,8 @@
 #pragma once
 #define CONFIGURATION_H_VERSION 02010204
 
-#define UNIFIED_VERSION "TH3D UFW 2.90"
-#define STRING_DISTRIBUTION_DATE "2024-09-04"
+#define UNIFIED_VERSION "TH3D UFW 2.90a"
+#define STRING_DISTRIBUTION_DATE "2024-09-05"
 
 //#@CONFIGURATION_START_FLAG
 

Firmware/CoreFilesChangeList.md

@@ -30,6 +30,8 @@ To disable any menu customization we've made just add `#define DISABLE_TH3D_MODS
 				- `menu_advanced.cpp` - Moved menus around for easier use.
 		- **pins**
 			- `pins.h`
+			- **gd32f1**
+				- `pins_SOVOL_V131.h`
 			- **ramps**
 				- `pins_RAMPS.h`
 				- `pins_RAMPS_CREALITY.h`

Firmware/Marlin/Configuration_backend.h

@@ -7,7 +7,7 @@
 //===========================================================================
 
 #ifndef UNIFIED_VERSION
-  #define UNIFIED_VERSION "TH3D UFW 2.90"
+  #define UNIFIED_VERSION "TH3D UFW 2.90a"
 #endif
 
 /**

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

@@ -39,7 +39,214 @@
   #define DEFAULT_MACHINE_NAME "Sovol SV06"
 #endif
 
-#include "../stm32f1/pins_CREALITY_V4.h"
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+// Required on the V4 boards - Added by TH3D
+#ifndef FAN_SOFT_PWM
+  #define FAN_SOFT_PWM
+#endif
+#ifndef SOFT_PWM_SCALE
+  #define SOFT_PWM_SCALE 0
+#endif
+
+#include "env_validate.h"
+
+#if !E_ERROR && (HAS_MULTI_HOTEND || E_STEPPERS > 1)
+  #error "Sovol V1.3.1 only supports 1 hotend / E stepper."
+#endif
+
+#define BOARD_NO_NATIVE_USB
+
+//
+// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
+//
+#ifndef DISABLE_DEBUG
+  #define DISABLE_DEBUG
+#endif
+
+//
+// EEPROM
+//
+#if NO_EEPROM_SELECTED
+  #define IIC_BL24CXX_EEPROM                      // EEPROM on I2C-0
+  //#define SDCARD_EEPROM_EMULATION
+  #undef NO_EEPROM_SELECTED
+#endif
+
+#if ENABLED(IIC_BL24CXX_EEPROM)
+  #define IIC_EEPROM_SDA                    PA11
+  #define IIC_EEPROM_SCL                    PA12
+  #define MARLIN_EEPROM_SIZE               0x800  // 2K (24C16)
+#elif ENABLED(SDCARD_EEPROM_EMULATION)
+  #define MARLIN_EEPROM_SIZE               0x800  // 2K
+#endif
+
+//
+// Servos
+//
+#ifndef SERVO0_PIN
+  #ifndef HAS_PIN_27_BOARD
+    #define SERVO0_PIN                      PB0   // BLTouch IN - Fixed by TH3D
+  #else
+    #define SERVO0_PIN                      PC6
+  #endif
+#endif
+
+//
+// Limit Switches
+//
+#ifndef X_STOP_PIN
+  #define X_STOP_PIN                        PA5
+#endif
+#ifndef Y_STOP_PIN
+  #define Y_STOP_PIN                        PA6
+#endif
+#ifndef Z_STOP_PIN
+  #define Z_STOP_PIN                        PA7
+#endif
+
+#ifndef Z_MIN_PROBE_PIN
+  #define Z_MIN_PROBE_PIN                   PB1   // BLTouch OUT - Fixed by TH3D
+#endif
+
+//
+// Filament Runout Sensor
+//
+#ifndef FIL_RUNOUT_PIN 
+  #define FIL_RUNOUT_PIN                    PA4   // "Pulled-high"
+#endif
+
+//
+// Steppers
+//
+#ifndef X_STEP_PIN
+  #define X_STEP_PIN                        PC2
+#endif
+#ifndef X_DIR_PIN
+  #define X_DIR_PIN                         PB9
+#endif
+#define X_ENABLE_PIN                        PC3   // Shared
+
+#ifndef Y_STEP_PIN
+  #define Y_STEP_PIN                        PB8
+#endif
+#ifndef Y_DIR_PIN
+  #define Y_DIR_PIN                         PB7
+#endif
+#define Y_ENABLE_PIN                X_ENABLE_PIN
+
+#ifndef Z_STEP_PIN
+  #define Z_STEP_PIN                        PB6
+#endif
+#ifndef Z_DIR_PIN
+  #define Z_DIR_PIN                         PB5
+#endif
+#define Z_ENABLE_PIN                X_ENABLE_PIN
+
+#ifndef E0_STEP_PIN
+  #define E0_STEP_PIN                       PB4
+#endif
+#ifndef E0_DIR_PIN
+  #define E0_DIR_PIN                        PB3
+#endif
+#define E0_ENABLE_PIN               X_ENABLE_PIN
+
+//
+// Temperature Sensors
+//
+#define TEMP_0_PIN                          PC5   // TH1
+#define TEMP_BED_PIN                        PC4   // TB1
+
+//
+// Heaters / Fans
+//
+#ifndef HEATER_0_PIN
+  #define HEATER_0_PIN                      PA1   // HEATER1
+#endif
+#ifndef HEATER_BED_PIN
+  #define HEATER_BED_PIN                    PA2   // HOT BED
+#endif
+#ifndef FAN0_PIN
+  #define FAN0_PIN                          PA0   // FAN
+#endif
+#define FAN_SOFT_PWM_REQUIRED
+
+//
+// SD Card
+//
+#define SD_DETECT_PIN                       PC7
+#define SDCARD_CONNECTION ONBOARD
+#define ONBOARD_SDIO
+#define NO_SD_HOST_DRIVE                          // This board's SD is only seen by the printer
+
+#if ENABLED(CR10_STOCKDISPLAY)
+
+  /**
+   *    RET6 12864 LCD
+   *        ------
+   *  PC6  | 1  2 | PB2
+   *  PB10 | 3  4 | PB11
+   *  PB14   5  6 | PB13
+   *  PB12 | 7  8 | PB15
+   *   GND | 9 10 | 5V
+   *        ------
+   */
+  #define EXP3_01_PIN                       PC6
+  #define EXP3_02_PIN                       PB2
+  #define EXP3_03_PIN                       PB10
+  #define EXP3_04_PIN                       PB11
+  #define EXP3_05_PIN                       PB14
+  #define EXP3_06_PIN                       PB13
+  #define EXP3_07_PIN                       PB12
+  #define EXP3_08_PIN                       PB15
+
+  #define LCD_PINS_RS                EXP3_07_PIN
+  #define LCD_PINS_EN                EXP3_08_PIN
+  #define LCD_PINS_D4                EXP3_06_PIN
+
+  #define BTN_ENC                    EXP3_02_PIN
+  #define BTN_EN1                    EXP3_03_PIN
+  #define BTN_EN2                    EXP3_05_PIN
+
+  #define BEEPER_PIN                 EXP3_01_PIN
+
+#endif
+
+// Pins for documentation and sanity checks only.
+// Changing these will not change the pin they are on.
+
+// Hardware UART pins
+#define UART1_TX_PIN                        PA9   // default uses CH340 RX
+#define UART1_RX_PIN                        PA10  // default uses CH340 TX
+#define UART2_TX_PIN                        PA2   // default uses HEATER_BED_PIN
+#define UART2_RX_PIN                        PA3   // not connected
+#define UART3_TX_PIN                        PB10  // default uses LCD connector
+#define UART3_RX_PIN                        PB11  // default uses LCD connector
+#define UART4_TX_PIN                        PC10  // default uses sdcard SDIO_D2
+#define UART4_RX_PIN                        PC11  // default uses sdcard SDIO_D3
+#define UART5_TX_PIN                        PC12  // default uses sdcard SDIO_CK
+#define UART5_RX_PIN                        PD2   // default uses sdcard SDIO_CMD
 
 #if HAS_TMC_UART