Browse Source

Fix compile issue with G38

Fixes #7250
Scott Lahteine 7 years ago
parent
commit
11c589c3ec
4 changed files with 5 additions and 5 deletions
  1. 1
    1
      .travis.yml
  2. 2
    2
      Marlin/Marlin_main.cpp
  3. 1
    1
      Marlin/gcode.cpp
  4. 1
    1
      Marlin/gcode.h

+ 1
- 1
.travis.yml View File

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

+ 2
- 2
Marlin/Marlin_main.cpp View File

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

+ 1
- 1
Marlin/gcode.cpp View File

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

+ 1
- 1
Marlin/gcode.h View File

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

Loading…
Cancel
Save