CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[2.0.x] fix compile errors when CNC_COORDINATE_SYSTEMS is enabled (#9380)

Browse Source
This commit is contained in:
GMagician 2018-02-02 08:45:46 +01:00 committed by Scott Lahteine
parent ea9ad4e46d
commit e1117a8492
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Marlin/src/gcode/gcode.h
View File

@ -397,7 +397,6 @@ private:
#endif
#if ENABLED(CNC_COORDINATE_SYSTEMS)
bool select_coordinate_system(const int8_t _new);
static void G53();
static void G54();
static void G55();

18
Marlin/src/gcode/geometry/G53-G59.cpp
View File

@ -22,15 +22,15 @@
#include "../gcode.h"
#include "../../module/motion.h"
//#include "../../module/stepper.h"
#if ENABLED(CNC_COORDINATE_SYSTEMS)
#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 };
@ -54,7 +54,7 @@
* It precedes a movement command (or other modifiers) on the same line.
* This is the first command to use parser.chain() to make this possible.
*/
void GCodeSuite::G53() {
void GcodeSuite::G53() {
// If this command has more following...
if (parser.chain()) {
const int8_t _system = active_coordinate_system;
@ -80,11 +80,11 @@
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