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

🐛 Fix Ammeter display on DOGM (#22384)

Browse Source
This commit is contained in:
Mike La Spina 2021-07-18 20:11:24 -05:00 committed by Scott Lahteine
parent 61d0b08298
commit 0e9eb5f6ce
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/lcd/dogm/dogm_Statusscreen.h
View File

@ -624,7 +624,7 @@
#define STATUS_AMMETER_X (LCD_PIXEL_WIDTH - (STATUS_AMMETER_BYTEWIDTH + STATUS_FLOWMETER_BYTEWIDTH + STATUS_FAN_BYTEWIDTH + STATUS_CUTTER_BYTEWIDTH + STATUS_COOLER_BYTEWIDTH) * 8) #define STATUS_AMMETER_X (LCD_PIXEL_WIDTH - (STATUS_AMMETER_BYTEWIDTH + STATUS_FLOWMETER_BYTEWIDTH + STATUS_FAN_BYTEWIDTH + STATUS_CUTTER_BYTEWIDTH + STATUS_COOLER_BYTEWIDTH) * 8)
#endif #endif
#ifndef STATUS_AMMETER_HEIGHT #ifndef STATUS_AMMETER_HEIGHT
#define STATUS_AMMETER_HEIGHT(S) (sizeof(status_ammeter_bmp1) / (STATUS_AMMETER_BYTEWIDTH)) #define STATUS_AMMETER_HEIGHT(S) (sizeof(status_ammeter_bmp_mA) / (STATUS_AMMETER_BYTEWIDTH))
#endif #endif
#ifndef STATUS_AMMETER_Y #ifndef STATUS_AMMETER_Y
#define STATUS_AMMETER_Y(S) (18 - STATUS_AMMETER_HEIGHT(S)) #define STATUS_AMMETER_Y(S) (18 - STATUS_AMMETER_HEIGHT(S))
@ -633,8 +633,8 @@
#define STATUS_AMMETER_TEXT_X (STATUS_AMMETER_X + 7) #define STATUS_AMMETER_TEXT_X (STATUS_AMMETER_X + 7)
#endif #endif
static_assert( static_assert(
sizeof(status_ammeter_bmp1) == (STATUS_AMMETER_BYTEWIDTH) * STATUS_AMMETER_HEIGHT(0), sizeof(status_ammeter_bmp_mA) == (STATUS_AMMETER_BYTEWIDTH) * STATUS_AMMETER_HEIGHT(0),
"Status ammeter bitmap (status_ammeter_bmp1) dimensions don't match data." "Status ammeter bitmap (status_ammeter_bmp_mA) dimensions don't match data."
); );
#endif #endif

4
Marlin/src/lcd/dogm/status_screen_DOGM.cpp
View File

@ -57,6 +57,10 @@
#include "../../feature/cooler.h" #include "../../feature/cooler.h"
#endif #endif
#if ENABLED(I2C_AMMETER)
#include "../../feature/ammeter.h"
#endif
#if HAS_POWER_MONITOR #if HAS_POWER_MONITOR
#include "../../feature/power_monitor.h" #include "../../feature/power_monitor.h"
#endif #endif