andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

gcode.h - another compile error
pull/1/head
Bob-the-Kuhn 8 years ago
committed by GitHub
parent
65bd4c8c94 1b41e1f645
commit
4ecd41ef90
1 changed files with 1 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Marlin/gcode.h

2
Marlin/gcode.h
View File

@ -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) {

Write Preview
Loading…
Cancel
Save