Skip to content

Enable parameter substitution in MSG comments #587

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

Merged
merged 4 commits into from
Sep 25, 2024
Merged

Enable parameter substitution in MSG comments #587

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d480cca
Add ability to insert parameters in MSG comments
skasti Sep 25, 2024
6a04210
Respect NGC_PARAMETERS_ENABLE
skasti Sep 25, 2024
9d6f09b
Extract substitution code to a function
skasti Sep 25, 2024
94d15b4
Put functionality in NGC_EXPRESSIONS_ENABLE block
skasti Sep 25, 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
94 changes: 50 additions & 44 deletions gcode.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,6 +509,51 @@ static status_code_t read_parameter (char *line, uint_fast8_t *char_counter, flo
return status;
}

static void substitute_parameters(char *comment, char **message) {
size_t len = 0;
float value;
char *s3;
uint_fast8_t char_counter = 0;
char c = *(comment + char_counter);

// Trim leading spaces
while(*comment == ' ')
comment++;

// Calculate length of substituted string
while((c = comment[char_counter++])) {
if(c == '#') {
char_counter--;
if(read_parameter(comment, &char_counter, &value) == Status_OK)
len += strlen(trim_float(ftoa(value, ngc_float_decimals())));
else
len += 3; // "N/A"
} else
len++;
}

// Perform substitution
if((s3 = *message = malloc(len + 1))) {

*s3 = '\0';
char_counter = 0;

while((c = comment[char_counter++])) {
if(c == '#') {
char_counter--;
if(read_parameter(comment, &char_counter, &value) == Status_OK)
strcat(s3, trim_float(ftoa(value, ngc_float_decimals())));
else
strcat(s3, "N/A");
s3 = strchr(s3, '\0');
} else {
*s3++ = c;
*s3 = '\0';
}
}
}
}

#endif // NGC_EXPRESSIONS_ENABLE

#if NGC_PARAMETERS_ENABLE
Expand Down Expand Up @@ -596,63 +641,24 @@ char *gc_normalize_block (char *block, char **message)

if(message && *message == NULL && !strncmp(comment, "(MSG,", 5) && (*message = malloc(len))) {
comment += 5;
// Trim leading spaces
#if NGC_EXPRESSIONS_ENABLE
substitute_parameters(comment, message);
#else
while(*comment == ' ') {
comment++;
len--;
}
memcpy(*message, comment, len);
#endif
}

#if NGC_EXPRESSIONS_ENABLE
// Debug message string substitution
if(message && *message == NULL && !strncmp(comment, "(DEBUG,", 7)) {

if(settings.flags.ngc_debug_out) {

float value;
char *s3;
uint_fast8_t char_counter = 0;

len = 0;
comment += 7;

// Trim leading spaces
while(*comment == ' ')
comment++;

// Calculate length of substituted string
while((c = comment[char_counter++])) {
if(c == '#') {
char_counter--;
if(read_parameter(comment, &char_counter, &value) == Status_OK)
len += strlen(trim_float(ftoa(value, ngc_float_decimals())));
else
len += 3; // "N/A"
} else
len++;
}

// Perform substitution
if((s3 = *message = malloc(len + 1))) {

*s3 = '\0';
char_counter = 0;

while((c = comment[char_counter++])) {
if(c == '#') {
char_counter--;
if(read_parameter(comment, &char_counter, &value) == Status_OK)
strcat(s3, trim_float(ftoa(value, ngc_float_decimals())));
else
strcat(s3, "N/A");
s3 = strchr(s3, '\0');
} else {
*s3++ = c;
*s3 = '\0';
}
}
}
substitute_parameters(comment, message);
}

*comment = '\0'; // Do not generate grbl.on_gcode_comment event!
Expand Down