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

Fix ExtUI compile warnings and error (#12799)

Browse source
This commit is contained in:
Marcio Teixeira 2019-01-03 07:36:43 -07:00 committed by Scott Lahteine
parent 74c47803f7
commit 81e753064a
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/gcode/bedlevel/M420.cpp
View file

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

4
Marlin/src/lcd/extensible_ui/ui_api.cpp
View file

@ -635,14 +635,14 @@ namespace ExtUI {
pos; pos;
card.getfilename_sorted(nr); card.getfilename_sorted(nr);
return card.filename && card.filename[0] != '\0'; return card.filename[0] != '\0';
#else #else
return false; return false;
#endif #endif
} }
const char* FileList::filename() { const char* FileList::filename() {
return IFSD(card.longFilename && card.longFilename[0] ? card.longFilename : card.filename, ""); return IFSD(card.longFilename[0] ? card.longFilename : card.filename, "");
} }
const char* FileList::shortFilename() { const char* FileList::shortFilename() {

2
Marlin/src/module/temperature.h
View file

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