Use BTT EBB32 base/common environment

... and reorder so CAN is primary
MarlinFirmware · Nov 30, 2024 · dd5a2ff · dd5a2ff
1 parent a0ce07a
commit dd5a2ff
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 19 deletions.
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
@@ -562,7 +562,7 @@
 //
 
 #elif MB(BTT_EBB42_V1_1)
-  #include "stm32g0/pins_BTT_EBB42_V1_1.h"          // STM32G0                              env:BTT_EBB42_V1_1_filament_extruder env:BTT_EBB42_V1_1_FDCAN
+  #include "stm32g0/pins_BTT_EBB42_V1_1.h"          // STM32G0                              env:BTT_EBB42_V1_1_FDCAN env:BTT_EBB42_V1_1_filament_extruder
 #elif MB(BTT_SKR_MINI_E3_V3_0)
   #include "stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h"    // STM32G0                              env:STM32G0B1RE_btt env:STM32G0B1RE_btt_xfer
 #elif MB(BTT_MANTA_E3_EZ_V1_0)

diff --git a/ini/stm32g0.ini b/ini/stm32g0.ini
@@ -26,10 +26,9 @@
 build_flags = -DPIN_WIRE_SCL=PB3 -DPIN_WIRE_SDA=PB4
 
 #
-# BigTreeTech EBB42 V1.1 (STM32G0B1CBT6 ARM Cortex-M0+)
-# This board is being used to control Filament extruders. This is not supported for 3D printing, as it has no kinematics control
+# BTT EBB32 V1.1 base
 #
-[env:BTT_EBB42_V1_1_filament_extruder]
+[BTT_EBB42_V1_1_common]
 extends                     = stm32_variant
 platform                    = [email protected]
 platform_packages           = framework-arduinoststm32@~4.20600.231001
@@ -40,25 +39,23 @@ board_upload.offset_address = 0x08000000
 build_flags                 = ${stm32_variant.build_flags} ${stm32g0_I2C2.build_flags}
                               -flto
                               -Wl,--no-warn-rwx-segment
-
-[env:BTT_EBB42_V1_1_FDCAN]
-extends                     = stm32_variant
-platform                    = [email protected]
-platform_packages           = framework-arduinoststm32@~4.20600.231001
-                              [email protected]
-
-board                       = marlin_BTT_EBB42_V1_1
-board_build.offset          = 0x0000
-board_upload.offset_address = 0x08000000
-build_flags                 = ${stm32_variant.build_flags} ${stm32g0_I2C2.build_flags}
-                              -flto
-                              -Wl,--no-warn-rwx-segment
-                              -DHAL_FDCAN_MODULE_ENABLED
-
 debug_tool                  = stlink
 upload_protocol             = dfu
 upload_command              = dfu-util -a 0 -s 0x08000000:leave -D "$SOURCE"
 
+#
+# BigTreeTech EBB42 V1.1 (STM32G0B1CBT6 ARM Cortex-M0+) as a CAN toolboard
+#
+[env:BTT_EBB42_V1_1_FDCAN]
+extends                     = BTT_EBB42_V1_1_common
+build_flags                 = -DHAL_FDCAN_MODULE_ENABLED
+
+#
+# BigTreeTech EBB42 V1.1 (STM32G0B1CBT6 ARM Cortex-M0+) as a filament extruder (no kinematics control)
+#
+[env:BTT_EBB42_V1_1_filament_extruder]
+extends                     = BTT_EBB42_V1_1_common
+
 #
 # BigTreeTech SKR Mini E3 V3.0 (STM32G0B0RET6 / STM32G0B1RET6 ARM Cortex-M0+)
 #