From 62479aabd08362cab23c036d6216ec0e7c2175f6 Mon Sep 17 00:00:00 2001 From: Knutwurst <36196269+knutwurst@users.noreply.github.com> Date: Fri, 5 Nov 2021 10:32:15 +0100 Subject: [PATCH] Add 4MAX BLTouch build environments. --- Marlin/src/inc/Version.h | 4 ++-- ini/i3_mega.ini | 41 ++++++++++++++++++++++++++++++++++++++++ platformio.ini | 5 +++++ 3 files changed, 48 insertions(+), 2 deletions(-) diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h index 5ffdf2dc..cf611160 100755 --- a/Marlin/src/inc/Version.h +++ b/Marlin/src/inc/Version.h @@ -41,10 +41,10 @@ * here we define this default string as the date where the latest release * version was tagged. */ - #define CUSTOM_BUILD_VERSION "1.4.0-b2" + #define CUSTOM_BUILD_VERSION "1.4.0-b3" #ifndef STRING_DISTRIBUTION_DATE - #define STRING_DISTRIBUTION_DATE "2021-11-03" + #define STRING_DISTRIBUTION_DATE "2021-11-05" #endif /** diff --git a/ini/i3_mega.ini b/ini/i3_mega.ini index e19295f3..c22aa5af 100755 --- a/ini/i3_mega.ini +++ b/ini/i3_mega.ini @@ -530,6 +530,26 @@ src_filter = ${common.default_src_filter} + build_flags = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_4MAX -DKNUTWURST_ONE_Z_ENDSTOP -DKNUTWURST_TMC build_unflags = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_P -DKNUTWURST_MEGA_X -DKNUTWURST_BLTOUCH -DKNUTWURST_CHIRON -DKNUTWURST_4MAXP2 -DKNUTWURST_BMG -DKNUTWURST_DGUS2_TFT +[env:4MAX_BLT] +platform = atmelavr +board = megaatmega2560 +board_build.f_cpu = 16000000L +lib_deps = ${common.lib_deps} + TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip +src_filter = ${common.default_src_filter} + +build_flags = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_4MAX -DKNUTWURST_ONE_Z_ENDSTOP -DKNUTWURST_BLTOUCH +build_unflags = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_P -DKNUTWURST_MEGA_X -DKNUTWURST_TMC -DKNUTWURST_CHIRON -DKNUTWURST_4MAXP2 -DKNUTWURST_BMG -DKNUTWURST_DGUS2_TFT + + +[env:4MAX_TMC_BLT] +platform = atmelavr +board = megaatmega2560 +board_build.f_cpu = 16000000L +lib_deps = ${common.lib_deps} + TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip +src_filter = ${common.default_src_filter} + +build_flags = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_4MAX -DKNUTWURST_ONE_Z_ENDSTOP -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH +build_unflags = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_P -DKNUTWURST_MEGA_X -DKNUTWURST_CHIRON -DKNUTWURST_4MAXP2 -DKNUTWURST_BMG -DKNUTWURST_DGUS2_TFT # @@ -556,3 +576,24 @@ lib_deps = ${common.lib_deps} src_filter = ${common.default_src_filter} + build_flags = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_4MAXP2 -DKNUTWURST_ONE_Z_ENDSTOP -DKNUTWURST_TMC -DKNUTWURST_DGUS2_TFT build_unflags = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_P -DKNUTWURST_MEGA_X -DKNUTWURST_BLTOUCH -DKNUTWURST_CHIRON -DKNUTWURST_4MAX -DKNUTWURST_BMG + +[env:4MAXP2_BLT] +platform = atmelavr +board = megaatmega2560 +board_build.f_cpu = 16000000L +lib_deps = ${common.lib_deps} + TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip +src_filter = ${common.default_src_filter} + +build_flags = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_4MAXP2 -DKNUTWURST_ONE_Z_ENDSTOP -DKNUTWURST_DGUS2_TFT -DKNUTWURST_BLTOUCH +build_unflags = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_P -DKNUTWURST_MEGA_X -DKNUTWURST_TMC -DKNUTWURST_CHIRON -DKNUTWURST_4MAX -DKNUTWURST_BMG + + +[env:4MAXP2_TMC_BLT] +platform = atmelavr +board = megaatmega2560 +board_build.f_cpu = 16000000L +lib_deps = ${common.lib_deps} + TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip +src_filter = ${common.default_src_filter} + +build_flags = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_4MAXP2 -DKNUTWURST_ONE_Z_ENDSTOP -DKNUTWURST_TMC -DKNUTWURST_DGUS2_TFT -DKNUTWURST_BLTOUCH +build_unflags = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_P -DKNUTWURST_MEGA_X -DKNUTWURST_CHIRON -DKNUTWURST_4MAX -DKNUTWURST_BMG diff --git a/platformio.ini b/platformio.ini index b5ce8aea..2a8416df 100755 --- a/platformio.ini +++ b/platformio.ini @@ -63,8 +63,13 @@ default_envs = CHIRON_DGUS_TMC 4MAX 4MAX_TMC + 4MAX_BLT + 4MAX_TMC_BLT 4MAXP2 4MAXP2_TMC + 4MAXP2_BLT + 4MAXP2_TMC_BLT + # # The 'common' section applies to most Marlin builds.