From 7cb20ccc0f3146691a4dd3cf5b9371d64c2ff4aa Mon Sep 17 00:00:00 2001
From: "alden.hart" <alden08@harts.org>
Date: Mon, 4 May 2015 20:21:38 -0400
Subject: [PATCH] 083.16 fixed message return in a blank Gcode line

---
 TinyG2/gcode_parser.cpp              | 11 ++++++-----
 TinyG2/settings/settings_othermill.h |  6 +++---
 TinyG2/tinyg2.h                      |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/TinyG2/gcode_parser.cpp b/TinyG2/gcode_parser.cpp
index 6ce46210..425f4a87 100755
--- a/TinyG2/gcode_parser.cpp
+++ b/TinyG2/gcode_parser.cpp
@@ -58,6 +58,12 @@ stat_t gcode_parser(char *block)
     uint8_t block_delete_flag;
 
 	_normalize_gcode_block(str, &com, &msg, &block_delete_flag);
+
+	// queue a "(MSG" response
+	if (*msg != NUL) {
+		(void)cm_message(msg);				// queue the message
+	}
+
     if (str[0] == NUL) {                    // normalization returned null string
         return (STAT_OK);                   // most likely a comment line
     }
@@ -72,11 +78,6 @@ stat_t gcode_parser(char *block)
 	if (block_delete_flag == true) {
 		return (STAT_NOOP);
 	}
-
-	// queue a "(MSG" response
-	if (*msg != NUL) {
-		(void)cm_message(msg);				// queue the message
-	}
 	return(_parse_gcode_block(block));
 }
 
diff --git a/TinyG2/settings/settings_othermill.h b/TinyG2/settings/settings_othermill.h
index eda03f50..29596652 100755
--- a/TinyG2/settings/settings_othermill.h
+++ b/TinyG2/settings/settings_othermill.h
@@ -81,7 +81,7 @@
 #define XIO_ENABLE_ECHO             false
 #define XIO_ENABLE_FLOW_CONTROL     FLOW_CONTROL_XON        // FLOW_CONTROL_OFF, FLOW_CONTROL_XON, FLOW_CONTROL_RTS
 
-#define JSON_VERBOSITY				JV_CONFIGS		        // one of: JV_SILENT, JV_FOOTER, JV_CONFIGS, JV_MESSAGES, JV_LINENUM, JV_VERBOSE
+#define JSON_VERBOSITY				JV_MESSAGES		        // one of: JV_SILENT, JV_FOOTER, JV_CONFIGS, JV_MESSAGES, JV_LINENUM, JV_VERBOSE
 #define JSON_SYNTAX_MODE            JSON_SYNTAX_STRICT      // one of JSON_SYNTAX_RELAXED, JSON_SYNTAX_STRICT
 
 #define QUEUE_REPORT_VERBOSITY		QR_SINGLE           // one of: QR_OFF, QR_SINGLE, QR_TRIPLE
@@ -182,8 +182,8 @@
 // *** axis settings **********************************************************************************
 
 #define JERK_MAX                    500			// 500 million mm/(min^3)
-//#define JERK_HIGH_SPEED           1000		// 1000 million mm/(min^3)		// Jerk during homing needs to stop *fast*
-#define JERK_HIGH_SPEED             2000
+#define JERK_HIGH_SPEED             1000		// 1000 million mm/(min^3)		// Jerk during homing needs to stop *fast*
+//#define JERK_HIGH_SPEED             2000
 #define LATCH_VELOCITY				25			// reeeeally slow for accuracy
 
 #define JUNCTION_DEVIATION_XY       0.01        // larger is faster
diff --git a/TinyG2/tinyg2.h b/TinyG2/tinyg2.h
index 37410bf0..871a8f35 100755
--- a/TinyG2/tinyg2.h
+++ b/TinyG2/tinyg2.h
@@ -38,7 +38,7 @@
 /****** REVISIONS ******/
 
 #ifndef TINYG_FIRMWARE_BUILD
-#define TINYG_FIRMWARE_BUILD   		083.16 // tweaks to homing touch off
+#define TINYG_FIRMWARE_BUILD   		083.16 // fixed message return in a blank Gcode line
 #endif
 
 #define TINYG_FIRMWARE_VERSION		0.98						// firmware major version