bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Fix some compiler warnings

Browse Source
This commit is contained in:
Scott Lahteine 2017-05-27 16:42:56 -05:00
parent 33279a1e02
commit 493f0b0c62
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Marlin/Marlin_main.cpp
View File

@ -5746,9 +5746,9 @@ inline void gcode_M17() {
static bool sd_print_paused = false; static bool sd_print_paused = false;
#endif #endif
static void filament_change_beep(const int max_beep_count, const bool init=false) { static void filament_change_beep(const int8_t max_beep_count, const bool init=false) {
static millis_t next_buzz = 0; static millis_t next_buzz = 0;
static uint16_t runout_beep = 0; static int8_t runout_beep = 0;
if (init) next_buzz = runout_beep = 0; if (init) next_buzz = runout_beep = 0;
@ -5762,8 +5762,9 @@ inline void gcode_M17() {
} }
} }
static bool pause_print(const float& retract, const float& z_lift, const float& x_pos, const float& y_pos, static bool pause_print(const float &retract, const float &z_lift, const float &x_pos, const float &y_pos,
const float& unload_length = 0 , int max_beep_count = 0, bool show_lcd = false) { const float &unload_length = 0 , int8_t max_beep_count = 0, bool show_lcd = false
) {
if (move_away_flag) return false; // already paused if (move_away_flag) return false; // already paused
if (!DEBUGGING(DRYRUN) && thermalManager.tooColdToExtrude(active_extruder) && unload_length > 0) { if (!DEBUGGING(DRYRUN) && thermalManager.tooColdToExtrude(active_extruder) && unload_length > 0) {
@ -5772,8 +5773,6 @@ inline void gcode_M17() {
return false; return false;
} }
const bool job_running = print_job_timer.isRunning();
// Indicate that the printer is paused // Indicate that the printer is paused
move_away_flag = true; move_away_flag = true;
@ -5857,7 +5856,7 @@ inline void gcode_M17() {
return true; return true;
} }
static void wait_for_filament_reload(int max_beep_count = 0) { static void wait_for_filament_reload(int8_t max_beep_count = 0) {
bool nozzle_timed_out = false; bool nozzle_timed_out = false;
// Wait for filament insert by user and press button // Wait for filament insert by user and press button
@ -5882,7 +5881,7 @@ inline void gcode_M17() {
KEEPALIVE_STATE(IN_HANDLER); KEEPALIVE_STATE(IN_HANDLER);
} }
static void resume_print(const float& load_length = 0, const float& initial_extrude_length = 0, int max_beep_count = 0) { static void resume_print(const float& load_length = 0, const float& initial_extrude_length = 0, int8_t max_beep_count = 0) {
bool nozzle_timed_out = false; bool nozzle_timed_out = false;
if (!move_away_flag) return; if (!move_away_flag) return;