|
@@ -42,7 +42,7 @@ static int fontinfo_compare(uxg_fontinfo_t * v1, uxg_fontinfo_t * v2) {
|
42
|
42
|
}
|
43
|
43
|
|
44
|
44
|
/*"data_list[idx] - *data_pin"*/
|
45
|
|
-static int pf_bsearch_cb_comp_fntifo_pgm(void *userdata, const size_t idx, void *data_pin) {
|
|
45
|
+static int pf_bsearch_cb_comp_fntifo_pgm (void *userdata, size_t idx, void *data_pin) {
|
46
|
46
|
uxg_fontinfo_t *fntinfo = (uxg_fontinfo_t*)userdata;
|
47
|
47
|
uxg_fontinfo_t localval;
|
48
|
48
|
memcpy_P(&localval, fntinfo + idx, sizeof(localval));
|
|
@@ -103,7 +103,7 @@ static void fontgroup_drawwchar(font_group_t *group, const font_t *fnt_default,
|
103
|
103
|
*
|
104
|
104
|
* Get the screen pixel width of a ROM UTF-8 string
|
105
|
105
|
*/
|
106
|
|
-static void fontgroup_drawstring(font_group_t *group, const font_t *fnt_default, const char * const utf8_msg, read_byte_cb_t cb_read_byte, void * userdata, fontgroup_cb_draw_t cb_draw_ram) {
|
|
106
|
+static void fontgroup_drawstring(font_group_t *group, const font_t *fnt_default, const char *utf8_msg, read_byte_cb_t cb_read_byte, void * userdata, fontgroup_cb_draw_t cb_draw_ram) {
|
107
|
107
|
uint8_t *p = (uint8_t*)utf8_msg;
|
108
|
108
|
for (;;) {
|
109
|
109
|
wchar_t val = 0;
|
|
@@ -196,7 +196,7 @@ unsigned int uxg_DrawWchar(u8g_t *pu8g, unsigned int x, unsigned int y, wchar_t
|
196
|
196
|
*
|
197
|
197
|
* Draw a UTF-8 string at the specified position
|
198
|
198
|
*/
|
199
|
|
-unsigned int uxg_DrawUtf8Str(u8g_t *pu8g, unsigned int x, unsigned int y, const char * const utf8_msg, pixel_len_t max_width) {
|
|
199
|
+unsigned int uxg_DrawUtf8Str(u8g_t *pu8g, unsigned int x, unsigned int y, const char *utf8_msg, pixel_len_t max_width) {
|
200
|
200
|
struct _uxg_drawu8_data_t data;
|
201
|
201
|
font_group_t *group = &g_fontgroup_root;
|
202
|
202
|
const font_t *fnt_default = uxg_GetFont(pu8g);
|
|
@@ -230,7 +230,7 @@ unsigned int uxg_DrawUtf8Str(u8g_t *pu8g, unsigned int x, unsigned int y, const
|
230
|
230
|
*
|
231
|
231
|
* Draw a ROM UTF-8 string at the specified position
|
232
|
232
|
*/
|
233
|
|
-unsigned int uxg_DrawUtf8StrP(u8g_t *pu8g, unsigned int x, unsigned int y, PGM_P const utf8_msg, pixel_len_t max_width) {
|
|
233
|
+unsigned int uxg_DrawUtf8StrP(u8g_t *pu8g, unsigned int x, unsigned int y, PGM_P utf8_msg, pixel_len_t max_width) {
|
234
|
234
|
struct _uxg_drawu8_data_t data;
|
235
|
235
|
font_group_t *group = &g_fontgroup_root;
|
236
|
236
|
const font_t *fnt_default = uxg_GetFont(pu8g);
|
|
@@ -273,7 +273,7 @@ static int fontgroup_cb_draw_u8gstrlen(void *userdata, const font_t *fnt_current
|
273
|
273
|
*
|
274
|
274
|
* Get the screen pixel width of a UTF-8 string
|
275
|
275
|
*/
|
276
|
|
-int uxg_GetUtf8StrPixelWidth(u8g_t *pu8g, const char * const utf8_msg) {
|
|
276
|
+int uxg_GetUtf8StrPixelWidth(u8g_t *pu8g, const char *utf8_msg) {
|
277
|
277
|
struct _uxg_drawu8_data_t data;
|
278
|
278
|
font_group_t *group = &g_fontgroup_root;
|
279
|
279
|
const font_t *fnt_default = uxg_GetFont(pu8g);
|
|
@@ -299,7 +299,7 @@ int uxg_GetUtf8StrPixelWidth(u8g_t *pu8g, const char * const utf8_msg) {
|
299
|
299
|
*
|
300
|
300
|
* Get the screen pixel width of a ROM UTF-8 string
|
301
|
301
|
*/
|
302
|
|
-int uxg_GetUtf8StrPixelWidthP(u8g_t *pu8g, PGM_P const utf8_msg) {
|
|
302
|
+int uxg_GetUtf8StrPixelWidthP(u8g_t *pu8g, PGM_P utf8_msg) {
|
303
|
303
|
struct _uxg_drawu8_data_t data;
|
304
|
304
|
font_group_t *group = &g_fontgroup_root;
|
305
|
305
|
const font_t *fnt_default = uxg_GetFont(pu8g);
|