josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2010 from mkbel/fix_warnings 

Fix warnings
This commit is contained in:
DRracer 2019-07-16 18:24:00 +02:00 committed by GitHub
parent 8b806f692e 3e292fd6b0
commit 498141b9fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Firmware/Marlin.h
View File

@ -173,14 +173,14 @@ void manage_inactivity(bool ignore_stepper_queue=false);
#endif #endif
#ifdef PSU_Delta #ifdef PSU_Delta
void init_force_z(); void init_force_z();
void check_force_z(); void check_force_z();
#undef disable_z() #undef disable_z
#define disable_z() disable_force_z() #define disable_z() disable_force_z()
void disable_force_z(); void disable_force_z();
#undef enable_disable_z() #undef enable_z
#define enable_z() enable_force_z() #define enable_z() enable_force_z()
void enable_force_z(); void enable_force_z();
#endif // PSU_Delta #endif // PSU_Delta

7
Firmware/tmc2130.cpp
View File

@ -142,8 +142,11 @@ uint16_t __tcoolthrs(uint8_t axis)
} }
return 0; return 0;
} }
#ifdef PSU_Delta
void tmc2130_init(bool bSupressFlag=false) void tmc2130_init(bool bSupressFlag)
#else
void tmc2130_init()
#endif
{ {
// DBG(_n("tmc2130_init(), mode=%S\n"), tmc2130_mode?_n("STEALTH"):_n("NORMAL")); // DBG(_n("tmc2130_init(), mode=%S\n"), tmc2130_mode?_n("STEALTH"):_n("NORMAL"));
WRITE(X_TMC2130_CS, HIGH); WRITE(X_TMC2130_CS, HIGH);

4
Firmware/tmc2130.h
View File

@ -51,7 +51,11 @@ typedef struct
extern tmc2130_chopper_config_t tmc2130_chopper_config[4]; extern tmc2130_chopper_config_t tmc2130_chopper_config[4];
//initialize tmc2130 //initialize tmc2130
#ifdef PSU_Delta
extern void tmc2130_init(bool bSupressFlag=false); extern void tmc2130_init(bool bSupressFlag=false);
#else
extern void tmc2130_init();
#endif
//check diag pins (called from stepper isr) //check diag pins (called from stepper isr)
extern void tmc2130_st_isr(); extern void tmc2130_st_isr();
//update stall guard (called from st_synchronize inside the loop) //update stall guard (called from st_synchronize inside the loop)

15
Firmware/util.cpp
View File

@ -393,6 +393,9 @@ switch(oCheckMode)
lcd_show_fullscreen_message_and_wait_P(_i("Nozzle diameter doesn't match! Print is aborted, press the knob.")); lcd_show_fullscreen_message_and_wait_P(_i("Nozzle diameter doesn't match! Print is aborted, press the knob."));
lcd_print_stop(); lcd_print_stop();
break; break;
case ClCheckMode::_None:
case ClCheckMode::_Undef:
break;
} }
bSettings=false; // flag ('fake parameter') for 'lcd_checking_menu()' function bSettings=false; // flag ('fake parameter') for 'lcd_checking_menu()' function
menu_submenu(lcd_checking_menu); menu_submenu(lcd_checking_menu);
@ -419,6 +422,9 @@ switch(oCheckModel)
lcd_show_fullscreen_message_and_wait_P(_i("Printer model doesn't match! Print is aborted, press the knob.")); lcd_show_fullscreen_message_and_wait_P(_i("Printer model doesn't match! Print is aborted, press the knob."));
lcd_print_stop(); lcd_print_stop();
break; break;
case ClCheckModel::_None:
case ClCheckModel::_Undef:
break;
} }
} }
@ -462,6 +468,9 @@ switch(oCheckVersion)
lcd_show_fullscreen_message_and_wait_P(_i("FW version doesn't match! Print is aborted, press the knob.")); lcd_show_fullscreen_message_and_wait_P(_i("FW version doesn't match! Print is aborted, press the knob."));
lcd_print_stop(); lcd_print_stop();
break; break;
case ClCheckVersion::_None:
case ClCheckVersion::_Undef:
break;
} }
} }
@ -488,6 +497,9 @@ switch(oCheckGcode)
lcd_show_fullscreen_message_and_wait_P(_i("G-code level doesn't match! Print is aborted, press the knob.")); lcd_show_fullscreen_message_and_wait_P(_i("G-code level doesn't match! Print is aborted, press the knob."));
lcd_print_stop(); lcd_print_stop();
break; break;
case ClCheckGcode::_None:
case ClCheckGcode::_Undef:
break;
} }
} }
@ -547,6 +559,9 @@ switch(oCheckModel)
lcd_show_fullscreen_message_and_wait_P(_i("Printer model doesn't match! Print is aborted, press the knob.")); lcd_show_fullscreen_message_and_wait_P(_i("Printer model doesn't match! Print is aborted, press the knob."));
lcd_print_stop(); lcd_print_stop();
break; break;
case ClCheckModel::_None:
case ClCheckModel::_Undef:
break;
} }
} }