From 78eab4e5111fdf1763a0114f7efc08927059e17c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Suat=20=C3=96zg=C3=BCr?= Date: Wed, 24 May 2023 22:31:27 +0200 Subject: [PATCH] klicky probe initial commit --- Marlin/Configuration.h | 47 +++++++++++++++++++++++++----------------- Marlin/src/pins/pins.h | 2 +- ini/i3_mega.ini | 18 ++++++++++++++++ platformio.ini | 2 ++ 4 files changed, 49 insertions(+), 20 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 8786f3c5f9..6b8e1de01d 100755 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -1662,7 +1662,7 @@ * Use G29 repeatedly, adjusting the Z height at each point with movement commands * or (with LCD_BED_LEVELING) the LCD controller. */ -#if NONE(KNUTWURST_BLTOUCH, KNUTWURST_TFT_LEVELING) +#if NONE(KNUTWURST_BLTOUCH, KNUTWURST_TFT_LEVELING, KNUTWURST_KLICKY) #define PROBE_MANUALLY #endif @@ -1739,21 +1739,24 @@ * Magnetically Mounted Probe * For probes such as Euclid, Klicky, Klackender, etc. */ -// #define MAG_MOUNTED_PROBE -#if ENABLED(MAG_MOUNTED_PROBE) - #define PROBE_DEPLOY_FEEDRATE (133 * 60) // (mm/min) Probe deploy speed - #define PROBE_STOW_FEEDRATE (133 * 60) // (mm/min) Probe stow speed - - #define MAG_MOUNTED_DEPLOY_1 { PROBE_DEPLOY_FEEDRATE, { 245, 114, 30 } } // Move to side Dock & Attach probe - #define MAG_MOUNTED_DEPLOY_2 { PROBE_DEPLOY_FEEDRATE, { 210, 114, 30 } } // Move probe off dock - #define MAG_MOUNTED_DEPLOY_3 { PROBE_DEPLOY_FEEDRATE, { 0, 0, 0 } } // Extra move if needed - #define MAG_MOUNTED_DEPLOY_4 { PROBE_DEPLOY_FEEDRATE, { 0, 0, 0 } } // Extra move if needed - #define MAG_MOUNTED_DEPLOY_5 { PROBE_DEPLOY_FEEDRATE, { 0, 0, 0 } } // Extra move if needed - #define MAG_MOUNTED_STOW_1 { PROBE_STOW_FEEDRATE, { 245, 114, 20 } } // Move to dock - #define MAG_MOUNTED_STOW_2 { PROBE_STOW_FEEDRATE, { 245, 114, 0 } } // Place probe beside remover - #define MAG_MOUNTED_STOW_3 { PROBE_STOW_FEEDRATE, { 230, 114, 0 } } // Side move to remove probe - #define MAG_MOUNTED_STOW_4 { PROBE_STOW_FEEDRATE, { 210, 114, 20 } } // Side move to remove probe - #define MAG_MOUNTED_STOW_5 { PROBE_STOW_FEEDRATE, { 0, 0, 0 } } // Extra move if needed +#if ENABLED(KNUTWURST_KLICKY) + // @see https://www.printables.com/model/489398-anycubic-mega-klicky-probe + #define MAG_MOUNTED_PROBE + #if ENABLED(MAG_MOUNTED_PROBE) + #define PROBE_DEPLOY_FEEDRATE (133 * 60) // (mm/min) Probe deploy speed + #define PROBE_STOW_FEEDRATE (133 * 60) // (mm/min) Probe stow speed + + #define MAG_MOUNTED_DEPLOY_1 { PROBE_DEPLOY_FEEDRATE, { 176, 0, 0 } } // Move to front dock & attach probe + #define MAG_MOUNTED_DEPLOY_2 { PROBE_DEPLOY_FEEDRATE, { 176, 0, 20 } } // Move probe off dock + #define MAG_MOUNTED_DEPLOY_3 { PROBE_DEPLOY_FEEDRATE, { 0, 0, 0 } } // Extra move if needed + #define MAG_MOUNTED_DEPLOY_4 { PROBE_DEPLOY_FEEDRATE, { 0, 0, 0 } } // Extra move if needed + #define MAG_MOUNTED_DEPLOY_5 { PROBE_DEPLOY_FEEDRATE, { 0, 0, 0 } } // Extra move if needed + #define MAG_MOUNTED_STOW_1 { PROBE_STOW_FEEDRATE, { 176, 0, 20 } } // Move right above the dock + #define MAG_MOUNTED_STOW_2 { PROBE_STOW_FEEDRATE, { 176, 0, 0 } } // Move probe into dock + #define MAG_MOUNTED_STOW_3 { PROBE_STOW_FEEDRATE, { 50, 0, 0 } } // Side move to remove probe + #define MAG_MOUNTED_STOW_4 { PROBE_STOW_FEEDRATE, { 0, 0, 0 } } // Extra move if needed + #define MAG_MOUNTED_STOW_5 { PROBE_STOW_FEEDRATE, { 0, 0, 0 } } // Extra move if needed + #endif #endif // Duet Smart Effector (for delta printers) - https://bit.ly/2ul5U7J @@ -1852,7 +1855,11 @@ #define NOZZLE_TO_PROBE_OFFSET { 0, 0, -16.8 } #endif -#if NONE(KNUTWURST_BLTOUCH, KNUTWURST_TFT_LEVELING) +#if ENABLED(KNUTWURST_KLICKY) + #define NOZZLE_TO_PROBE_OFFSET { 0, -25, -7 } +#endif + +#if NONE(KNUTWURST_BLTOUCH, KNUTWURST_TFT_LEVELING, KNUTWURST_KLICKY) #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 } #endif @@ -1862,6 +1869,8 @@ #if ENABLED(KNUTWURST_CHIRON) #define PROBING_MARGIN 15 +#elseif ENABLED(KNUTWURST_KLICKY) + #define PROBING_MARGIN 20 #else #define PROBING_MARGIN 35 #endif @@ -2480,7 +2489,7 @@ * leveling in steps so you can manually adjust the Z height at each grid-point. * With an LCD controller the process is guided step-by-step. */ -#if EITHER(KNUTWURST_BLTOUCH, KNUTWURST_TFT_LEVELING) +#if ANY(KNUTWURST_BLTOUCH, KNUTWURST_TFT_LEVELING, KNUTWURST_KLICKY) // #define AUTO_BED_LEVELING_3POINT // #define AUTO_BED_LEVELING_LINEAR #define AUTO_BED_LEVELING_BILINEAR @@ -2488,7 +2497,7 @@ // #define MESH_BED_LEVELING #endif -#if NONE(KNUTWURST_BLTOUCH, KNUTWURST_TFT_LEVELING) +#if NONE(KNUTWURST_BLTOUCH, KNUTWURST_TFT_LEVELING, KNUTWURST_KLICKY) // #define AUTO_BED_LEVELING_3POINT // #define AUTO_BED_LEVELING_LINEAR // #define AUTO_BED_LEVELING_BILINEAR diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h index 8c30948dd3..f3a05e45d0 100644 --- a/Marlin/src/pins/pins.h +++ b/Marlin/src/pins/pins.h @@ -164,7 +164,7 @@ #elif MB(TRIGORILLA_13) #include "ramps/pins_TRIGORILLA_13.h" // ATmega2560 env:mega2560 #elif MB(TRIGORILLA_14, TRIGORILLA_14_11) - #include "ramps/pins_TRIGORILLA_14.h" // ATmega2560 env:mega2560 env:MEGA_1G env:MEGA_1G_TMC env:MEGA_1G_BLT_10 env:MEGA_1G_BLT_11 env:MEGA_1G_TMC_BLT_10 env:MEGA_1G_TMC_BLT_11 env:MEGA env:MEGA_TMC env:MEGA_BLT_10 env:MEGA_BLT_11 env:MEGA_TMC_BLT_10 env:MEGA_TMC_BLT_11 env:MEGA_S env:MEGA_S_TMC env:MEGA_S_BLT_10 env:MEGA_S_BLT_11 env:MEGA_S_TMC_BLT_10 env:MEGA_S_TMC_BLT_11 env:MEGA_S_DGUS env:MEGA_S_DGUS_TMC env:MEGA_S_DGUS_BLT_10 env:MEGA_S_DGUS_BLT_11 env:MEGA_S_DGUS_TMC_BLT_10 env:MEGA_S_DGUS_TMC_BLT_11 env:MEGA_X env:MEGA_X_TMC env:MEGA_X_BLT_10 env:MEGA_X_BLT_11 env:MEGA_X_TMC_BLT_10 env:MEGA_X_TMC_BLT_11 env:MEGA_X_DGUS env:MEGA_X_DGUS_TMC env:MEGA_X_DGUS_BLT_10 env:MEGA_X_DGUS_BLT_11 env:MEGA_X_DGUS_TMC_BLT_10 env:MEGA_X_DGUS_TMC_BLT_11 env:MEGA_P_DGUS env:MEGA_P_DGUS_TMC env:MEGA_P_DGUS_BLT_10 env:MEGA_P_DGUS_BLT_11 env:MEGA_P_DGUS_TMC_BLT_10 env:MEGA_P_DGUS_TMC_BLT_11 env:4MAXP2 env:4MAXP2_TMC env:4MAXP2_BLT_10 env:4MAXP2_BLT_11 env:4MAXP2_TMC_BLT_10 env:4MAXP2_TMC_BLT_11 env:4MAXP2_DGUS env:4MAXP2_DGUS_TMC env:4MAXP2_DGUS_BLT_10 env:4MAXP2_DGUS_BLT_11 env:4MAXP2_DGUS_TMC_BLT_10 env:4MAXP2_DGUS_TMC_BLT_11 + #include "ramps/pins_TRIGORILLA_14.h" // ATmega2560 env:mega2560 env:MEGA_1G env:MEGA_1G_TMC env:MEGA_1G_BLT_10 env:MEGA_1G_BLT_11 env:MEGA_1G_TMC_BLT_10 env:MEGA_1G_TMC_BLT_11 env:MEGA env:MEGA_TMC env:MEGA_TMC_KLICKY env:MEGA_BLT_10 env:MEGA_BLT_11 env:MEGA_TMC_BLT_10 env:MEGA_TMC_BLT_11 env:MEGA_S env:MEGA_S_TMC env:MEGA_S_TMC_KLICKY env:MEGA_S_BLT_10 env:MEGA_S_BLT_11 env:MEGA_S_TMC_BLT_10 env:MEGA_S_TMC_BLT_11 env:MEGA_S_DGUS env:MEGA_S_DGUS_TMC env:MEGA_S_DGUS_BLT_10 env:MEGA_S_DGUS_BLT_11 env:MEGA_S_DGUS_TMC_BLT_10 env:MEGA_S_DGUS_TMC_BLT_11 env:MEGA_X env:MEGA_X_TMC env:MEGA_X_BLT_10 env:MEGA_X_BLT_11 env:MEGA_X_TMC_BLT_10 env:MEGA_X_TMC_BLT_11 env:MEGA_X_DGUS env:MEGA_X_DGUS_TMC env:MEGA_X_DGUS_BLT_10 env:MEGA_X_DGUS_BLT_11 env:MEGA_X_DGUS_TMC_BLT_10 env:MEGA_X_DGUS_TMC_BLT_11 env:MEGA_P_DGUS env:MEGA_P_DGUS_TMC env:MEGA_P_DGUS_BLT_10 env:MEGA_P_DGUS_BLT_11 env:MEGA_P_DGUS_TMC_BLT_10 env:MEGA_P_DGUS_TMC_BLT_11 env:4MAXP2 env:4MAXP2_TMC env:4MAXP2_BLT_10 env:4MAXP2_BLT_11 env:4MAXP2_TMC_BLT_10 env:4MAXP2_TMC_BLT_11 env:4MAXP2_DGUS env:4MAXP2_DGUS_TMC env:4MAXP2_DGUS_BLT_10 env:4MAXP2_DGUS_BLT_11 env:4MAXP2_DGUS_TMC_BLT_10 env:4MAXP2_DGUS_TMC_BLT_11 #elif MB(RAMPS_ENDER_4) #include "ramps/pins_RAMPS_ENDER_4.h" // ATmega2560 env:mega2560 #elif MB(RAMPS_CREALITY) diff --git a/ini/i3_mega.ini b/ini/i3_mega.ini index 7afb458e20..db4f481476 100755 --- a/ini/i3_mega.ini +++ b/ini/i3_mega.ini @@ -79,6 +79,15 @@ build_src_filter = ${common.default_src_filter} + build_flags = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA -DKNUTWURST_TMC build_unflags = -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_DGUS2_TFT -DKNUTWURST_BLTOUCH -DKNUTWURST_ONE_Z_ENDSTOP -DKNUTWURST_CHIRON -DKNUTWURST_4MAXP2 +[env:MEGA_TMC_KLICKY] +platform = atmelavr +board = megaatmega2560 +board_build.f_cpu = 16000000L +lib_deps = ${common.lib_deps} +build_src_filter = ${common.default_src_filter} + +build_flags = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA -DKNUTWURST_TMC -DKNUTWURST_KLICKY +build_unflags = -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_DGUS2_TFT -DKNUTWURST_BLTOUCH -DKNUTWURST_ONE_Z_ENDSTOP -DKNUTWURST_CHIRON -DKNUTWURST_4MAXP2 + [env:MEGA_BLT_10] platform = atmelavr board = megaatmega2560 @@ -138,6 +147,15 @@ build_src_filter = ${common.default_src_filter} + build_flags = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_S -DKNUTWURST_TMC build_unflags = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_DGUS2_TFT -DKNUTWURST_BLTOUCH -DKNUTWURST_ONE_Z_ENDSTOP -DKNUTWURST_CHIRON -DKNUTWURST_4MAXP2 +[env:MEGA_S_TMC_KLICKY] +platform = atmelavr +board = megaatmega2560 +board_build.f_cpu = 16000000L +lib_deps = ${common.lib_deps} +build_src_filter = ${common.default_src_filter} + +build_flags = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_S -DKNUTWURST_TMC -DKNUTWURST_KLICKY +build_unflags = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_DGUS2_TFT -DKNUTWURST_BLTOUCH -DKNUTWURST_ONE_Z_ENDSTOP -DKNUTWURST_CHIRON -DKNUTWURST_4MAXP2 + [env:MEGA_S_BLT_10] platform = atmelavr board = megaatmega2560 diff --git a/platformio.ini b/platformio.ini index e9f34616f5..33be518418 100755 --- a/platformio.ini +++ b/platformio.ini @@ -27,12 +27,14 @@ default_envs = MEGA_1G_TMC_BLT_11 MEGA MEGA_TMC + MEGA_TMC_KLICKY MEGA_BLT_10 MEGA_BLT_11 MEGA_TMC_BLT_10 MEGA_TMC_BLT_11 MEGA_S MEGA_S_TMC + MEGA_S_TMC_KLICKY MEGA_S_BLT_10 MEGA_S_BLT_11 MEGA_S_TMC_BLT_10