forksand
/
marlin-lulzbot-laser
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed disappearing degree mark in Hibiscus UI.

Browse Source
master
Marcio Teixeira 6 years ago
parent 4043424d66
commit 91b2439f3a
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File

2
Marlin/Conditionals_LulzBot.h
Unescape View File

@ -13,7 +13,7 @@
* got disabled. * got disabled.
*/ */
#define LULZBOT_FW_VERSION ".12" // Change this with each update #define LULZBOT_FW_VERSION ".13" // Change this with each update
#if ( \ #if ( \
!defined(LULZBOT_Gladiola_Mini) && \ !defined(LULZBOT_Gladiola_Mini) && \

18
Marlin/status_screen_lite_ST7920.h
Unescape View File

@ -555,21 +555,21 @@ void ST7920_Lite_Status_Screen::draw_temps(uint8_t line, const int16_t temp, con
} }
} }
void ST7920_Lite_Status_Screen::draw_extruder_1_temp(const int16_t temp, const int16_t target) { void ST7920_Lite_Status_Screen::draw_extruder_1_temp(const int16_t temp, const int16_t target, bool forceUpdate) {
const bool show_target = target && FAR(temp, target); const bool show_target = target && FAR(temp, target);
draw_temps(1, temp, target, show_target, display_state.E1_show_target != show_target); draw_temps(1, temp, target, show_target, display_state.E1_show_target != show_target || forceUpdate);
display_state.E1_show_target = show_target; display_state.E1_show_target = show_target;
} }
void ST7920_Lite_Status_Screen::draw_extruder_2_temp(const int16_t temp, const int16_t target) { void ST7920_Lite_Status_Screen::draw_extruder_2_temp(const int16_t temp, const int16_t target, bool forceUpdate) {
const bool show_target = target && FAR(temp, target); const bool show_target = target && FAR(temp, target);
draw_temps(2, temp, target, show_target, display_state.E2_show_target != show_target); draw_temps(2, temp, target, show_target, display_state.E2_show_target != show_target || forceUpdate);
display_state.E2_show_target = show_target; display_state.E2_show_target = show_target;
} }
void ST7920_Lite_Status_Screen::draw_bed_temp(const int16_t temp, const int16_t target) { void ST7920_Lite_Status_Screen::draw_bed_temp(const int16_t temp, const int16_t target, bool forceUpdate) {
const bool show_target = target && FAR(temp, target); const bool show_target = target && FAR(temp, target);
draw_temps( draw_temps(
@ -578,7 +578,7 @@ void ST7920_Lite_Status_Screen::draw_bed_temp(const int16_t temp, const int16_t
#else #else
3, 3,
#endif #endif
temp, target, show_target, display_state.bed_show_target != show_target); temp, target, show_target, display_state.bed_show_target != show_target || forceUpdate);
display_state.bed_show_target = show_target; display_state.bed_show_target = show_target;
} }
@ -720,11 +720,11 @@ void ST7920_Lite_Status_Screen::update_indicators(const bool forceUpdate) {
const float bed_temp = thermalManager.degBed(); const float bed_temp = thermalManager.degBed();
const float bed_target = thermalManager.degTargetBed(); const float bed_target = thermalManager.degTargetBed();
draw_extruder_1_temp(extruder_1_temp, extruder_1_target); draw_extruder_1_temp(extruder_1_temp, extruder_1_target, forceUpdate);
#if EXTRUDERS == 2 #if EXTRUDERS == 2
draw_extruder_2_temp(extruder_2_temp, extruder_2_target); draw_extruder_2_temp(extruder_2_temp, extruder_2_target, forceUpdate);
#endif #endif
draw_bed_temp(bed_temp, bed_target); draw_bed_temp(bed_temp, bed_target, forceUpdate);
draw_fan_speed(fan_speed); draw_fan_speed(fan_speed);
draw_print_time(seconds_elapsed); draw_print_time(seconds_elapsed);
draw_feedrate_percentage(feedrate_perc); draw_feedrate_percentage(feedrate_perc);

6
Marlin/status_screen_lite_ST7920_class.h
Unescape View File

@ -81,9 +81,9 @@ class ST7920_Lite_Status_Screen {
static void draw_fan_icon(const bool whichIcon); static void draw_fan_icon(const bool whichIcon);
static void draw_heat_icon(const bool whichIcon, const bool heating); static void draw_heat_icon(const bool whichIcon, const bool heating);
static void draw_temps(uint8_t line, const int16_t temp, const int16_t target, bool showTarget, bool targetStateChange); static void draw_temps(uint8_t line, const int16_t temp, const int16_t target, bool showTarget, bool targetStateChange);
static void draw_extruder_1_temp(const int16_t temp, const int16_t target); static void draw_extruder_1_temp(const int16_t temp, const int16_t target, bool forceUpdate = false);
static void draw_extruder_2_temp(const int16_t temp, const int16_t target); static void draw_extruder_2_temp(const int16_t temp, const int16_t target, bool forceUpdate = false);
static void draw_bed_temp(const int16_t temp, const int16_t target); static void draw_bed_temp(const int16_t temp, const int16_t target, bool forceUpdate = false);
static void draw_fan_speed(const uint8_t value); static void draw_fan_speed(const uint8_t value);
static void draw_print_time(const uint32_t elapsed); static void draw_print_time(const uint32_t elapsed);
static void draw_feedrate_percentage(const uint8_t percentage); static void draw_feedrate_percentage(const uint8_t percentage);

Write Preview
Loading…
Cancel
Save