Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/modules/tools/atc/ATCHandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -2037,7 +2038,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);
Expand All @@ -2063,7 +2064,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
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 <key>" 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.

Expand Down