|
@@ -1060,7 +1060,7 @@ bool code_has_value() {
|
1060
|
1060
|
while (c == ' ') c = seen_pointer[++i];
|
1061
|
1061
|
if (c == '-' || c == '+') c = seen_pointer[++i];
|
1062
|
1062
|
if (c == '.') c = seen_pointer[++i];
|
1063
|
|
- return (c >= '0' && c <= '9');
|
|
1063
|
+ return NUMERIC(c);
|
1064
|
1064
|
}
|
1065
|
1065
|
|
1066
|
1066
|
float code_value() {
|
|
@@ -6066,9 +6066,9 @@ void process_next_command() {
|
6066
|
6066
|
// - Bypass N[-0-9][0-9]*[ ]*
|
6067
|
6067
|
// - Overwrite * with nul to mark the end
|
6068
|
6068
|
while (*current_command == ' ') ++current_command;
|
6069
|
|
- if (*current_command == 'N' && ((current_command[1] >= '0' && current_command[1] <= '9') || current_command[1] == '-')) {
|
|
6069
|
+ if (*current_command == 'N' && NUMERIC_SIGNED(current_command[1])) {
|
6070
|
6070
|
current_command += 2; // skip N[-0-9]
|
6071
|
|
- while (*current_command >= '0' && *current_command <= '9') ++current_command; // skip [0-9]*
|
|
6071
|
+ while (NUMERIC(*current_command)) ++current_command; // skip [0-9]*
|
6072
|
6072
|
while (*current_command == ' ') ++current_command; // skip [ ]*
|
6073
|
6073
|
}
|
6074
|
6074
|
char* starpos = strchr(current_command, '*'); // * should always be the last parameter
|
|
@@ -6668,7 +6668,7 @@ void ok_to_send() {
|
6668
|
6668
|
if (*p == 'N') {
|
6669
|
6669
|
SERIAL_PROTOCOL(' ');
|
6670
|
6670
|
SERIAL_ECHO(*p++);
|
6671
|
|
- while ((*p >= '0' && *p <= '9') || *p == '-')
|
|
6671
|
+ while (NUMERIC_SIGNED(*p))
|
6672
|
6672
|
SERIAL_ECHO(*p++);
|
6673
|
6673
|
}
|
6674
|
6674
|
SERIAL_PROTOCOLPGM(" P"); SERIAL_PROTOCOL(int(BLOCK_BUFFER_SIZE - movesplanned() - 1));
|