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

Make arrays for arms #175

Open
wants to merge 14 commits into
base: Maslow-Main
Choose a base branch
from
Open

Make arrays for arms #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
69835a9
make allowed frame even larger
davidelang Nov 15, 2024
73d47bd
introduce arm indexes
davidelang Nov 15, 2024
658d5c7
convert from XXZ variables to zOffset[] array
davidelang Nov 15, 2024
ca522bb
migrate anchor defintions to arrays
davidelang Nov 15, 2024
670d070
re-write many variables to arrays
davidelang Nov 15, 2024
7392012
migrate axisXX objects to axis[] array
davidelang Nov 15, 2024
ec6867e
convert measurementToXYPlane to take arm as a parameter
davidelang Nov 15, 2024
d30ba7b
collapse computeXX into a single function
davidelang Nov 15, 2024
9548d85
add per-arm belt extensions/stops
davidelang Nov 15, 2024
4d4a341
support machine variations where the arms don't move with the spindle
davidelang Nov 15, 2024
c1a4e6f
collapse retractXX() functions into a single retract(arm) function
davidelang Nov 15, 2024
e7031a4
change arm constants in header to match EncoderLine #define in code
davidelang Nov 15, 2024
6cdeabd
Merge branch 'Maslow-Main' into make_arrays_for_arms
BarbourSmith Dec 4, 2024
19911ab
Add maslow. to undefined vars
BarbourSmith Dec 4, 2024
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
32 changes: 19 additions & 13 deletions FluidNC/src/Machine/MachineConfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,26 +95,32 @@ namespace Machine {

void MachineConfig::groupM4Items(Configuration::HandlerBase& handler) {
handler.item(M+"_vertical", Maslow.orientation);
handler.item(M+"_fixedZ", Maslow.fixedZ);
handler.item(M+"_calibration_grid_width_mm_X", Maslow.calibration_grid_width_mm_X, 100, 3000);
handler.item(M+"_calibration_grid_height_mm_Y", Maslow.calibration_grid_height_mm_Y, 100, 3000);
handler.item(M+"_calibration_grid_size", Maslow.calibrationGridSize, 3, 9);

handler.item(M+"_tlX", Maslow.tlX);
handler.item(M+"_tlY", Maslow.tlY);
handler.item(M+"_tlX", Maslow.anchor[Maslow.tl][0]);
handler.item(M+"_tlY", Maslow.anchor[Maslow.tl][1]);

handler.item(M+"_trX", Maslow.trX);
handler.item(M+"_trY", Maslow.trY);
handler.item(M+"_trX", Maslow.anchor[Maslow.tr][0]);
handler.item(M+"_trY", Maslow.anchor[Maslow.tr][1]);

handler.item(M+"_blX", Maslow.blX);
handler.item(M+"_blY", Maslow.blY);
handler.item(M+"_blX", Maslow.anchor[Maslow.bl][0]);
handler.item(M+"_blY", Maslow.anchor[Maslow.bl][1]);

handler.item(M+"_brX", Maslow.brX);
handler.item(M+"_brY", Maslow.brY);

handler.item(M+"_tlZ", Maslow.tlZ);
handler.item(M+"_trZ", Maslow.trZ);
handler.item(M+"_blZ", Maslow.blZ);
handler.item(M+"_brZ", Maslow.brZ);
handler.item(M+"_brX", Maslow.anchor[Maslow.br][0]);
handler.item(M+"_brY", Maslow.anchor[Maslow.br][1]);

handler.item(M+"_tlZ", Maslow.zOffset[Maslow.tl]);
handler.item(M+"_trZ", Maslow.zOffset[Maslow.tr]);
handler.item(M+"_blZ", Maslow.zOffset[Maslow.bl]);
handler.item(M+"_brZ", Maslow.zOffset[Maslow.br]);

handler.item(M+"_tlExtension", Maslow.beltExtension[Maslow.tl]);
handler.item(M+"_trExtension", Maslow.beltExtension[Maslow.tr]);
handler.item(M+"_blExtension", Maslow.beltExtension[Maslow.bl]);
handler.item(M+"_brExtension", Maslow.beltExtension[Maslow.br]);

handler.item(M+"_Retract_Current_Threshold", Maslow.retractCurrentThreshold, 0, 3500);
handler.item(M+"_Calibration_Current_Threshold", Maslow.calibrationCurrentThreshold, 0, 3500);
Expand Down
Loading