From 8db67d1647727ce639a2a7ba74ddd0d1a4ee36ca Mon Sep 17 00:00:00 2001 From: Marcio Teixeira Date: Wed, 14 Feb 2018 15:51:25 -0700 Subject: [PATCH] Fixed compilation when using avr-gcc - avr-gcc is more strict than the Arduino IDE, it seems. --- Marlin/src/lcd/dogm/ultralcd_impl_st7920_lite_status_screen.h | 2 +- .../lcd/dogm/ultralcd_impl_st7920_lite_status_screen_impl.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Marlin/src/lcd/dogm/ultralcd_impl_st7920_lite_status_screen.h b/Marlin/src/lcd/dogm/ultralcd_impl_st7920_lite_status_screen.h index 19c3564261..dd3c71a1e3 100644 --- a/Marlin/src/lcd/dogm/ultralcd_impl_st7920_lite_status_screen.h +++ b/Marlin/src/lcd/dogm/ultralcd_impl_st7920_lite_status_screen.h @@ -76,7 +76,7 @@ class ST7920_Lite_Status_Screen { static void draw_fan_speed(uint8_t value); static void draw_print_time(uint32_t elapsed); static void draw_feedrate_percentage(uint8_t percentage); - static void draw_status_message(const unsigned char *str); + static void draw_status_message(const char *str); static void draw_position(const float x, const float y, const float z, bool position_known = true); static bool indicators_changed(); diff --git a/Marlin/src/lcd/dogm/ultralcd_impl_st7920_lite_status_screen_impl.h b/Marlin/src/lcd/dogm/ultralcd_impl_st7920_lite_status_screen_impl.h index 3a90ee1835..db66fc12fc 100644 --- a/Marlin/src/lcd/dogm/ultralcd_impl_st7920_lite_status_screen_impl.h +++ b/Marlin/src/lcd/dogm/ultralcd_impl_st7920_lite_status_screen_impl.h @@ -99,7 +99,7 @@ void ST7920_Lite_Status_Screen::write_str(progmem_str str) { write_str_P((const char*)str); } -void ST7920_Lite_Status_Screen::write_number(uint8_t value, uint8_t digits=3) { +void ST7920_Lite_Status_Screen::write_number(uint8_t value, uint8_t digits) { char str[7]; const char *fmt; switch(digits) { @@ -435,7 +435,7 @@ void ST7920_Lite_Status_Screen::draw_feedrate_percentage(uint8_t percentage) { #endif } -void ST7920_Lite_Status_Screen::draw_status_message(const unsigned char *str) { +void ST7920_Lite_Status_Screen::draw_status_message(const char *str) { set_ddram_address(DDRAM_LINE_4); begin_data(); #if ENABLED(STATUS_MESSAGE_SCROLLING)