From 2ebfe3b4b45a33a704242daa9f24444f2556dfa9 Mon Sep 17 00:00:00 2001 From: WARIO2412 Date: Mon, 9 Mar 2026 00:12:50 +0100 Subject: [PATCH 1/2] R parameter for M6 toolchange to repeat TLO (only for manual toolchanges) --- src/modules/tools/atc/ATCHandler.cpp | 4 ++-- version.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/tools/atc/ATCHandler.cpp b/src/modules/tools/atc/ATCHandler.cpp index 599d225a..a5174c73 100644 --- a/src/modules/tools/atc/ATCHandler.cpp +++ b/src/modules/tools/atc/ATCHandler.cpp @@ -2037,7 +2037,7 @@ void ATCHandler::on_gcode_received(void *argument) this->fill_change_scripts(new_tool, true, -1, false, custom_TLO); if (auto_calibrate){ - this->fill_cali_scripts((new_tool == 0 || new_tool >= 999990), true); + this->fill_cali_scripts((new_tool == 0 || new_tool >= 999990), true, repeat_count); } }else if(new_tool >= 0 && (this->is_custom_tool_defined(new_tool) || new_tool <= this->tool_number)){ //standard ATC THEKERNEL->streams->printf("Start picking new tool: T%d\r\n", new_tool); @@ -2063,7 +2063,7 @@ void ATCHandler::on_gcode_received(void *argument) // Set TLO calibration flag to disable 3D probe crash detection bool tlo_calibrating = true; PublicData::set_value( zprobe_checksum, set_tlo_calibrating_checksum, &tlo_calibrating ); - this->fill_cali_scripts(new_tool == 0 || new_tool >= 999990, true); + this->fill_cali_scripts(new_tool == 0 || new_tool >= 999990, true, repeat_count); } } else //Manual Tool Change for AIR diff --git a/version.txt b/version.txt index ab422d8f..1b784154 100644 --- a/version.txt +++ b/version.txt @@ -19,7 +19,7 @@ - Change: added -Slow parameter to windows powershell build script to improve readability of error logs as the cost of speed. - Change: removed register specifiers in LPC1768 and mbded libraries used by the project. register has been depreciated for a long time and now falls back to being completely ignored. Looked for library updates first, they haven't been updated. - Enhancement: New config setting "zprobe.three_axis_probe_tlo_correction" allows the user to correct for tlo measurement inaccuracies -- Enhancement: New "R" Parameter for M491 to repeat TLO measurement and find the lowest cutting edge on a facemill. The user has to rotate the face mill between cycles +- Enhancement: New "R" Parameter for M491 and M6 to repeat TLO measurement and find the lowest cutting edge on a facemill. The user has to rotate the face mill between cycles - Enhancement: New "config-delete sd " command that allows to delete a config setting from the config.txt. It's intended to be used when cleaning up the config.txt or when config keys got misspelled. - Enhancement: New config setting "atc.detector.enable" allows to disable the tool laser sensor. From 04d2a3dd5d3a259f3c44f9a0090fa59f3ec813fa Mon Sep 17 00:00:00 2001 From: WARIO2412 Date: Mon, 9 Mar 2026 00:22:39 +0100 Subject: [PATCH 2/2] missing variable --- src/modules/tools/atc/ATCHandler.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/tools/atc/ATCHandler.cpp b/src/modules/tools/atc/ATCHandler.cpp index a5174c73..0fae0f58 100644 --- a/src/modules/tools/atc/ATCHandler.cpp +++ b/src/modules/tools/atc/ATCHandler.cpp @@ -1967,6 +1967,7 @@ void ATCHandler::on_gcode_received(void *argument) this->probe_oneoff_y = 0.0; this->probe_oneoff_z = 0.0; this->probe_oneoff_configured = false; + uint8_t repeat_count = 1; if (gcode->has_letter('X')) { this->probe_oneoff_x = gcode->get_value('X');