thebears/marlin_skr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Optimized string-to-number functions" (#21532)

Browse Source 
This reverts #21484
This commit is contained in:
InsanityAutomation
2021-04-04 18:35:58 -04:00
committed by GitHub
parent c4b69fcddd
commit 98b2b45264
4 changed files with 26 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Marlin/src/gcode/parser.h
View File

@@ -42,10 +42,6 @@
typedef enum : uint8_t { LINEARUNIT_MM, LINEARUNIT_INCH } LinearUnit;
#endif
int32_t parse_int32(const char *buf);
float parse_float(const char *buf);
/**
* GCode parser
*
@@ -260,12 +256,29 @@ public:
// The value as a string
static inline char* value_string() { return value_ptr; }
// Code value as float
static inline float value_float() { return value_ptr ? parse_float(value_ptr) : 0.0; }
// Float removes 'E' to prevent scientific notation interpretation
static inline float value_float() {
if (value_ptr) {
char *e = value_ptr;
for (;;) {
const char c = *e;
if (c == '\0' || c == ' ') break;
if (c == 'E' || c == 'e') {
*e = '\0';
const float ret = strtof(value_ptr, nullptr);
*e = c;
return ret;
}
++e;
}
return strtof(value_ptr, nullptr);
}
return 0;
}
// Code value as a long or ulong
static inline int32_t value_long() { return value_ptr ? parse_int32(value_ptr) : 0L; }
static inline uint32_t value_ulong() { return value_ptr ? parse_int32(value_ptr) : 0UL; }
static inline int32_t value_long() { return value_ptr ? strtol(value_ptr, nullptr, 10) : 0L; }
static inline uint32_t value_ulong() { return value_ptr ? strtoul(value_ptr, nullptr, 10) : 0UL; }
// Code value for use as time
static inline millis_t value_millis() { return value_ulong(); }