Browse Source

Fix compile issue with G38

Fixes #7250
pull/1/head
Scott Lahteine 7 years ago
parent
commit
11c589c3ec
  1. 2
      .travis.yml
  2. 4
      Marlin/Marlin_main.cpp
  3. 2
      Marlin/gcode.cpp
  4. 2
      Marlin/gcode.h

2
.travis.yml

@ -109,7 +109,7 @@ script:
- restore_configs
- opt_enable NUM_SERVOS Z_ENDSTOP_SERVO_NR Z_SERVO_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE
- opt_enable AUTO_BED_LEVELING_3POINT DEBUG_LEVELING_FEATURE EEPROM_SETTINGS EEPROM_CHITCHAT
- opt_enable_adv EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES AUTOTEMP
- opt_enable_adv EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES AUTOTEMP G38_PROBE_TARGET
- build_marlin
#
# Test MESH_BED_LEVELING feature, with LCD

4
Marlin/Marlin_main.cpp

@ -10528,8 +10528,8 @@ void process_next_command() {
#if ENABLED(G38_PROBE_TARGET)
case 38: // G38.2 & G38.3
if (subcode == 2 || subcode == 3)
gcode_G38(subcode == 2);
if (parser.subcode == 2 || parser.subcode == 3)
gcode_G38(parser.subcode == 2);
break;
#endif

2
Marlin/gcode.cpp

@ -46,7 +46,7 @@ char *GCodeParser::command_ptr,
char GCodeParser::command_letter;
int GCodeParser::codenum;
#if USE_GCODE_SUBCODES
int GCodeParser::subcode;
uint8_t GCodeParser::subcode;
#endif
#if ENABLED(FASTER_GCODE_PARSER)

2
Marlin/gcode.h

@ -91,7 +91,7 @@ public:
static char command_letter; // G, M, or T
static int codenum; // 123
#if USE_GCODE_SUBCODES
static int subcode; // .1
static uint8_t subcode; // .1
#endif
#if ENABLED(DEBUG_GCODE_PARSER)

Loading…
Cancel
Save