|
@@ -80,22 +80,22 @@ class TFT_String {
|
80
|
80
|
|
81
|
81
|
static font_t *font() { return font_header; };
|
82
|
82
|
static uint16_t font_height() { return font_header->FontAscent - font_header->FontDescent; }
|
83
|
|
- static glyph_t *glyph(uint8_t character) { return glyphs[character] == NULL ? glyphs[0x3F] : glyphs[character]; } /* Use '?' for unknown glyphs */
|
|
83
|
+ static glyph_t *glyph(uint8_t character) { return glyphs[character] ?: glyphs[0x3F]; } /* Use '?' for unknown glyphs */
|
84
|
84
|
static inline glyph_t *glyph(uint8_t *character) { return glyph(*character); }
|
85
|
85
|
|
86
|
86
|
static void set();
|
87
|
87
|
static void add(uint8_t character) { add_character(character); eol(); }
|
88
|
88
|
static void add(uint8_t *string);
|
89
|
|
- static void add(uint8_t *string, int8_t index, uint8_t *itemString = NULL);
|
|
89
|
+ static void add(uint8_t *string, int8_t index, uint8_t *itemString=nullptr);
|
90
|
90
|
static void set(uint8_t *string) { set(); add(string); };
|
91
|
|
- static void set(uint8_t *string, int8_t index, const char *itemString = NULL) { set(); add(string, index, (uint8_t *)itemString); };
|
|
91
|
+ static void set(uint8_t *string, int8_t index, const char *itemString=nullptr) { set(); add(string, index, (uint8_t *)itemString); };
|
92
|
92
|
static inline void set(const char *string) { set((uint8_t *)string); }
|
93
|
|
- static inline void set(const char *string, int8_t index, const char *itemString = NULL) { set((uint8_t *)string, index, itemString); }
|
|
93
|
+ static inline void set(const char *string, int8_t index, const char *itemString=nullptr) { set((uint8_t *)string, index, itemString); }
|
94
|
94
|
static inline void add(const char *string) { add((uint8_t *)string); }
|
95
|
95
|
|
96
|
|
- static void trim(uint8_t character = 0x20);
|
97
|
|
- static void rtrim(uint8_t character = 0x20);
|
98
|
|
- static void ltrim(uint8_t character = 0x20);
|
|
96
|
+ static void trim(uint8_t character=0x20);
|
|
97
|
+ static void rtrim(uint8_t character=0x20);
|
|
98
|
+ static void ltrim(uint8_t character=0x20);
|
99
|
99
|
static uint16_t width() { return span; }
|
100
|
100
|
static uint8_t *string() { return data; }
|
101
|
101
|
static uint16_t center(uint16_t width) { return span > width ? 0 : (width - span) / 2; }
|