From 0c660a6fb1d61a496a484b916266a20993fa74f4 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 16 Jul 2019 17:21:28 +0200 Subject: [PATCH 1/2] Revert "Fix sketch/lcd.cpp:196:1: warning: no return statement in function returning non-void [-Wreturn-type]." This reverts commit a54fd29fa4d27f74eb05b2be2352c11c8bf1e841. --- Firmware/lcd.cpp | 1 - Firmware/lcd.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp index 7376014d..765a821a 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -192,7 +192,6 @@ static void lcd_begin(uint8_t clear) static int lcd_putchar(char c, FILE *) { lcd_write(c); - return c; } void lcd_init(void) diff --git a/Firmware/lcd.h b/Firmware/lcd.h index 790c0a95..d4d978f2 100644 --- a/Firmware/lcd.h +++ b/Firmware/lcd.h @@ -11,6 +11,7 @@ extern FILE _lcdout; #define lcdout (&_lcdout) +extern int lcd_putchar(char c, FILE *stream); extern void lcd_init(void); From d8ecb2d0c92ce8f92ac9b3c4fc2c6e632742ff84 Mon Sep 17 00:00:00 2001 From: leptun Date: Tue, 16 Jul 2019 21:11:27 +0300 Subject: [PATCH 2/2] Fix status screen --- Firmware/lcd.cpp | 2 +- Firmware/lcd.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp index 765a821a..b2f90c6c 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -189,7 +189,7 @@ static void lcd_begin(uint8_t clear) #endif } -static int lcd_putchar(char c, FILE *) +static void lcd_putchar(char c, FILE *) { lcd_write(c); } diff --git a/Firmware/lcd.h b/Firmware/lcd.h index d4d978f2..307e9486 100644 --- a/Firmware/lcd.h +++ b/Firmware/lcd.h @@ -11,7 +11,7 @@ extern FILE _lcdout; #define lcdout (&_lcdout) -extern int lcd_putchar(char c, FILE *stream); +extern void lcd_putchar(char c, FILE *stream); extern void lcd_init(void);