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

Fix compilation warnings, errors (#14704)

Browse source
This commit is contained in:
Marcio Teixeira 2019-07-22 19:08:54 -06:00 committed by Scott Lahteine
parent a589456a14
commit 369fb2806d
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/HAL/HAL_DUE/Servo_Due.cpp
View file

@ -137,7 +137,7 @@ void initISR(timer16_Sequence_t timer) {
#endif #endif
} }
void finISR(timer16_Sequence_t timer) { void finISR(timer16_Sequence_t) {
#ifdef _useTimer1 #ifdef _useTimer1
TC_Stop(TC_FOR_TIMER1, CHANNEL_FOR_TIMER1); TC_Stop(TC_FOR_TIMER1, CHANNEL_FOR_TIMER1);
#endif #endif

2
Marlin/src/core/language.h
View file

@ -37,7 +37,7 @@
// NOTE: IF YOU CHANGE LANGUAGE FILES OR MERGE A FILE WITH CHANGES // NOTE: IF YOU CHANGE LANGUAGE FILES OR MERGE A FILE WITH CHANGES
// //
// ==> ALWAYS TRY TO COMPILE MARLIN WITH/WITHOUT "ULTIPANEL" / "ULTRALCD" / "SDSUPPORT" #define IN "Configuration.h" // ==> ALWAYS TRY TO COMPILE MARLIN WITH/WITHOUT "ULTIPANEL" / "ULTRA_LCD" / "SDSUPPORT" #define IN "Configuration.h"
// ==> ALSO TRY ALL AVAILABLE LANGUAGE OPTIONS // ==> ALSO TRY ALL AVAILABLE LANGUAGE OPTIONS
// See also http://marlinfw.org/docs/development/lcd_language.html // See also http://marlinfw.org/docs/development/lcd_language.html

6
Marlin/src/lcd/ultralcd.cpp
View file

@ -538,7 +538,7 @@ void MarlinUI::status_screen() {
return; return;
} }
#endif // HAS_LCD_MENU #endif
#if ENABLED(ULTIPANEL_FEEDMULTIPLY) #if ENABLED(ULTIPANEL_FEEDMULTIPLY)
@ -802,7 +802,9 @@ void MarlinUI::update() {
card.release(); card.release();
if (old_sd_status != 2) { if (old_sd_status != 2) {
set_status_P(PSTR(MSG_SD_REMOVED)); set_status_P(PSTR(MSG_SD_REMOVED));
if (!on_status_screen()) return_to_status(); #if HAS_LCD_MENU
return_to_status();
#endif
} }
} }

3
Marlin/src/module/tool_change.cpp
View file

@ -770,8 +770,6 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
if (new_tool == active_extruder) return; if (new_tool == active_extruder) return;
#endif #endif
const uint8_t old_tool = active_extruder;
#if ENABLED(MIXING_EXTRUDER) #if ENABLED(MIXING_EXTRUDER)
UNUSED(no_move); UNUSED(no_move);
@ -824,6 +822,7 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
constexpr bool idex_full_control = false; constexpr bool idex_full_control = false;
#endif #endif
const uint8_t old_tool = active_extruder;
const bool can_move_away = !no_move && !idex_full_control; const bool can_move_away = !no_move && !idex_full_control;
#if ENABLED(TOOLCHANGE_FILAMENT_SWAP) #if ENABLED(TOOLCHANGE_FILAMENT_SWAP)