Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Store search result of HasWord() and use it in GetWordValue() to speed up #4

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Store search result of HasWord() and use it in GetWordValue() to speed up #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a9d1bf
Return false in HasWord() when letter is not a valid word
Matrixchung Nov 16, 2024
2937c5a
Store the result from HasWord(), and use it in GetWordValue()
Matrixchung Nov 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions src/GCodeParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ SOFTWARE.
void GCodeParser::Initialize()
{
lineCharCount = 0;
lastPointer = -1;
lastWord = '\0';
line[lineCharCount] = '\0';
comments = line;
lastComment = comments;
Expand Down Expand Up @@ -367,9 +369,11 @@ bool GCodeParser::HasWord(char letter)
{
return false;
}
lastPointer = pointer;
lastWord = letter;
return true;
}

return true;
return false;
}

char wordLetter[] = { 'A', 'B', 'C', 'D', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '\0' };
Expand Down Expand Up @@ -470,7 +474,14 @@ bool GCodeParser::NoWords()
/// </remarks>
double GCodeParser::GetWordValue(char letter)
{
int pointer = FindWord(letter);
int pointer = 0;
if(lastWord == letter && lastPointer >= 0) pointer = lastPointer;
else
{
pointer = FindWord(letter);
lastWord = letter;
lastPointer = pointer;
}

if (line[pointer] != '\0')
return (double)strtod(&line[pointer + 1], NULL);
Expand Down
2 changes: 2 additions & 0 deletions src/GCodeParser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ class GCodeParser
{
private:
int lineCharCount;
int lastPointer = -1;
char lastWord = '\0';

public:
char line[MAX_LINE_SIZE + 2];
Expand Down