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

Merge pull request #1584 from mkbel/fix_compiler__warning

Browse Source 
Fix compiler warnings
This commit is contained in:
PavelSindler 2019-03-04 15:29:05 +01:00 committed by GitHub
commit bb683f0ba1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Firmware/timer02.c
View File

@ -157,12 +157,12 @@ void delay2(unsigned long ms)
} }
} }
void tone2(uint8_t _pin, unsigned int frequency/*, unsigned long duration*/) void tone2(__attribute__((unused)) uint8_t _pin, __attribute__((unused)) unsigned int frequency/*, unsigned long duration*/)
{ {
PIN_SET(BEEPER); PIN_SET(BEEPER);
} }
void noTone2(uint8_t _pin) void noTone2(__attribute__((unused)) uint8_t _pin)
{ {
PIN_CLR(BEEPER); PIN_CLR(BEEPER);
} }

33
Firmware/ultralcd.cpp
View File

@ -186,7 +186,9 @@ static bool lcd_selftest_manual_fan_check(int _fan, bool check_opposite);
#ifdef FANCHECK #ifdef FANCHECK
static bool lcd_selftest_fan_dialog(int _fan); static bool lcd_selftest_fan_dialog(int _fan);
#endif //FANCHECK #endif //FANCHECK
#ifdef PAT9125
static bool lcd_selftest_fsensor(); static bool lcd_selftest_fsensor();
#endif //PAT9125
static bool selftest_irsensor(); static bool selftest_irsensor();
static void lcd_selftest_error(int _error_no, const char *_error_1, const char *_error_2); static void lcd_selftest_error(int _error_no, const char *_error_1, const char *_error_2);
static void lcd_colorprint_change(); static void lcd_colorprint_change();
@ -2342,7 +2344,8 @@ switch(eFilamentAction)
lcd_puts_P(_i("to unload filament")); ////MSG_ c=20 r=1 lcd_puts_P(_i("to unload filament")); ////MSG_ c=20 r=1
break; break;
case e_FILAMENT_ACTION_mmuEject: case e_FILAMENT_ACTION_mmuEject:
lcd_puts_P(_i("to eject filament")); ////MSG_ c=20 r=1 case e_FILAMENT_ACTION_mmuCut:
case e_FILAMENT_ACTION_none:
break; break;
} }
if(lcd_clicked()) if(lcd_clicked())
@ -2356,38 +2359,23 @@ if(lcd_clicked())
menu_back(nLevel); menu_back(nLevel);
switch(eFilamentAction) switch(eFilamentAction)
{ {
case e_FILAMENT_ACTION_Load:
case e_FILAMENT_ACTION_autoLoad: case e_FILAMENT_ACTION_autoLoad:
eFilamentAction=e_FILAMENT_ACTION_none; // i.e. non-autoLoad
// no break
case e_FILAMENT_ACTION_Load:
loading_flag=true; loading_flag=true;
enquecommand_P(PSTR("M701")); // load filament enquecommand_P(PSTR("M701")); // load filament
break; break;
case e_FILAMENT_ACTION_unLoad: case e_FILAMENT_ACTION_unLoad:
enquecommand_P(PSTR("M702")); // unload filament enquecommand_P(PSTR("M702")); // unload filament
break; break;
/*
case e_FILAMENT_ACTION_mmuLoad: case e_FILAMENT_ACTION_mmuLoad:
//./ MYSERIAL.println("mFilamentPrompt - mmuLoad");
bFilamentAction=true;
menu_submenu(mmu_load_to_nozzle_menu);
break;
*/
/*
case e_FILAMENT_ACTION_mmuUnLoad: case e_FILAMENT_ACTION_mmuUnLoad:
//./ MYSERIAL.println("mFilamentPrompt - mmuUnLoad");
bFilamentAction=true;
extr_unload();
break;
*/
/*
case e_FILAMENT_ACTION_mmuEject: case e_FILAMENT_ACTION_mmuEject:
MYSERIAL.println("mFilamentPrompt - mmuEject"); case e_FILAMENT_ACTION_mmuCut:
bFilamentAction=true; case e_FILAMENT_ACTION_none:
// menu_submenu(mmu_fil_eject_menu);
break; break;
*/
} }
if(eFilamentAction==e_FILAMENT_ACTION_autoLoad)
eFilamentAction=e_FILAMENT_ACTION_none; // i.e. non-autoLoad
} }
} }
@ -4035,7 +4023,6 @@ static void lcd_print_state(uint8_t state)
static void lcd_show_sensors_state() static void lcd_show_sensors_state()
{ {
//0: N/A; 1: OFF; 2: ON //0: N/A; 1: OFF; 2: ON
uint8_t chars = 0;
uint8_t pinda_state = STATE_NA; uint8_t pinda_state = STATE_NA;
uint8_t finda_state = STATE_NA; uint8_t finda_state = STATE_NA;
uint8_t idler_state = STATE_NA; uint8_t idler_state = STATE_NA;
@ -7495,6 +7482,7 @@ static void lcd_selftest_error(int _error_no, const char *_error_1, const char *
} }
#ifdef FILAMENT_SENSOR #ifdef FILAMENT_SENSOR
#ifdef PAT9125
static bool lcd_selftest_fsensor(void) static bool lcd_selftest_fsensor(void)
{ {
fsensor_init(); fsensor_init();
@ -7504,6 +7492,7 @@ static bool lcd_selftest_fsensor(void)
} }
return (!fsensor_not_responding); return (!fsensor_not_responding);
} }
#endif //PAT9125
//! @brief Self-test of infrared barrier filament sensor mounted on MK3S with MMUv2 printer //! @brief Self-test of infrared barrier filament sensor mounted on MK3S with MMUv2 printer
//! //!