update makefile and fix warnings
This commit is contained in:
@@ -7,6 +7,7 @@ CSRCS += lv_mem.c
|
|||||||
CSRCS += lv_ll.c
|
CSRCS += lv_ll.c
|
||||||
CSRCS += lv_color.c
|
CSRCS += lv_color.c
|
||||||
CSRCS += lv_txt.c
|
CSRCS += lv_txt.c
|
||||||
|
CSRCS += lv_txt_ap.c
|
||||||
CSRCS += lv_math.c
|
CSRCS += lv_math.c
|
||||||
CSRCS += lv_log.c
|
CSRCS += lv_log.c
|
||||||
CSRCS += lv_gc.c
|
CSRCS += lv_gc.c
|
||||||
|
|||||||
@@ -9,7 +9,6 @@
|
|||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#include "lv_bidi.h"
|
#include "lv_bidi.h"
|
||||||
#include "lv_txt.h"
|
#include "lv_txt.h"
|
||||||
#include "lv_conf.h"
|
|
||||||
#include "lv_txt_ap.h"
|
#include "lv_txt_ap.h"
|
||||||
#include "../lv_draw/lv_draw.h"
|
#include "../lv_draw/lv_draw.h"
|
||||||
|
|
||||||
@@ -26,9 +25,6 @@
|
|||||||
* STATIC PROTOTYPES
|
* STATIC PROTOTYPES
|
||||||
**********************/
|
**********************/
|
||||||
static uint32_t lv_ap_get_char_index(uint16_t c);
|
static uint32_t lv_ap_get_char_index(uint16_t c);
|
||||||
#if LV_USE_REVERSE_ARABIC_PERSIAN_CHARS == 1
|
|
||||||
static void lv_ap_normalize_chars(uint32_t * str,uint16_t count);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**********************
|
/**********************
|
||||||
* STATIC VARIABLES
|
* STATIC VARIABLES
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
* @file lv_txt_ap.h
|
* @file lv_txt_ap.h
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef LV_TXT_AP_H
|
#ifndef LV_TXT_AP_H
|
||||||
#define LV_TXT_AP_H
|
#define LV_TXT_AP_H
|
||||||
|
|
||||||
@@ -9,15 +10,12 @@
|
|||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*********************
|
/*********************
|
||||||
* INCLUDES
|
* INCLUDES
|
||||||
*********************/
|
*********************/
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#include "lv_bidi.h"
|
#include "lv_bidi.h"
|
||||||
#include "lv_txt.h"
|
#include "lv_txt.h"
|
||||||
#include "lv_conf.h"
|
|
||||||
#include "../lv_draw/lv_draw.h"
|
#include "../lv_draw/lv_draw.h"
|
||||||
|
|
||||||
/*********************
|
/*********************
|
||||||
|
|||||||
@@ -1087,7 +1087,7 @@ static lv_chart_label_iterator_t create_axis_label_iter(const char * list, uint8
|
|||||||
*/
|
*/
|
||||||
static void get_next_axis_label(lv_chart_label_iterator_t * iterator, char * buf)
|
static void get_next_axis_label(lv_chart_label_iterator_t * iterator, char * buf)
|
||||||
{
|
{
|
||||||
uint8_t label_len = 0;
|
uint32_t label_len = 0;
|
||||||
if(iterator->is_reverse_iter) {
|
if(iterator->is_reverse_iter) {
|
||||||
const char * label_start;
|
const char * label_start;
|
||||||
/* count the length of the current label*/
|
/* count the length of the current label*/
|
||||||
|
|||||||
@@ -648,9 +648,7 @@ static void lv_cont_layout_pretty(lv_obj_t * cont)
|
|||||||
*/
|
*/
|
||||||
static void lv_cont_layout_grid(lv_obj_t * cont)
|
static void lv_cont_layout_grid(lv_obj_t * cont)
|
||||||
{
|
{
|
||||||
|
|
||||||
lv_coord_t w_fit = lv_obj_get_width_fit(cont);
|
lv_coord_t w_fit = lv_obj_get_width_fit(cont);
|
||||||
lv_coord_t h_obj = lv_obj_get_height(lv_obj_get_child(cont, NULL));
|
|
||||||
lv_coord_t inner = lv_obj_get_style_pad_inner(cont, LV_CONT_PART_MAIN);
|
lv_coord_t inner = lv_obj_get_style_pad_inner(cont, LV_CONT_PART_MAIN);
|
||||||
lv_coord_t y_ofs = inner + lv_obj_get_height(lv_obj_get_child(cont, NULL));
|
lv_coord_t y_ofs = inner + lv_obj_get_height(lv_obj_get_child(cont, NULL));
|
||||||
|
|
||||||
@@ -662,7 +660,6 @@ static void lv_cont_layout_grid(lv_obj_t * cont)
|
|||||||
lv_coord_t left = lv_obj_get_style_pad_left(cont, LV_CONT_PART_MAIN);
|
lv_coord_t left = lv_obj_get_style_pad_left(cont, LV_CONT_PART_MAIN);
|
||||||
lv_coord_t act_x = left;
|
lv_coord_t act_x = left;
|
||||||
lv_coord_t act_y = lv_obj_get_style_pad_top(cont, LV_CONT_PART_MAIN);
|
lv_coord_t act_y = lv_obj_get_style_pad_top(cont, LV_CONT_PART_MAIN);
|
||||||
uint16_t obj_cnt = 0;
|
|
||||||
lv_obj_t * child;
|
lv_obj_t * child;
|
||||||
LV_LL_READ_BACK(cont->child_ll, child) {
|
LV_LL_READ_BACK(cont->child_ll, child) {
|
||||||
if(lv_obj_get_hidden(child) != false || lv_obj_is_protected(child, LV_PROTECT_POS) != false) continue;
|
if(lv_obj_get_hidden(child) != false || lv_obj_is_protected(child, LV_PROTECT_POS) != false) continue;
|
||||||
|
|||||||
@@ -319,6 +319,7 @@ advanced_features = {
|
|||||||
"LV_FONT_MONTSERRAT_28_COMPRESSED":1,
|
"LV_FONT_MONTSERRAT_28_COMPRESSED":1,
|
||||||
"LV_FONT_UNSCII_8":1,
|
"LV_FONT_UNSCII_8":1,
|
||||||
"LV_USE_BIDI": 1,
|
"LV_USE_BIDI": 1,
|
||||||
|
"LV_USE_REVERSE_ARABIC_PERSIAN_CHARS":1,
|
||||||
"LV_USE_OBJ_REALIGN": 1,
|
"LV_USE_OBJ_REALIGN": 1,
|
||||||
"LV_FONT_FMT_TXT_LARGE":1,
|
"LV_FONT_FMT_TXT_LARGE":1,
|
||||||
"LV_FONT_SUBPX_BGR":1,
|
"LV_FONT_SUBPX_BGR":1,
|
||||||
|
|||||||
Reference in New Issue
Block a user