Bladeren bron

Fixed compilation when using avr-gcc

- avr-gcc is more strict than the Arduino IDE, it seems.
Marcio Teixeira 7 jaren geleden
bovenliggende
commit
8db67d1647

+ 1
- 1
Marlin/src/lcd/dogm/ultralcd_impl_st7920_lite_status_screen.h Bestand weergeven

@@ -76,7 +76,7 @@ class ST7920_Lite_Status_Screen {
76 76
     static void draw_fan_speed(uint8_t value);
77 77
     static void draw_print_time(uint32_t elapsed);
78 78
     static void draw_feedrate_percentage(uint8_t percentage);
79
-    static void draw_status_message(const unsigned char *str);
79
+    static void draw_status_message(const char *str);
80 80
     static void draw_position(const float x, const float y, const float z, bool position_known = true);
81 81
 
82 82
     static bool indicators_changed();

+ 2
- 2
Marlin/src/lcd/dogm/ultralcd_impl_st7920_lite_status_screen_impl.h Bestand weergeven

@@ -99,7 +99,7 @@ void ST7920_Lite_Status_Screen::write_str(progmem_str str) {
99 99
   write_str_P((const char*)str);
100 100
 }
101 101
 
102
-void ST7920_Lite_Status_Screen::write_number(uint8_t value, uint8_t digits=3) {
102
+void ST7920_Lite_Status_Screen::write_number(uint8_t value, uint8_t digits) {
103 103
   char  str[7];
104 104
   const char *fmt;
105 105
   switch(digits) {
@@ -435,7 +435,7 @@ void ST7920_Lite_Status_Screen::draw_feedrate_percentage(uint8_t percentage) {
435 435
   #endif
436 436
 }
437 437
 
438
-void ST7920_Lite_Status_Screen::draw_status_message(const unsigned char *str) {
438
+void ST7920_Lite_Status_Screen::draw_status_message(const char *str) {
439 439
   set_ddram_address(DDRAM_LINE_4);
440 440
   begin_data();
441 441
   #if ENABLED(STATUS_MESSAGE_SCROLLING)

Laden…
Annuleren
Opslaan