SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Bring arc_offset into auto scope

Browse source
This commit is contained in:
Scott Lahteine 2015-05-13 19:00:46 -07:00
parent 80807b2d71
commit 8b92249f18
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Marlin/Marlin_main.cpp
View file

@ -257,7 +257,6 @@ const char errormagic[] PROGMEM = "Error:";
const char echomagic[] PROGMEM = "echo:"; const char echomagic[] PROGMEM = "echo:";
const char axis_codes[NUM_AXIS] = {'X', 'Y', 'Z', 'E'}; const char axis_codes[NUM_AXIS] = {'X', 'Y', 'Z', 'E'};
static float arc_offset[3] = { 0 };
static bool relative_mode = false; //Determines Absolute or Relative Coordinates static bool relative_mode = false; //Determines Absolute or Relative Coordinates
static char serial_char; static char serial_char;
static int serial_count = 0; static int serial_count = 0;
@ -1957,8 +1956,10 @@ inline void gcode_G2_G3(bool clockwise) {
#endif #endif
// Center of arc as offset from current_position // Center of arc as offset from current_position
arc_offset[0] = code_seen('I') ? code_value() : 0; float arc_offset[2] = {
arc_offset[1] = code_seen('J') ? code_value() : 0; code_seen('I') ? code_value() : 0,
code_seen('J') ? code_value() : 0
};
// Send an arc to the planner // Send an arc to the planner
plan_arc(destination, arc_offset, clockwise); plan_arc(destination, arc_offset, clockwise);