CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add NUMERIC compare macros to simplify code

Browse Source
This commit is contained in:
Scott Lahteine 2016-03-28 03:52:49 -07:00
parent 2e4ddd5c22
commit f1ed310322
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/Marlin_main.cpp
View File

@ -1060,7 +1060,7 @@ bool code_has_value() {
while (c == ' ') c = seen_pointer[++i]; while (c == ' ') c = seen_pointer[++i];
if (c == '-' || c == '+') c = seen_pointer[++i]; if (c == '-' || c == '+') c = seen_pointer[++i];
if (c == '.') c = seen_pointer[++i]; if (c == '.') c = seen_pointer[++i];
return (c >= '0' && c <= '9'); return NUMERIC(c);
} }
float code_value() { float code_value() {
@ -6066,9 +6066,9 @@ void process_next_command() {
// - Bypass N[-0-9][0-9]*[ ]* // - Bypass N[-0-9][0-9]*[ ]*
// - Overwrite * with nul to mark the end // - Overwrite * with nul to mark the end
while (*current_command == ' ') ++current_command; while (*current_command == ' ') ++current_command;
if (*current_command == 'N' && ((current_command[1] >= '0' && current_command[1] <= '9') || current_command[1] == '-')) { if (*current_command == 'N' && NUMERIC_SIGNED(current_command[1])) {
current_command += 2; // skip N[-0-9] current_command += 2; // skip N[-0-9]
while (*current_command >= '0' && *current_command <= '9') ++current_command; // skip [0-9]* while (NUMERIC(*current_command)) ++current_command; // skip [0-9]*
while (*current_command == ' ') ++current_command; // skip [ ]* while (*current_command == ' ') ++current_command; // skip [ ]*
} }
char* starpos = strchr(current_command, '*'); // * should always be the last parameter char* starpos = strchr(current_command, '*'); // * should always be the last parameter
@ -6668,7 +6668,7 @@ void ok_to_send() {
if (*p == 'N') { if (*p == 'N') {
SERIAL_PROTOCOL(' '); SERIAL_PROTOCOL(' ');
SERIAL_ECHO(*p++); SERIAL_ECHO(*p++);
while ((*p >= '0' && *p <= '9') || *p == '-') while (NUMERIC_SIGNED(*p))
SERIAL_ECHO(*p++); SERIAL_ECHO(*p++);
} }
SERIAL_PROTOCOLPGM(" P"); SERIAL_PROTOCOL(int(BLOCK_BUFFER_SIZE - movesplanned() - 1)); SERIAL_PROTOCOLPGM(" P"); SERIAL_PROTOCOL(int(BLOCK_BUFFER_SIZE - movesplanned() - 1));

2
Marlin/macros.h
View File

@ -51,6 +51,8 @@
#define ENABLED(b) _CAT(SWITCH_ENABLED_, b) #define ENABLED(b) _CAT(SWITCH_ENABLED_, b)
#define DISABLED(b) (!_CAT(SWITCH_ENABLED_, b)) #define DISABLED(b) (!_CAT(SWITCH_ENABLED_, b))
#define NUMERIC(a) ((a) >= '0' && '9' >= (a))
#define NUMERIC_SIGNED(a) (NUMERIC(a) || (a) == '-')
#define COUNT(a) (sizeof(a)/sizeof(*a)) #define COUNT(a) (sizeof(a)/sizeof(*a))
#endif //__MACROS_H #endif //__MACROS_H