Skip to content

Fixed manual toolchanges before play #272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
WARIO2412 merged 3 commits into from
Mar 7, 2026
Merged

Fixed manual toolchanges before play #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
33dfeed
Fixed the laser mode on the Carvera Air with ATC mod
WARIO2412 Mar 7, 2026
68378e8
Fixed manual toolchanges prior to playing a file with an atc
WARIO2412 Mar 7, 2026
a8b80ab
version.txt
WARIO2412 Mar 7, 2026
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
28 changes: 20 additions & 8 deletions src/modules/tools/atc/ATCHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1993,7 +1993,7 @@ void ATCHandler::on_gcode_received(void *argument)
THEKERNEL->set_halt_reason(ATC_TOOL_INVALID);
gcode->stream->printf("ALARM: Tool T%d not defined in tool slots\r\n", new_tool);
} else if (new_tool != active_tool) {
if (new_tool > -1 && THEKERNEL->get_laser_mode()) {
if (new_tool > -1 && THEKERNEL->get_laser_mode() && CARVERA == THEKERNEL->factory_set->MachineModel) {
THEKERNEL->streams->printf("ALARM: Can not do ATC in laser mode!\n");
return;
}
Expand Down Expand Up @@ -2581,13 +2581,25 @@ void ATCHandler::on_gcode_received(void *argument)

if(THEKERNEL->factory_set->FuncSetting & (1<<2)) //ATC
{
if (active_tool > 0 && active_tool < 999990) {
// drop current tool
int old_tool = active_tool;
// change to probe tool
this->fill_drop_scripts(old_tool);
}
this->fill_pick_scripts(0, active_tool <= 0);
//drop current tool
if (this->active_tool >= this->lowest_tool_number && (this->is_custom_tool_defined(this->active_tool) || this->active_tool <= this->tool_number)){ //drop atc tool
THEKERNEL->streams->printf("Start dropping current tool: T%d\r\n", this->active_tool);
// just drop tool
this->fill_drop_scripts(active_tool);
}else if((this->active_tool > this->tool_number || this->active_tool < this->lowest_tool_number) && !this->is_custom_tool_defined(this->active_tool) && this->active_tool != -1){ //drop manual tool
THEKERNEL->streams->printf("Start manually dropping current tool: T%d\r\n", this->active_tool);
this->target_tool = -1;
if (CARVERA == THEKERNEL->factory_set->MachineModel){
this->fill_change_scripts(-1, true, active_tool, true);
}else{
this->fill_change_scripts(-1, true, active_tool, false);
}
}
if (CARVERA == THEKERNEL->factory_set->MachineModel) {
this->fill_pick_scripts(0, active_tool <= 0);
}else{
this->fill_change_scripts(0, true);
}
this->fill_cali_scripts(true, false);
}
else //Manual Tool Change
Expand Down
2 changes: 2 additions & 0 deletions version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
- Fixed: comparison of integer expressions of different signedness
- Fixed: wait_us could run into issues if the value given is less than zero. Now ignores times less than 0
- Fixed: "!" is not filtered anymore when not at the beginning of the line. This enables configuration of inverted pins over the config-set command. (e.g. config-set sd atc.detector.detect_pin 0.21!^)
- Fixed: Manual toolchanges after starting a file on an atc machine should work correctly now
- Fixed: Changing to the laser on an air with an atc works now
- 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
Expand Down