Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
ec50d3d
Laser percent power
thinkyhead Dec 9, 2020
98799b5
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
descipher Dec 14, 2020
74367bc
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
descipher Dec 29, 2020
4a2dab7
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
descipher Jan 25, 2021
aa713a1
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
descipher Feb 1, 2021
2cc4d48
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
descipher Feb 2, 2021
8db0a77
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
descipher Mar 3, 2021
9dbc82f
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
descipher Mar 5, 2021
329e211
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
descipher Mar 12, 2021
80c48b0
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
descipher Mar 16, 2021
a9a8bf5
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
descipher Mar 24, 2021
245ffde
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
descipher Mar 31, 2021
825d057
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
descipher Apr 5, 2021
80ded6f
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
descipher Apr 6, 2021
d00c06f
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
descipher Apr 19, 2021
d9ee4c9
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bugfix-2.0.x
descipher Apr 27, 2021
ecd3c94
Merge branch 'MarlinFirmware:bugfix-2.0.x' into bugfix-2.0.x
descipher May 7, 2021
a3b165f
Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marl…
descipher Jun 1, 2021
a05783e
Merge branch 'bugfix-2.0.x' of https://github.com/descipher/Marlin in…
descipher Jun 17, 2021
9e6bd60
Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marl…
descipher Jun 17, 2021
2d72981
Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marl…
descipher Jun 17, 2021
5c23756
Merge branch 'bugfix-2.0.x' of https://github.com/descipher/Marlin in…
descipher Jun 17, 2021
bda04df
Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marl…
descipher Jun 25, 2021
1a763c2
Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marl…
descipher Jun 26, 2021
897f53d
Enable stand alone Flow Meter operation without a display
descipher Jun 27, 2021
3521da1
Merge branch 'MarlinFirmware:bugfix-2.0.x' into bugfix-2.0.x
descipher Jun 27, 2021
1b9d1fa
Keep PWM Default
descipher Jun 27, 2021
837edde
Update cooler.h
descipher Jun 27, 2021
04a92bb
Update temperature.cpp
thinkyhead Jul 9, 2021
f37346a
Update cooler.cpp
thinkyhead Jul 9, 2021
e846a90
Merge branch 'MarlinFirmware:bugfix-2.0.x' into bugfix-2.0.x
descipher Jul 10, 2021
a19fb5f
Update features.ini
thinkyhead Jul 12, 2021
645598f
Merge branch 'MarlinFirmware:bugfix-2.0.x' into bugfix-2.0.x
descipher Jul 18, 2021
958acbf
DOGM include and animation bmp correction
descipher Jul 18, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Marlin/src/lcd/dogm/dogm_Statusscreen.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
#endif
#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
#ifndef STATUS_AMMETER_Y
#define STATUS_AMMETER_Y(S) (18 - STATUS_AMMETER_HEIGHT(S))
Expand All @@ -633,8 +633,8 @@
#define STATUS_AMMETER_TEXT_X (STATUS_AMMETER_X + 7)
#endif
static_assert(
sizeof(status_ammeter_bmp1) == (STATUS_AMMETER_BYTEWIDTH) * STATUS_AMMETER_HEIGHT(0),
"Status ammeter bitmap (status_ammeter_bmp1) dimensions don't match data."
sizeof(status_ammeter_bmp_mA) == (STATUS_AMMETER_BYTEWIDTH) * STATUS_AMMETER_HEIGHT(0),
"Status ammeter bitmap (status_ammeter_bmp_mA) dimensions don't match data."
);
#endif

Expand Down
4 changes: 4 additions & 0 deletions Marlin/src/lcd/dogm/status_screen_DOGM.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@
#include "../../feature/cooler.h"
#endif

#if ENABLED(I2C_AMMETER)
#include "../../feature/ammeter.h"
#endif

#if HAS_POWER_MONITOR
#include "../../feature/power_monitor.h"
#endif
Expand Down