Skip to content
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

[CURA-12362] Cheetah flavor #2198

Merged
merged 5 commits into from
Jan 23, 2025
Merged

[CURA-12362] Cheetah flavor #2198

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
24b6372
Introduce Cheetah flavor
Frederic98 Dec 18, 2024
8f5cec7
Apply clang-format
Frederic98 Dec 18, 2024
651e934
Add a rough equivalent Cheetah jerk to jump conversion for time estim…
Frederic98 Dec 19, 2024
bc7cdca
Apply clang-format
Frederic98 Dec 19, 2024
518d620
Merge branch 'main' into CURA-12362_Cheetah_flavor
HellAholic Jan 22, 2025
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
Prev Previous commit
Next Next commit
Add a rough equivalent Cheetah jerk to jump conversion for time estim… 
…ation
  • Loading branch information
@Frederic98
Frederic98 committed Dec 19, 2024
commit 651e934801651475d9fa1891a9f6e6dd4b30e051
10 changes: 9 additions & 1 deletion src/gcodeExport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1748,7 +1748,15 @@ void GCodeExport::writeJerk(const Velocity& jerk)
break;
}
current_jerk_ = jerk;
estimate_calculator_.setMaxXyJerk(jerk);

if(getFlavor() == EGCodeFlavor::CHEETAH)
{
estimate_calculator_.setMaxXyJerk(jerk/200);
}
else
{
estimate_calculator_.setMaxXyJerk(jerk);
}
}
}

Expand Down
Loading