SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #4276 from esenapaj/Suppress-warnings

Browse source 
Suppress warnings
This commit is contained in:
Scott Lahteine 2016-07-11 19:08:59 -07:00 committed by GitHub
commit 4865447830
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:
quickstop_stepper();
break;
default:
break;
}
state = state_RESET;
}

4
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>'
*/
inline void gcode_M421() {
int8_t px, py;
int8_t px = 0, py = 0;
float z = 0;
bool hasX, hasY, hasZ, hasI, hasJ;
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();
delay(100);
#if HAS_BUZZER
millis_t next_tick = 0;
#endif
// Wait for filament insert by user and press button
lcd_filament_change_show_message(FILAMENT_CHANGE_MESSAGE_INSERT);

12
Marlin/planner.cpp
View file

@ -397,8 +397,12 @@ void Planner::check_axes_activity() {
#endif
#if ENABLED(BARICUDA)
unsigned char tail_valve_pressure = baricuda_valve_pressure,
tail_e_to_p_pressure = baricuda_e_to_p_pressure;
#if HAS_HEATER_1
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
if (blocks_queued()) {
@ -411,9 +415,13 @@ void Planner::check_axes_activity() {
#if ENABLED(BARICUDA)
block = &block_buffer[block_buffer_tail];
#if HAS_HEATER_1
tail_valve_pressure = block->valve_pressure;
#endif
#if HAS_HEATER_2
tail_e_to_p_pressure = block->e_to_p_pressure;
#endif
#endif
for (uint8_t b = block_buffer_tail; b != block_buffer_head; b = next_block_index(b)) {
block = &block_buffer[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 (int8_t _lcdLineNr = 0; _lcdLineNr < LCD_HEIGHT; _lcdLineNr++, _menuLineNr++) { \
_thisItemNr = 0;
#define START_SCREEN() _START_SCREEN(0)
#define START_SCREEN() _START_SCREEN(NOOP)
/**
* START_MENU generates the init code for a menu function