3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1099 from mkbel/fix_compiler_warnings

Browse source 
Fix compiler warnings
This commit is contained in:
PavelSindler 2018-09-05 16:53:51 +02:00 committed by GitHub
commit ed43913c5c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Firmware/mmu.cpp
View file

@ -467,13 +467,11 @@ void mmu_M600_wait_and_beep() {
void mmu_M600_load_filament(bool automatic) void mmu_M600_load_filament(bool automatic)
{ {
//load filament for mmu v2 //load filament for mmu v2
bool yes = false;
tmp_extruder = mmu_extruder; tmp_extruder = mmu_extruder;
if (!automatic) { if (!automatic) {
#ifdef MMU_M600_SWITCH_EXTRUDER #ifdef MMU_M600_SWITCH_EXTRUDER
yes = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Do you want to switch extruder?"), false); bool yes = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Do you want to switch extruder?"), false);
if(yes) tmp_extruder = choose_extruder_menu(); if(yes) tmp_extruder = choose_extruder_menu();
else tmp_extruder = mmu_extruder;
#endif //MMU_M600_SWITCH_EXTRUDER #endif //MMU_M600_SWITCH_EXTRUDER
} }
else { else {

7
Firmware/ultralcd.cpp
View file

@ -482,12 +482,10 @@ void lcdui_print_temp(char type, int val_current, int val_target)
// Print Z-coordinate (8 chars total) // Print Z-coordinate (8 chars total)
void lcdui_print_Z_coord(void) void lcdui_print_Z_coord(void)
{ {
int chars = 8;
if (custom_message_type == CUSTOM_MSG_TYPE_MESHBL) if (custom_message_type == CUSTOM_MSG_TYPE_MESHBL)
lcd_puts_P(_N("Z --- ")); lcd_puts_P(_N("Z --- "));
else else
chars = lcd_printf_P(_N("Z%6.2f "), current_position[Z_AXIS]); lcd_printf_P(_N("Z%6.2f "), current_position[Z_AXIS]);
// lcd_space(8 - chars);
} }
#ifdef PLANNER_DIAGNOSTICS #ifdef PLANNER_DIAGNOSTICS
@ -527,8 +525,7 @@ void lcdui_print_percent_done(void)
char per[4]; char per[4];
bool num = IS_SD_PRINTING || (PRINTER_ACTIVE && (print_percent_done_normal != PRINT_PERCENT_DONE_INIT)); bool num = IS_SD_PRINTING || (PRINTER_ACTIVE && (print_percent_done_normal != PRINT_PERCENT_DONE_INIT));
sprintf_P(per, num?_N("%3hhd"):_N("---"), calc_percent_done()); sprintf_P(per, num?_N("%3hhd"):_N("---"), calc_percent_done());
int chars = lcd_printf_P(_N("%3S%3s%%"), src, per); lcd_printf_P(_N("%3S%3s%%"), src, per);
// lcd_space(7 - chars);
} }
// Print extruder status (5 chars total) // Print extruder status (5 chars total)