MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Fixes misc gcc warnings

Browse Source
This commit is contained in:
João Brázio 2016-06-16 19:24:11 +01:00
parent 52ac2a62ee
commit d1e5dc6319
No known key found for this signature in database
GPG Key ID: F62CFD37DFFDB540
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/Marlin_main.cpp
View File

@ -1244,14 +1244,14 @@ inline bool code_value_bool() { return code_value_byte() > 0; }
} }
inline float code_value_linear_units() { return code_value_float() * linear_unit_factor; } inline float code_value_linear_units() { return code_value_float() * linear_unit_factor; }
inline float code_value_per_axis_unit(int axis) { return code_value_float() / axis_unit_factor(axis); }
inline float code_value_axis_units(int axis) { return code_value_float() * axis_unit_factor(axis); } inline float code_value_axis_units(int axis) { return code_value_float() * axis_unit_factor(axis); }
inline float code_value_per_axis_unit(int axis) { return code_value_float() / axis_unit_factor(axis); }
#else #else
inline float code_value_linear_units() { return code_value_float(); } inline float code_value_linear_units() { return code_value_float(); }
inline float code_value_per_axis_unit(int axis) { return code_value_float(); } inline float code_value_axis_units(int axis) { UNUSED(axis); return code_value_float(); }
inline float code_value_axis_units(int axis) { return code_value_float(); } inline float code_value_per_axis_unit(int axis) { UNUSED(axis); return code_value_float(); }
#endif #endif
@ -4892,7 +4892,7 @@ inline void gcode_M110() {
* M111: Set the debug level * M111: Set the debug level
*/ */
inline void gcode_M111() { inline void gcode_M111() {
marlin_debug_flags = code_seen('S') ? code_value_byte() : DEBUG_NONE; marlin_debug_flags = code_seen('S') ? code_value_byte() : (uint8_t) DEBUG_NONE;
const static char str_debug_1[] PROGMEM = MSG_DEBUG_ECHO; const static char str_debug_1[] PROGMEM = MSG_DEBUG_ECHO;
const static char str_debug_2[] PROGMEM = MSG_DEBUG_INFO; const static char str_debug_2[] PROGMEM = MSG_DEBUG_INFO;