From 2480bd90fc6dc861aa6f3b51f0e68f35c8190ab9 Mon Sep 17 00:00:00 2001 From: leptun Date: Wed, 24 Jul 2019 09:55:40 +0300 Subject: [PATCH 1/2] Revert lcd_putchar to type int and retrun 0 Discussion: https://github.com/prusa3d/Prusa-Firmware/pull/2008#issuecomment-514500738 --- Firmware/lcd.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp index fd3e1328f..71948789b 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -189,9 +189,10 @@ static void lcd_begin(uint8_t clear) #endif } -static void lcd_putchar(char c, FILE *) +static int lcd_putchar(char c, FILE *) { lcd_write(c); + return 0; } void lcd_init(void) From 818befb91beb3ea70482f92d0acdf693fc43d6d7 Mon Sep 17 00:00:00 2001 From: leptun Date: Wed, 17 Jul 2019 13:28:54 +0300 Subject: [PATCH 2/2] Fix compile warning function was defined as static in lcd.cpp and redefined in lcd.h --- Firmware/lcd.h | 1 - 1 file changed, 1 deletion(-) diff --git a/Firmware/lcd.h b/Firmware/lcd.h index 307e9486c..790c0a955 100644 --- a/Firmware/lcd.h +++ b/Firmware/lcd.h @@ -11,7 +11,6 @@ extern FILE _lcdout; #define lcdout (&_lcdout) -extern void lcd_putchar(char c, FILE *stream); extern void lcd_init(void);