Add all 4MAX hardware combinations. BLTouch Versions are disabled in …

…prebuild, but can be selected and compiled manually if desired.
heinrichWeichert · Nov 6, 2021 · 3669004 · 3669004
1 parent 35ea849
commit 3669004
Show file tree

Hide file tree

Showing 3 changed files with 143 additions and 14 deletions.
diff --git a/.github/workflows/build-all.yml b/.github/workflows/build-all.yml
@@ -77,12 +77,22 @@ jobs:
          - CHIRON_DGUS_TMC
          - 4MAX
          - 4MAX_TMC
-         - 4MAX_BLT
-         - 4MAX_TMC_BLT
+         - 4MAX_BLT_10
+         - 4MAX_BLT_11
+         - 4MAX_TMC_BLT_10
+         - 4MAX_TMC_BLT_11
          - 4MAXP2
          - 4MAXP2_TMC
-         - 4MAXP2_BLT
-         - 4MAXP2_TMC_BLT
+         - 4MAXP2_BLT_10
+         - 4MAXP2_BLT_11
+         - 4MAXP2_TMC_BLT_10
+         - 4MAXP2_TMC_BLT_11
+         - 4MAXP2_DGUS
+         - 4MAXP2_DGUS_TMC
+         - 4MAXP2_DGUS_BLT_10
+         - 4MAXP2_DGUS_BLT_11
+         - 4MAXP2_DGUS_TMC_BLT_10
+         - 4MAXP2_DGUS_TMC_BLT_11
 
     steps:
 

diff --git a/ini/i3_mega.ini b/ini/i3_mega.ini
@@ -530,7 +530,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 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]
+[env:4MAX_BLT_10]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -540,8 +540,18 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 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_BLT_11]
+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} +<src/HAL/AVR>
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -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]
+[env:4MAX_TMC_BLT_10]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -551,6 +561,16 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 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
 
+[env:4MAX_TMC_BLT_11]
+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} +<src/HAL/AVR>
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -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
+
 
 #
 #  4MAX Pro 2.0
@@ -563,11 +583,80 @@ 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} +<src/HAL/AVR>
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_4MAXP2 -DKNUTWURST_ONE_Z_ENDSTOP
+build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_P -DKNUTWURST_MEGA_X -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH -DKNUTWURST_CHIRON -DKNUTWURST_4MAX -DKNUTWURST_BMG -DKNUTWURST_DGUS2_TFT
+
+[env:4MAXP2_TMC]
+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} +<src/HAL/AVR>
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_4MAXP2 -DKNUTWURST_ONE_Z_ENDSTOP -DKNUTWURST_TMC
+build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_P -DKNUTWURST_MEGA_X -DKNUTWURST_BLTOUCH -DKNUTWURST_CHIRON -DKNUTWURST_4MAX -DKNUTWURST_BMG -DKNUTWURST_DGUS2_TFT 
+
+[env:4MAXP2_BLT_10]
+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} +<src/HAL/AVR>
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_4MAXP2 -DKNUTWURST_ONE_Z_ENDSTOP -DKNUTWURST_BLTOUCH
+build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_P -DKNUTWURST_MEGA_X -DKNUTWURST_TMC -DKNUTWURST_CHIRON -DKNUTWURST_4MAX -DKNUTWURST_BMG -DKNUTWURST_DGUS2_TFT 
+
+[env:4MAXP2_BLT_11]
+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} +<src/HAL/AVR>
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -DKNUTWURST_4MAXP2 -DKNUTWURST_ONE_Z_ENDSTOP -DKNUTWURST_BLTOUCH
+build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_P -DKNUTWURST_MEGA_X -DKNUTWURST_TMC -DKNUTWURST_CHIRON -DKNUTWURST_4MAX -DKNUTWURST_BMG -DKNUTWURST_DGUS2_TFT
+
+
+[env:4MAXP2_TMC_BLT_10]
+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} +<src/HAL/AVR>
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_4MAXP2 -DKNUTWURST_ONE_Z_ENDSTOP -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH
+build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_P -DKNUTWURST_MEGA_X -DKNUTWURST_CHIRON -DKNUTWURST_4MAX -DKNUTWURST_BMG -DKNUTWURST_DGUS2_TFT
+
+[env:4MAXP2_TMC_BLT_11]
+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} +<src/HAL/AVR>
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -DKNUTWURST_4MAXP2 -DKNUTWURST_ONE_Z_ENDSTOP -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH
+build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_P -DKNUTWURST_MEGA_X -DKNUTWURST_CHIRON -DKNUTWURST_4MAX -DKNUTWURST_BMG -DKNUTWURST_DGUS2_TFT 
+
+
+
+
+
+
+
+
+
+
+[env:4MAXP2_DGUS]
+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} +<src/HAL/AVR>
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_4MAXP2 -DKNUTWURST_ONE_Z_ENDSTOP -DKNUTWURST_DGUS2_TFT
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_P -DKNUTWURST_MEGA_X -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH -DKNUTWURST_CHIRON -DKNUTWURST_4MAX -DKNUTWURST_BMG
 
-
-[env:4MAXP2_TMC]
+[env:4MAXP2_DGUS_TMC]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -577,7 +666,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 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]
+[env:4MAXP2_DGUS_BLT_10]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -587,8 +676,18 @@ src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 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_DGUS_BLT_11]
+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} +<src/HAL/AVR>
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -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]
+[env:4MAXP2_DGUS_TMC_BLT_10]
 platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
@@ -597,3 +696,13 @@ lib_deps          = ${common.lib_deps}
 src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 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
+
+[env:4MAXP2_DGUS_TMC_BLT_11]
+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} +<src/HAL/AVR>
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -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
@@ -63,12 +63,22 @@ default_envs =
   CHIRON_DGUS_TMC
   4MAX
   4MAX_TMC
-  4MAX_BLT
-  4MAX_TMC_BLT
+  #4MAX_BLT_10
+  #4MAX_BLT_11
+  #4MAX_TMC_BLT_10
+  #4MAX_TMC_BLT_11
   4MAXP2
   4MAXP2_TMC
-  4MAXP2_BLT
-  4MAXP2_TMC_BLT
+  #4MAXP2_BLT_10
+  #4MAXP2_BLT_11
+  #4MAXP2_TMC_BLT_10
+  #4MAXP2_TMC_BLT_11
+  4MAXP2_DGUS
+  4MAXP2_DGUS_TMC
+  #4MAXP2_DGUS_BLT_10
+  #4MAXP2_DGUS_BLT_11
+  #4MAXP2_DGUS_TMC_BLT_10
+  #4MAXP2_DGUS_TMC_BLT_11
 
 
 #