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

Merge pull request #4062 from jbrazio/bugfix/compiler-warnings

Browse Source 
Fixes misc gcc warnings
This commit is contained in:
Scott Lahteine 2016-06-17 14:23:28 -07:00 committed by GitHub
commit f66a194159
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
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_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_per_axis_unit(int axis) { return code_value_float() / axis_unit_factor(axis); }
#else
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) { return code_value_float(); }
inline float code_value_axis_units(int axis) { UNUSED(axis); return code_value_float(); }
inline float code_value_per_axis_unit(int axis) { UNUSED(axis); return code_value_float(); }
#endif
@ -4892,7 +4892,7 @@ inline void gcode_M110() {
* M111: Set the debug level
*/
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_2[] PROGMEM = MSG_DEBUG_INFO;
@ -7415,7 +7415,7 @@ void process_next_command() {
gcode_M605();
break;
#endif // DUAL_X_CARRIAGE
#if ENABLED(LIN_ADVANCE)
case 905: // M905 Set advance factor.
gcode_M905();