microlab
/
scube
1
1
Fork 0
Code Issues Pull Requests Releases Activity

Merge pull request #7275 from thinkyhead/bf_seen_not_volatile

Browse Source 
Volatile keyword not needed for parser.seen
2.0.x
Scott Lahteine 8 years ago committed by GitHub
parent f63f1ff12c 76e90b93b7
commit e5904c4df8
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File

6
Marlin/gcode.h
Unescape Escape View File

@ -131,8 +131,7 @@ public:
// Code seen bit was set. If not found, value_ptr is unchanged. // Code seen bit was set. If not found, value_ptr is unchanged.
// This allows "if (seen('A')||seen('B'))" to use the last-found value. // This allows "if (seen('A')||seen('B'))" to use the last-found value.
// This is volatile because its side-effects are important static bool seen(const char c) {
static volatile bool seen(const char c) {
const uint8_t ind = LETTER_OFF(c); const uint8_t ind = LETTER_OFF(c);
if (ind >= COUNT(param)) return false; // Only A-Z if (ind >= COUNT(param)) return false; // Only A-Z
const bool b = TEST(codebits[PARAM_IND(ind)], PARAM_BIT(ind)); const bool b = TEST(codebits[PARAM_IND(ind)], PARAM_BIT(ind));
@ -148,8 +147,7 @@ public:
// Code is found in the string. If not found, value_ptr is unchanged. // Code is found in the string. If not found, value_ptr is unchanged.
// This allows "if (seen('A')||seen('B'))" to use the last-found value. // This allows "if (seen('A')||seen('B'))" to use the last-found value.
// This is volatile because its side-effects are important static bool seen(const char c) {
static volatile bool seen(const char c) {
const char *p = strchr(command_args, c); const char *p = strchr(command_args, c);
const bool b = !!p; const bool b = !!p;
if (b) value_ptr = DECIMAL_SIGNED(p[1]) ? &p[1] : (char*)NULL; if (b) value_ptr = DECIMAL_SIGNED(p[1]) ? &p[1] : (char*)NULL;

Write Preview
Loading…
Cancel
Save