Merge pull request #177 from th3dstudio/2.0.x

2.0.x

Author: houseofbugs

Board_Configs/TH3D_EZBoardLite/Firmware/Marlin/Configuration.h

@@ -48,10 +48,10 @@
 //#define SOVOL_SV03
 
 // Filament Sensor Options --------------------------------------------------
-// If your machine came stock with a filament sensor it will be enabled automatically. If you replaced your stock sensor with our EZOut or you added an EZOut enabling the EZOUTV2_ENABLE will override the Creality sensor if your machine had one
+// If your machine came stock with a filament sensor it will be enabled automatically. If you replaced your stock sensor with our EZOut or you added an EZOut enabling the EZOUT_ENABLE will override the Creality sensor if your machine had one
 
 // If you are using our EZOut Sensor connect to the FIL SENSOR header with the RED wire lined up with the "5V" marking by the header and uncomment the below line.
-//#define EZOUTV2_ENABLE
+//#define EZOUT_ENABLE
 
 // If you are using the Creality CR-10S Sensor connect to the FIL SENSOR header with the RED wire lined up with the "5V" marking by the header and uncomment the below line.
 //#define CR10S_STOCKFILAMENTSENSOR
@@ -446,10 +446,10 @@
     #endif
 
     #if ENABLED(SOVOL_SV01) || ENABLED(SOVOL_SV03) || ENABLED(ENDER3_MAX) //Have sensors that use same logic as EZOUT Sensors
-      #define EZOUTV2_ENABLE
+      #define EZOUT_ENABLE
     #endif
 
-    #if DISABLED(EZOUTV2_ENABLE) 
+    #if DISABLED(EZOUT_ENABLE) 
       #define CR10S_STOCKFILAMENTSENSOR
     #endif
 
@@ -595,7 +595,7 @@
     #if DISABLED(REVERSE_KNOB_DIRECTION)
       #define REVERSE_ENCODER_DIRECTION
     #endif
-    #define EZOUTV2_ENABLE
+    #define EZOUT_ENABLE
     #define DUAL_Z_MOTORS
     #define MOUNTED_FILAMENT_SENSOR
   #endif
@@ -830,7 +830,7 @@
 
   #define EZBOARD
 
-  #if ENABLED(EZOUTV2_ENABLE) || ENABLED(CR10S_STOCKFILAMENTSENSOR)
+  #if ENABLED(EZOUT_ENABLE) || ENABLED(CR10S_STOCKFILAMENTSENSOR)
     #define FILAMENT_RUNOUT_SENSOR
   #endif
 
@@ -839,7 +839,7 @@
     #define FIL_RUNOUT_ENABLED_DEFAULT true // Enable the sensor on startup. Override with M412 followed by M500.
     #define NUM_RUNOUT_SENSORS   1          // Number of sensors, up to one per extruder. Define a FIL_RUNOUT#_PIN for each.
 
-    #if ENABLED(EZOUTV2_ENABLE)
+    #if ENABLED(EZOUT_ENABLE)
       #define FIL_RUNOUT_STATE LOW  // Pin state indicating that filament is NOT present.
     #else
       #define FIL_RUNOUT_STATE HIGH // Pin state indicating that filament is NOT present.

Board_Configs/TH3D_EZBoardLite_DIY/Firmware/Marlin/Configuration.h

@@ -180,7 +180,7 @@
 
 // Filament Sensor Options --------------------------------------------------
 // If you are using our EZOut Sensor connect to the FIL SENSOR header with the RED wire lined up with the "5V" marking by the header and uncomment the below line.
-//#define EZOUTV2_ENABLE
+//#define EZOUT_ENABLE
 
 // If you are using the Creality CR-10S Sensor connect to the FIL SENSOR header with the RED wire lined up with the "5V" marking by the header and uncomment the below line.
 //#define CR10S_STOCKFILAMENTSENSOR
@@ -556,7 +556,7 @@
 
 #define EZBOARD
 
-#if ENABLED(EZOUTV2_ENABLE) || ENABLED(CR10S_STOCKFILAMENTSENSOR)
+#if ENABLED(EZOUT_ENABLE) || ENABLED(CR10S_STOCKFILAMENTSENSOR)
   #define FILAMENT_RUNOUT_SENSOR
 #endif
 
@@ -565,7 +565,7 @@
   #define FIL_RUNOUT_ENABLED_DEFAULT true // Enable the sensor on startup. Override with M412 followed by M500.
   #define NUM_RUNOUT_SENSORS   1          // Number of sensors, up to one per extruder. Define a FIL_RUNOUT#_PIN for each.
 
-  #if ENABLED(EZOUTV2_ENABLE)
+  #if ENABLED(EZOUT_ENABLE)
     #define FIL_RUNOUT_STATE LOW  // Pin state indicating that filament is NOT present.
   #else
     #define FIL_RUNOUT_STATE HIGH // Pin state indicating that filament is NOT present.

Board_Configs/TH3D_EZBoardV2/Firmware/Marlin/Configuration.h

@@ -52,10 +52,10 @@
 //#define SOVOL_SV06_PLUS    // See here for stock ABL sensor wiring: https://support.th3dstudio.com/helpcenter/ezboard-v2-sovol-sv06-stock-abl-sensor-wiring/
 
 // Filament Sensor Options --------------------------------------------------
-// If your machine came stock with a filament sensor it will be enabled automatically. If you replaced your stock sensor with our EZOut or you added an EZOut enabling the EZOUTV2_ENABLE will override the Creality sensor if your machine had one
+// If your machine came stock with a filament sensor it will be enabled automatically. If you replaced your stock sensor with our EZOut or you added an EZOut enabling the EZOUT_ENABLE will override the Creality sensor if your machine had one
 
 // If you are using our EZOut Sensor connect to the FIL SENSOR header with the RED wire lined up with the "5V" marking by the header and uncomment the below line.
-//#define EZOUTV2_ENABLE
+//#define EZOUT_ENABLE
 
 // If you are using the Creality CR-10S Sensor connect to the FIL SENSOR header with the RED wire lined up with the "5V" marking by the header and uncomment the below line.
 //#define CR10S_STOCKFILAMENTSENSOR
@@ -73,6 +73,7 @@
 //#define SV01_OEM_MOUNT                   //Sovol SV01 OEM Mount
 //#define SV01_PRO_EZABL_OEM_MOUNT         //For our 18mm Sensors
 //#define SV01_PRO_EZABL_MICRO_OEM_MOUNT   //For our 8mm Sensors
+//#define SV03_OEM_MOUNT                   //Sovol SV03 OEM Mount
 //#define SV06_EZABL_OEM_MOUNT             //Sovol SV06/SV06 Plus EZABL OEM Mount - same offsets, different file
 //#define CR10_VOLCANO                     //TH3D CR-10 Volcano Mount 
 //#define CR10_V6HEAVYDUTY                 //V6 Heavy Duty Mount
@@ -517,17 +518,19 @@
       #define DUAL_Z_MOTORS
     #endif
 
-    #if ENABLED(REVERSE_Z_MOTOR)
-      #undef REVERSE_Z_MOTOR
-    #else
-      #define REVERSE_Z_MOTOR
+    #if DISABLED(SOVOL_SV03)
+      #if ENABLED(REVERSE_Z_MOTOR)
+        #undef REVERSE_Z_MOTOR
+      #else
+        #define REVERSE_Z_MOTOR
+      #endif
     #endif
 
     #if ANY(SOVOL_SV01, SOVOL_SV03, ENDER3_MAX, ENDER5_PLUS) //Have sensors that use same logic as EZOUT Sensors
-      #define EZOUTV2_ENABLE
+      #define EZOUT_ENABLE
     #endif
 
-    #if DISABLED(EZOUTV2_ENABLE) 
+    #if DISABLED(EZOUT_ENABLE) 
       #define CR10S_STOCKFILAMENTSENSOR
     #endif
 
@@ -685,7 +688,7 @@
     #if DISABLED(REVERSE_KNOB_DIRECTION)
       #define REVERSE_ENCODER_DIRECTION
     #endif
-    #define EZOUTV2_ENABLE
+    #define EZOUT_ENABLE
     #define DUAL_Z_MOTORS
     #define MOUNTED_FILAMENT_SENSOR
   #endif
@@ -697,7 +700,7 @@
     #define PRINTER_VOLTAGE_24
     #define MOUNTED_FILAMENT_SENSOR
     #if DISABLED(ENDER6_NOFILAMENT_SENSOR)
-      #define EZOUTV2_ENABLE
+      #define EZOUT_ENABLE
     #endif
     #define COREYX
     #define X_MOTOR_CURRENT 800
@@ -883,7 +886,7 @@
     #endif
   #endif
 
-  #if ANY(SOVOL_SV01, ENDER2_PRO)
+  #if ANY(SOVOL_SV01, SOVOL_SV03, ENDER2_PRO)
     #if ENABLED(REVERSE_E_MOTOR_DIRECTION)
       #define INVERT_E0_DIR true
     #else
@@ -948,7 +951,7 @@
 
   #define EZBOARD_V2
 
-  #if ANY(EZOUTV2_ENABLE, CR10S_STOCKFILAMENTSENSOR)
+  #if ANY(EZOUT_ENABLE, CR10S_STOCKFILAMENTSENSOR)
     #define FILAMENT_RUNOUT_SENSOR
   #endif
 
@@ -957,7 +960,7 @@
     #define FIL_RUNOUT_ENABLED_DEFAULT true // Enable the sensor on startup. Override with M412 followed by M500.
     #define NUM_RUNOUT_SENSORS   1          // Number of sensors, up to one per extruder. Define a FIL_RUNOUT#_PIN for each.
 
-    #if ENABLED(EZOUTV2_ENABLE)
+    #if ENABLED(EZOUT_ENABLE)
       #define FIL_RUNOUT_STATE LOW  // Pin state indicating that filament is NOT present.
     #else
       #define FIL_RUNOUT_STATE HIGH // Pin state indicating that filament is NOT present.
@@ -1263,7 +1266,7 @@
 
   #define EZBOARD_V2
 
-  #if ENABLED(EZOUTV2_ENABLE)
+  #if ENABLED(EZOUT_ENABLE)
     #define FILAMENT_RUNOUT_SENSOR
     #define DIRECT_DRIVE_PRINTER
   #endif
@@ -1273,7 +1276,7 @@
     #define FIL_RUNOUT_ENABLED_DEFAULT true // Enable the sensor on startup. Override with M412 followed by M500.
     #define NUM_RUNOUT_SENSORS   1          // Number of sensors, up to one per extruder. Define a FIL_RUNOUT#_PIN for each.
 
-    #if ENABLED(EZOUTV2_ENABLE)
+    #if ENABLED(EZOUT_ENABLE)
       #define FIL_RUNOUT_STATE LOW  // Pin state indicating that filament is NOT present.
     #else
       #define FIL_RUNOUT_STATE HIGH // Pin state indicating that filament is NOT present.

Board_Configs/TH3D_EZBoardV2_DIY/Firmware/Marlin/Configuration.h

@@ -186,7 +186,7 @@
 
 // Filament Sensor Options --------------------------------------------------
 // If you are using our EZOut Sensor connect to the FIL SENSOR header with the RED wire lined up with the "5V" marking by the header and uncomment the below line.
-//#define EZOUTV2_ENABLE
+//#define EZOUT_ENABLE
 
 // If you are using the Creality CR-10S Sensor connect to the FIL SENSOR header with the RED wire lined up with the "5V" marking by the header and uncomment the below line.
 //#define CR10S_STOCKFILAMENTSENSOR
@@ -595,7 +595,7 @@
 
 #define EZBOARD_V2
 
-#if ENABLED(EZOUTV2_ENABLE) || ENABLED(CR10S_STOCKFILAMENTSENSOR)
+#if ENABLED(EZOUT_ENABLE) || ENABLED(CR10S_STOCKFILAMENTSENSOR)
   #define FILAMENT_RUNOUT_SENSOR
 #endif
 
@@ -604,7 +604,7 @@
   #define FIL_RUNOUT_ENABLED_DEFAULT true // Enable the sensor on startup. Override with M412 followed by M500.
   #define NUM_RUNOUT_SENSORS   1          // Number of sensors, up to one per extruder. Define a FIL_RUNOUT#_PIN for each.
 
-  #if ENABLED(EZOUTV2_ENABLE)
+  #if ENABLED(EZOUT_ENABLE)
     #define FIL_RUNOUT_STATE LOW  // Pin state indicating that filament is NOT present.
   #else
     #define FIL_RUNOUT_STATE HIGH // Pin state indicating that filament is NOT present.

Firmware/CoreFilesChangeList.md

@@ -9,14 +9,18 @@ This does not include machine `configuration.h` or `PlatformIO.ini` files.
 - **buildroot**
 	- **share**
 		- **PlatformIO**
+			- **scripts**
+				- `generic_create_variant.py` - Add in our repo for `Arduino_Core_STM32`
 			- **variants**
 				- **MARLIN_G0B1RE**
 					- `variant_MARLIN_STM32G0B1RE.cpp` - USB Fix from BTT
 - **ini**
 	- `avr.ini`
+	- `features.ini` - Force use our repo for `SlowSoftWire`
 	- `stm32f1.ini`
 	- `stm32f1-maple.ini`
-	- `stm32f4.ini`
+	- `stm32f4.ini` - Force use our `Arduino_Core_STM32` repo for BTT Boards
+	- `stm32g0.ini` - Force use our `Arduino_Core_STM32` repo for BTT Boards
 - **Marlin**
 	- **src**
 		- **core**

Firmware/Marlin/Configuration_adv.h

@@ -1573,7 +1573,7 @@
 #endif // HAS_MARLINUI_MENU
 
 #if ANY(HAS_DISPLAY, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI)
-  //#define SOUND_MENU_ITEM   // Add a mute option to the LCD menu
+  #define SOUND_MENU_ITEM     // Add a mute option to the LCD menu
   #define SOUND_ON_DEFAULT    // Buzzer/speaker default enabled state
 #endif
 
@@ -1582,7 +1582,7 @@
   #define LCD_TIMEOUT_TO_STATUS 10000   // (ms)
 
   #if ENABLED(SHOW_BOOTSCREEN)
-    #define BOOTSCREEN_TIMEOUT 2000      // (ms) Total Duration to display the boot screen(s)
+    #define BOOTSCREEN_TIMEOUT 1000      // (ms) Total Duration to display the boot screen(s)
     #if EITHER(HAS_MARLINUI_U8GLIB, TFT_COLOR_UI)
       #define BOOT_MARLIN_LOGO_SMALL      // Show a smaller Marlin logo on the Boot Screen (saving lots of flash)
     #endif

Firmware/Marlin/Configuration_backend.h

@@ -6,8 +6,8 @@
 //======================= DO NOT MODIFY THIS FILE ===========================
 //===========================================================================
 
-#define UNIFIED_VERSION "TH3D UFW 2.79"
-#define STRING_DISTRIBUTION_DATE "10-27-2023"
+#define UNIFIED_VERSION "TH3D UFW 2.80"
+#define STRING_DISTRIBUTION_DATE "11-19-2023"
 
 /**
  * ABL Probe Settings

Firmware/Marlin/src/lcd/menu/menu_motion.cpp

@@ -419,7 +419,7 @@ void menu_motion() {
   #endif
 
   #if ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST)
-    GCODES_ITEM(MSG_M48_TEST, F("G28O\nM48 P10"));
+    GCODES_ITEM(MSG_M48_TEST, F("G28\nM48 P10"));
   #endif
 
   //

Firmware/buildroot/share/PlatformIO/scripts/generic_create_variant.py

@@ -32,7 +32,7 @@
     else:
         platform_name = PackageSpec(platform_packages[0]).name
 
-    if platform_name in [ "usb-host-msc", "usb-host-msc-cdc-msc", "usb-host-msc-cdc-msc-2", "usb-host-msc-cdc-msc-3", "tool-stm32duino", "biqu-bx-workaround", "main" ]:
+    if platform_name in [ "2", "usb-host-msc", "usb-host-msc-cdc-msc", "usb-host-msc-cdc-msc-2", "usb-host-msc-cdc-msc-3", "tool-stm32duino", "biqu-bx-workaround", "main" ]:
         platform_name = "framework-arduinoststm32"
 
     FRAMEWORK_DIR = Path(platform.get_package_dir(platform_name))

Firmware/ini/features.ini

@@ -43,7 +43,7 @@ HAS_(FSMC|SPI|LTDC)_TFT                = src_filter=+<src/HAL/STM32/tft> +<src/H
 HAS_FSMC_TFT                           = src_filter=+<src/HAL/STM32/tft/tft_fsmc.cpp> +<src/HAL/STM32F1/tft/tft_fsmc.cpp>
 HAS_SPI_TFT                            = src_filter=+<src/HAL/STM32/tft/tft_spi.cpp> +<src/HAL/STM32F1/tft/tft_spi.cpp>
 I2C_EEPROM                             = src_filter=+<src/HAL/shared/eeprom_if_i2c.cpp>
-SOFT_I2C_EEPROM                        = SlowSoftI2CMaster, SlowSoftWire=https://github.com/felias-fogg/SlowSoftWire/archive/master.zip
+SOFT_I2C_EEPROM                        = SlowSoftI2CMaster, SlowSoftWire=https://github.com/th3dstudio/SlowSoftWire/archive/1.0.zip
 SPI_EEPROM                             = src_filter=+<src/HAL/shared/eeprom_if_spi.cpp>
 HAS_DWIN_E3V2|IS_DWIN_MARLINUI         = src_filter=+<src/lcd/e3v2/common>
 DWIN_CREALITY_LCD                      = src_filter=+<src/lcd/e3v2/creality>

Firmware/ini/stm32f4.ini

@@ -694,7 +694,8 @@ upload_protocol             = stlink
 [env:STM32F401RC_btt]
 extends                     = stm32_variant
 platform                    = ststm32@~14.1.0
-platform_packages           = framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/main.zip
+platform_packages           = framework-arduinoststm32@https://github.com/th3dstudio/Arduino_Core_STM32/archive/2.7.1.zip
+                              [email protected]
 board                       = marlin_STM32F401RC
 board_build.offset          = 0x4000
 board_upload.offset_address = 0x08004000

Firmware/ini/stm32g0.ini

@@ -46,7 +46,8 @@ debug_tool                  = stlink
 [env:STM32G0B1RE_btt]
 extends                     = stm32_variant
 platform                    = ststm32@~14.1.0
-platform_packages           = framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/main.zip
+platform_packages           = framework-arduinoststm32@https://github.com/th3dstudio/Arduino_Core_STM32/archive/2.7.1.zip
+                              [email protected]
 board                       = marlin_STM32G0B1RE
 board_build.offset          = 0x2000
 board_upload.offset_address = 0x08002000