3DPrinting/MarlinFirmware
0
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2025-03-22 22:26:18 +00:00
Code Issues Releases Wiki Activity

fix ammeter ui references, now that we return mA instead of A

Browse source
This commit is contained in:
Dave Gateman 2024-05-23 03:22:01 -06:00
parent 91f04f448d
commit d8422e7f68
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
View file

@ -683,12 +683,12 @@ FORCE_INLINE void _draw_heater_status(const heater_id_t heater_id, const char pr
FORCE_INLINE void _draw_ammeter_status() { FORCE_INLINE void _draw_ammeter_status() {
lcd_put_u8str(F(" ")); lcd_put_u8str(F(" "));
ammeter.read(); ammeter.read();
if (ammeter.current <= 0.999f) { if (ammeter.current < 1000) {
lcd_put_u8str(ui16tostr3rj(uint16_t(ammeter.current * 1000 + 0.5f))); lcd_put_u8str(ftostr31rj((ammeter.current)));
lcd_put_u8str(F("mA")); lcd_put_u8str(F("mA"));
} }
else { else {
lcd_put_u8str(ftostr12ns(ammeter.current)); lcd_put_u8str(ftostr12ns(ammeter.current / 1000));
lcd_put_u8str(F("A")); lcd_put_u8str(F("A"));
} }
} }

6
Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
View file

@ -557,16 +557,16 @@ FORCE_INLINE void _draw_axis_value(const AxisEnum axis, const char *value, const
lcd_moveto(10, 5); lcd_put_u8str(F("ILAZ")); lcd_moveto(10, 5); lcd_put_u8str(F("ILAZ"));
ammeter.read(); ammeter.read();
lcd_moveto(11, 6); lcd_moveto(11, 6);
if (ammeter.current <= 0.999f) if (ammeter.current < 1.0f)
{ {
lcd_put_u8str("mA"); lcd_put_u8str("mA");
lcd_moveto(10, 7); lcd_moveto(10, 7);
lcd_put_u8str(F(" ")); lcd_put_u8str(ui16tostr3rj(uint16_t(ammeter.current * 1000 + 0.5f))); lcd_put_u8str(F(" ")); lcd_put_u8str(ui16tostr3rj(uint16_t(ammeter.current ));
} }
else { else {
lcd_put_u8str(" A"); lcd_put_u8str(" A");
lcd_moveto(10, 7); lcd_moveto(10, 7);
lcd_put_u8str(ftostr12ns(ammeter.current)); lcd_put_u8str(ftostr12ns(ammeter.current*1000));
} }
if (ammeter.current) picBits |= ICON_BED; if (ammeter.current) picBits |= ICON_BED;