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.

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

4th axis for grbl Mega #21

Open
wants to merge 5 commits into
base: edge
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Fix G10 for 4th axis A
  • Loading branch information
dguerizec committed May 17, 2017
commit 7e10c437c469b35f642de9d318494c3ccad15882
1 change: 1 addition & 0 deletions grbl/gcode.c
Original file line number Diff line number Diff line change
Expand Up @@ -528,6 +528,7 @@ uint8_t gc_execute_line(char *line)
else { coord_select = gc_block.modal.coord_select; } // Index P0 as the active coordinate system

// NOTE: Store parameter data in IJK values. By rule, they are not in use with this command.
// FIXME: Instead of IJK, we'd better use: float vector[N_AXIS]; // [DG]
if (!settings_read_coord_data(coord_select,gc_block.values.ijk)) { FAIL(STATUS_SETTING_READ_FAIL); } // [EEPROM read fail]

// Pre-calculate the coordinate data changes.
Expand Down
2 changes: 1 addition & 1 deletion grbl/gcode.h
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ typedef struct {

typedef struct {
float f; // Feed
float ijk[3]; // I,J,K Axis arc offsets
float ijk[N_AXIS]; // I,J,K Axis arc offsets
uint8_t l; // G10 or canned cycles parameters
int32_t n; // Line number
float p; // G10 or dwell parameters
Expand Down