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

Suppress warnings

Browse Source
This commit is contained in:
esenapaj 2016-04-30 18:51:18 +09:00
parent 6121c9018a
commit 58177a1602
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/MarlinSerial.cpp
View File

@ -542,6 +542,8 @@ MarlinSerial customizedSerial;
case state_M410: case state_M410:
quickstop_stepper(); quickstop_stepper();
break; break;
default:
break;
} }
state = state_RESET; state = state_RESET;
} }

6
Marlin/Marlin_main.cpp
View File

@ -5965,7 +5965,7 @@ void quickstop_stepper() {
* Use either 'M421 X<linear> Y<linear> Z<linear>' or 'M421 I<xindex> J<yindex> Z<linear>' * Use either 'M421 X<linear> Y<linear> Z<linear>' or 'M421 I<xindex> J<yindex> Z<linear>'
*/ */
inline void gcode_M421() { inline void gcode_M421() {
int8_t px, py; int8_t px = 0, py = 0;
float z = 0; float z = 0;
bool hasX, hasY, hasZ, hasI, hasJ; bool hasX, hasY, hasZ, hasI, hasJ;
if ((hasX = code_seen('X'))) px = mbl.probe_index_x(code_value_axis_units(X_AXIS)); if ((hasX = code_seen('X'))) px = mbl.probe_index_x(code_value_axis_units(X_AXIS));
@ -6210,7 +6210,9 @@ inline void gcode_M503() {
disable_e3(); disable_e3();
delay(100); delay(100);
millis_t next_tick = 0; #if HAS_BUZZER
millis_t next_tick = 0;
#endif
// Wait for filament insert by user and press button // Wait for filament insert by user and press button
lcd_filament_change_show_message(FILAMENT_CHANGE_MESSAGE_INSERT); lcd_filament_change_show_message(FILAMENT_CHANGE_MESSAGE_INSERT);

16
Marlin/planner.cpp
View File

@ -397,8 +397,12 @@ void Planner::check_axes_activity() {
#endif #endif
#if ENABLED(BARICUDA) #if ENABLED(BARICUDA)
unsigned char tail_valve_pressure = baricuda_valve_pressure, #if HAS_HEATER_1
tail_e_to_p_pressure = baricuda_e_to_p_pressure; unsigned char tail_valve_pressure = baricuda_valve_pressure;
#endif
#if HAS_HEATER_2
unsigned char tail_e_to_p_pressure = baricuda_e_to_p_pressure;
#endif
#endif #endif
if (blocks_queued()) { if (blocks_queued()) {
@ -411,8 +415,12 @@ void Planner::check_axes_activity() {
#if ENABLED(BARICUDA) #if ENABLED(BARICUDA)
block = &block_buffer[block_buffer_tail]; block = &block_buffer[block_buffer_tail];
tail_valve_pressure = block->valve_pressure; #if HAS_HEATER_1
tail_e_to_p_pressure = block->e_to_p_pressure; tail_valve_pressure = block->valve_pressure;
#endif
#if HAS_HEATER_2
tail_e_to_p_pressure = block->e_to_p_pressure;
#endif
#endif #endif
for (uint8_t b = block_buffer_tail; b != block_buffer_head; b = next_block_index(b)) { for (uint8_t b = block_buffer_tail; b != block_buffer_head; b = next_block_index(b)) {

2
Marlin/ultralcd.cpp
View File

@ -230,7 +230,7 @@ uint8_t lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; // Set when the LCD needs to
for (uint8_t _drawLineNr = 0; _drawLineNr < LCD_HEIGHT; _drawLineNr++, _lineNr++) { \ for (uint8_t _drawLineNr = 0; _drawLineNr < LCD_HEIGHT; _drawLineNr++, _lineNr++) { \
_menuItemNr = 0; _menuItemNr = 0;
#define START_SCREEN() _START_SCREEN(0) #define START_SCREEN() _START_SCREEN(NOOP)
/** /**
* START_MENU generates the init code for a menu function * START_MENU generates the init code for a menu function