|
|
@ -24,13 +24,14 @@ |
|
|
|
#include "../../module/motion.h" |
|
|
|
|
|
|
|
#if ENABLED(CNC_COORDINATE_SYSTEMS) |
|
|
|
#include "../../module/stepper.h" |
|
|
|
|
|
|
|
/**
|
|
|
|
#include "../../module/stepper.h" |
|
|
|
|
|
|
|
/**
|
|
|
|
* Select a coordinate system and update the workspace offset. |
|
|
|
* System index -1 is used to specify machine-native. |
|
|
|
*/ |
|
|
|
bool GcodeSuite::select_coordinate_system(const int8_t _new) { |
|
|
|
bool GcodeSuite::select_coordinate_system(const int8_t _new) { |
|
|
|
if (active_coordinate_system == _new) return false; |
|
|
|
stepper.synchronize(); |
|
|
|
float old_offset[XYZ] = { 0 }, new_offset[XYZ] = { 0 }; |
|
|
@ -47,9 +48,9 @@ |
|
|
|
} |
|
|
|
} |
|
|
|
return true; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* G53: Apply native workspace to the current move |
|
|
|
* |
|
|
|
* In CNC G-code G53 is a modifier. |
|
|
@ -58,16 +59,16 @@ |
|
|
|
* |
|
|
|
* Marlin also uses G53 on a line by itself to go back to native space. |
|
|
|
*/ |
|
|
|
inline void gcode_G53() { |
|
|
|
inline void GcodeSuite::G53() { |
|
|
|
const int8_t _system = active_coordinate_system; |
|
|
|
active_coordinate_system = -1; |
|
|
|
if (parser.chain()) { // If this command has more following...
|
|
|
|
process_parsed_command(); |
|
|
|
active_coordinate_system = _system; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* G54-G59.3: Select a new workspace |
|
|
|
* |
|
|
|
* A workspace is an XYZ offset to the machine native space. |
|
|
@ -76,18 +77,18 @@ |
|
|
|
* |
|
|
|
* G92 is used to set the current workspace's offset. |
|
|
|
*/ |
|
|
|
void G54_59(uint8_t subcode=0) { |
|
|
|
void G54_59(uint8_t subcode=0) { |
|
|
|
const int8_t _space = parser.codenum - 54 + subcode; |
|
|
|
if (gcode.select_coordinate_system(_space)) { |
|
|
|
SERIAL_PROTOCOLLNPAIR("Select workspace ", _space); |
|
|
|
report_current_position(); |
|
|
|
} |
|
|
|
} |
|
|
|
void GcodeSuite::G54() { G54_59(); } |
|
|
|
void GcodeSuite::G55() { G54_59(); } |
|
|
|
void GcodeSuite::G56() { G54_59(); } |
|
|
|
void GcodeSuite::G57() { G54_59(); } |
|
|
|
void GcodeSuite::G58() { G54_59(); } |
|
|
|
void GcodeSuite::G59() { G54_59(parser.subcode); } |
|
|
|
} |
|
|
|
void GcodeSuite::G54() { G54_59(); } |
|
|
|
void GcodeSuite::G55() { G54_59(); } |
|
|
|
void GcodeSuite::G56() { G54_59(); } |
|
|
|
void GcodeSuite::G57() { G54_59(); } |
|
|
|
void GcodeSuite::G58() { G54_59(); } |
|
|
|
void GcodeSuite::G59() { G54_59(parser.subcode); } |
|
|
|
|
|
|
|
#endif // CNC_COORDINATE_SYSTEMS
|
|
|
|