thebears/marlin_skr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[2.0.x] Buffer overflow and scroll fix, UTF8 cleanup (#10844)

Browse Source
This commit is contained in:
Eduardo José Tagle
2018-05-26 01:32:37 -03:00
committed by Scott Lahteine
parent 235facd545
commit 6f330f397e
17 changed files with 413 additions and 671 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Marlin/src/lcd/lcdprint.h
View File

@@ -17,11 +17,7 @@
#include "u8g_fontutf8.h"
#endif
#define PRINTABLE(C) (((C) & 0xC0u) != 0x80u)
#ifdef __cplusplus
extern "C" {
#endif
#define START_OF_UTF8_CHAR(C) (((C) & 0xC0u) != 0x80u)
int lcd_glyph_height(void);
@@ -49,15 +45,11 @@ int lcd_put_u8str_max(const char * utf8_str, pixel_len_t max_length);
*
* Draw a ROM UTF-8 string
*/
int lcd_put_u8str_max_rom(const char * utf8_str_P, pixel_len_t max_length);
int lcd_put_u8str_max_P(const char * utf8_str_P, pixel_len_t max_length);
void lcd_moveto(int col, int row);
#ifdef __cplusplus
}
#endif
#define lcd_put_u8str_rom(str) lcd_put_u8str_max_rom(str, PIXEL_LEN_NOLIMIT)
inline int lcd_put_u8str_P(const char *str) { return lcd_put_u8str_max_P(str, PIXEL_LEN_NOLIMIT); }
inline int lcd_put_u8str(const char* str) { return lcd_put_u8str_max(str, PIXEL_LEN_NOLIMIT); }