Added ParseLine(char* gCode)

Author: tgolla

GCodeParserVs/GCodeParserUnitTests/GCodeParserUnitTests.cpp

@@ -373,6 +373,14 @@ namespace GCodeParserUnitTests
 				pointer++;
 				Assert::AreEqual(GCode.comments[pointer], resultComments8[pointer]);
 			} while (GCode.comments[pointer] != '\0');
+
+			GCode.ParseLine("G00 X0 Y3200;Comment");
+
+			pointer = -1;
+			do {
+				pointer++;
+				Assert::AreEqual(GCode.comments[pointer], resultComments9[pointer]);
+			} while (GCode.comments[pointer] != '\0');
 		}
 
 		TEST_METHOD(ParseLine_ConfirmLastComment)
@@ -487,6 +495,14 @@ namespace GCodeParserUnitTests
 				pointer++;
 				Assert::AreEqual(GCode.lastComment[pointer], resultLastComment8[pointer]);
 			} while (GCode.lastComment[pointer] != '\0');
+
+			GCode.ParseLine("/G21 (Block ;Delete) G90 ;MSG,123(?)");
+
+			pointer = -1;
+			do {
+				pointer++;
+				Assert::AreEqual(GCode.lastComment[pointer], resultLastComment4[pointer]);
+			} while (GCode.lastComment[pointer] != '\0');
 		}
 
 		TEST_METHOD(ParseLine_ConfirmBlockDelete)
@@ -534,11 +550,20 @@ namespace GCodeParserUnitTests
 			GCode.ParseLine();
 
 			Assert::AreEqual(GCode.blockDelete, false);
+
 			startAt = AddLine(&GCode, startAt);
 
 			GCode.ParseLine();
 
 			Assert::AreEqual(GCode.blockDelete, false);
+
+			GCode.ParseLine("/M300 ;Block Delete");
+
+			Assert::AreEqual(GCode.blockDelete, true);
+
+			GCode.ParseLine("M300 ;Block Delete");
+
+			Assert::AreEqual(GCode.blockDelete, false);
 		}
 
 		TEST_METHOD(ParseLine_ConfirmBeginEnd)
@@ -598,6 +623,14 @@ namespace GCodeParserUnitTests
 			GCode.ParseLine();
 
 			Assert::AreEqual(GCode.beginEnd, true);
+
+			GCode.ParseLine("%");
+
+			Assert::AreEqual(GCode.beginEnd, true);
+
+			GCode.ParseLine("G00 X20 Y20");
+
+			Assert::AreEqual(GCode.beginEnd, false);
 		}
 
 		TEST_METHOD(ParseLine_ConfirmNoWords)
@@ -657,6 +690,14 @@ namespace GCodeParserUnitTests
 			GCode.ParseLine();
 
 			Assert::AreEqual(GCode.NoWords(), true);
+
+			GCode.ParseLine("zf00^dsa&f%df; Comment");
+
+			Assert::AreEqual(GCode.NoWords(), true);
+
+			GCode.ParseLine("M300 ;Comment");
+
+			Assert::AreEqual(GCode.NoWords(), false);
 		}
 
 		TEST_METHOD(RemoveCommentSeparators_ConfirmComments)

README.md

@@ -67,14 +67,20 @@ The GetWordValue returns the value that follows the word character provided. If
 ### `HasWord(char letter)`
 The HasWord method returns a Boolean true if the word (letter followed by value). The method does test to confirm the character provided is a valid G-Code word.
 
+### `Initialize()`
+The Initialize method is call when the class in initialized and each time a new line is detected in `AddCharToLine(char c)`. If using the same instance of the GCodeParser with multiple files you may need to manually execute the method.
+
 ### `IsWord(char letter)`
 The IsWord method returns a Boolean true if the character provided represents a valid G-Code word.
 
 ### `NoWords()`
 The NoWords method returns a Boolean the if the line is blank and/or has no G-Code words.
 
 ### `ParseLine()`
-The ParseLine method parses the command line removing whitespace and comments. The method should be used after the AddCharToLine method returns true.
+The ParseLine method parses the command line removing whitespace and comments. The method should be used after the `AddCharToLine` method returns true.
+
+### `ParseLine(char* gCode)`
+The ParseLine method when passed g-code parses the command line passed removing whitespace and comments. The method is an alternative to first using the `AddCharToLine` method to build a line.
 
 ### `RemoveCommentSeparators()`
 The RemoveCommentSeparators removes the comment separators (parenthesis or semicolon) from of the comments. The method should be used after the command line is parsed.

library.properties

@@ -1,5 +1,5 @@
 name=GCodeParser
-version=1.2.1
+version=1.3.0
 author=Terence F. Golla tfg@terencegolla.com
 maintainer=Terence F. Golla tfg@terencegolla.com
 sentence=The GCodeParser library is a lightweight G-Code parser for the Arduino using only a single character buffer to first collect a line of code (also called a 'block') from a serial or file input and then parse that line into a code block and comments.

src/GCodeParser.cpp

@@ -88,6 +88,25 @@ bool GCodeParser::AddCharToLine(char c)
 	return completeLineIsAvailableToParse;
 }
 
+/// <summary>
+/// Parses the line passed removing spaces, tabs and comments. Comments are shifted to the end of the line buffer.
+/// </summary>
+void GCodeParser::ParseLine(char* gCode)
+{
+	Initialize();
+
+  int pointer = 0;
+  while (gCode[pointer] != '\0')
+  {
+	  AddCharToLine(gCode[pointer]);
+	  pointer = pointer + 1;
+  }
+  	
+  AddCharToLine('\n');
+  ParseLine();
+}
+
+
 /// <summary>
 /// Parses the line removing spaces, tabs and comments. Comments are shifted to the end of the line buffer.
 /// </summary>

src/GCodeParser.h

@@ -64,6 +64,7 @@ class GCodeParser
 	GCodeParser();
 	bool AddCharToLine(char c);
 	void ParseLine();
+	void ParseLine(char* gCode);
 	void RemoveCommentSeparators();
 
 	int FindWord(char letter);