Browse Source

Fix ExtUI compile warnings and error (#12799)

Marcio Teixeira 6 years ago
parent
commit
81e753064a

+ 3
- 1
Marlin/src/gcode/bedlevel/M420.cpp View File

@@ -215,7 +215,9 @@ void GcodeSuite::M420() {
215 215
   // Enable leveling if specified, or if previously active
216 216
   set_bed_leveling_enabled(to_enable);
217 217
 
218
-  EXIT_M420:
218
+  #if HAS_MESH
219
+    EXIT_M420:
220
+  #endif
219 221
 
220 222
   // Error if leveling failed to enable or reenable
221 223
   if (to_enable && !planner.leveling_active)

+ 2
- 2
Marlin/src/lcd/extensible_ui/ui_api.cpp View File

@@ -635,14 +635,14 @@ namespace ExtUI {
635 635
       pos;
636 636
 
637 637
       card.getfilename_sorted(nr);
638
-      return card.filename && card.filename[0] != '\0';
638
+      return card.filename[0] != '\0';
639 639
     #else
640 640
       return false;
641 641
     #endif
642 642
   }
643 643
 
644 644
   const char* FileList::filename() {
645
-    return IFSD(card.longFilename && card.longFilename[0] ? card.longFilename : card.filename, "");
645
+    return IFSD(card.longFilename[0] ? card.longFilename : card.filename, "");
646 646
   }
647 647
 
648 648
   const char* FileList::shortFilename() {

+ 1
- 1
Marlin/src/module/temperature.h View File

@@ -618,7 +618,7 @@ class Temperature {
618 618
       #endif
619 619
     #endif
620 620
 
621
-    #if ENABLED(ULTRA_LCD)
621
+    #if ENABLED(ULTRA_LCD) || ENABLED(EXTENSIBLE_UI)
622 622
       static void set_heating_message(const uint8_t e);
623 623
     #endif
624 624
 

Loading…
Cancel
Save