Browse Source

Fix compilation warnings, errors (#14704)

Marcio Teixeira 5 years ago
parent
commit
369fb2806d

+ 1
- 1
Marlin/src/HAL/HAL_DUE/Servo_Due.cpp View File

@@ -137,7 +137,7 @@ void initISR(timer16_Sequence_t timer) {
137 137
   #endif
138 138
 }
139 139
 
140
-void finISR(timer16_Sequence_t timer) {
140
+void finISR(timer16_Sequence_t) {
141 141
   #ifdef _useTimer1
142 142
     TC_Stop(TC_FOR_TIMER1, CHANNEL_FOR_TIMER1);
143 143
   #endif

+ 1
- 1
Marlin/src/core/language.h View File

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

+ 4
- 2
Marlin/src/lcd/ultralcd.cpp View File

@@ -538,7 +538,7 @@ void MarlinUI::status_screen() {
538 538
       return;
539 539
     }
540 540
 
541
-  #endif // HAS_LCD_MENU
541
+  #endif
542 542
 
543 543
   #if ENABLED(ULTIPANEL_FEEDMULTIPLY)
544 544
 
@@ -802,7 +802,9 @@ void MarlinUI::update() {
802 802
           card.release();
803 803
           if (old_sd_status != 2) {
804 804
             set_status_P(PSTR(MSG_SD_REMOVED));
805
-            if (!on_status_screen()) return_to_status();
805
+            #if HAS_LCD_MENU
806
+              return_to_status();
807
+            #endif
806 808
           }
807 809
         }
808 810
 

+ 1
- 2
Marlin/src/module/tool_change.cpp View File

@@ -770,8 +770,6 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
770 770
     if (new_tool == active_extruder) return;
771 771
   #endif
772 772
 
773
-  const uint8_t old_tool = active_extruder;
774
-
775 773
   #if ENABLED(MIXING_EXTRUDER)
776 774
 
777 775
     UNUSED(no_move);
@@ -824,6 +822,7 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
824 822
       constexpr bool idex_full_control = false;
825 823
     #endif
826 824
 
825
+    const uint8_t old_tool = active_extruder;
827 826
     const bool can_move_away = !no_move && !idex_full_control;
828 827
 
829 828
     #if ENABLED(TOOLCHANGE_FILAMENT_SWAP)

Loading…
Cancel
Save