Changed gcode_parser.h to code.h in anticipation of moving Gcode state into it.

g2core/config_app.cpp

@@ -30,7 +30,7 @@
 #include "config.h"  // #2
 #include "controller.h"
 #include "canonical_machine.h"
-#include "gcode_parser.h"
+#include "gcode.h"
 #include "json_parser.h"
 #include "text_parser.h"
 #include "settings.h"

g2core/controller.cpp

@@ -31,7 +31,7 @@
 #include "controller.h"
 #include "json_parser.h"
 #include "text_parser.h"
-#include "gcode_parser.h"
+#include "gcode.h"
 #include "canonical_machine.h"
 #include "plan_arc.h"
 #include "planner.h"

g2core/g2core.cppproj

@@ -1782,7 +1782,7 @@
     <Compile Include="gcode_parser.cpp">
       <SubType>compile</SubType>
     </Compile>
-    <Compile Include="gcode_parser.h">
+    <Compile Include="gcode.h">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="gpio.cpp">

g2core/gcode.h

@@ -1,5 +1,5 @@
 /*
- * gcode_parser.h - rs274/ngc Gcode parser
+ * gcode.h - rs274/ngc Gcode model and parser support
  * This file is part of the g2core project
  *
  * Copyright (c) 2010 - 2016 Alden S. Hart, Jr.
@@ -17,8 +17,8 @@
  * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef GCODE_PARSER_H_ONCE
-#define GCODE_PARSER_H_ONCE
+#ifndef GCODE_H_ONCE
+#define GCODE_H_ONCE
 
 /*
  * Global Scope Functions
@@ -27,4 +27,4 @@ stat_t gcode_parser(char* block);
 stat_t gc_get_gc(nvObj_t* nv);
 stat_t gc_run_gc(nvObj_t* nv);
 
-#endif  // End of include guard: GCODE_PARSER_H_ONCE
+#endif  // End of include guard: GCODE_H_ONCE

g2core/gcode_parser.cpp

@@ -20,7 +20,7 @@
 #include "g2core.h"  // #1
 #include "config.h"  // #2
 #include "controller.h"
-#include "gcode_parser.h"
+#include "gcode.h"
 #include "canonical_machine.h"
 #include "spindle.h"
 #include "coolant.h"

g2core/plan_arc.cpp

@@ -136,7 +136,7 @@ stat_t cm_arc_feed(const float target[], const bool target_f[],     // target en
 
     // trap missing feed rate
     if (fp_ZERO(cm->gm.feed_rate)) {
-        return (STAT_GCODE_FEEDRATE_NOT_SPECIFIED);
+        return (STAT_FEEDRATE_NOT_SPECIFIED);
     }
 
     // Set the arc plane for the current G17/G18/G19 setting and test arc specification
@@ -154,7 +154,7 @@ stat_t cm_arc_feed(const float target[], const bool target_f[],     // target en
         arc.plane_axis_1 = AXIS_Z;
         arc.linear_axis  = AXIS_X;
     } else {
-        return(cm_panic(STAT_GCODE_ACTIVE_PLANE_IS_MISSING, "cm_arc_feed() impossible value")); // plane axis has impossible value
+        return(cm_panic(STAT_ACTIVE_PLANE_IS_MISSING, "cm_arc_feed() impossible value")); // plane axis has impossible value
     }
 
     // test if no endpoints are specified in the selected plane

g2core/settings/settings_makeblock.h

@@ -52,7 +52,7 @@
 
 // Communications and reporting settings
 
-#define USB_SERIAL_PORTS_EXPOSED   2        // Valid options are 1 or 2, only!
+#define USB_SERIAL_PORTS_EXPOSED   1        // Valid options are 1 or 2, only!
 #define COMM_MODE JSON_MODE                 // one of: TEXT_MODE, JSON_MODE
 
 #define TEXT_VERBOSITY TV_VERBOSE           // one of: TV_SILENT, TV_VERBOSE