bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Rename LCD conditionals (#19533)

Browse Source
This commit is contained in:
Scott Lahteine
2020-09-28 01:13:27 -05:00
committed by GitHub
parent 1c372df449
commit c2c6a679ea
138 changed files with 353 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/feature/power_monitor.cpp
View File

@ -44,7 +44,7 @@ uint8_t PowerMonitor::display_item;
PowerMonitor power_monitor; // Single instance - this calls the constructor
#if HAS_GRAPHICAL_LCD
#if HAS_MARLINUI_U8GLIB
#if ENABLED(POWER_MONITOR_CURRENT)
void PowerMonitor::draw_current() {
@ -70,6 +70,6 @@ PowerMonitor power_monitor; // Single instance - this calls the constructor
}
#endif
#endif // HAS_GRAPHICAL_LCD
#endif // HAS_MARLINUI_U8GLIB
#endif // HAS_POWER_MONITOR

4
Marlin/src/feature/power_monitor.h
View File

@ -88,8 +88,8 @@ public:
FORCE_INLINE static float getPower() { return getAmps() * getVolts(); }
#endif
#if HAS_SPI_LCD
#if HAS_GRAPHICAL_LCD && DISABLED(LIGHTWEIGHT_UI)
#if HAS_WIRED_LCD
#if HAS_MARLINUI_U8GLIB && DISABLED(LIGHTWEIGHT_UI)
FORCE_INLINE static bool display_enabled() { return flags != 0x00; }
#endif
#if ENABLED(POWER_MONITOR_CURRENT)