Skip to content
Snippets Groups Projects
Commit 4ecd41ef authored by Bob-the-Kuhn's avatar Bob-the-Kuhn Committed by GitHub
Browse files

Merge pull request #6915 from Bob-the-Kuhn/gcode.h-2 

gcode.h - another compile error
parents 65bd4c8c 1b41e1f6
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
Marlin/gcode.h
+ 1
− 1
View file @ 4ecd41ef
...@@ -227,7 +227,7 @@ public: ...@@ -227,7 +227,7 @@ public:
return input_temp_units == TEMPUNIT_K ? 'K' : input_temp_units == TEMPUNIT_F ? 'F' : 'C'; return input_temp_units == TEMPUNIT_K ? 'K' : input_temp_units == TEMPUNIT_F ? 'F' : 'C';
} }
FORCE_INLINE static char* temp_units_name() { FORCE_INLINE static char* temp_units_name() {
return input_temp_units == TEMPUNIT_K ? PSTR("Kelvin") : input_temp_units == TEMPUNIT_F ? PSTR("Fahrenheit") : PSTR("Celsius") return input_temp_units == TEMPUNIT_K ? PSTR("Kelvin") : input_temp_units == TEMPUNIT_F ? PSTR("Fahrenheit") : PSTR("Celsius");
} }
inline static float to_temp_units(const float &f) { inline static float to_temp_units(const float &f) {
switch (input_temp_units) { switch (input_temp_units) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment