github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

erge branch 'dev-5.3' of github.com:seyyah/lvgl into dev-5.3

Browse Source
This commit is contained in:
seyyah
2019-01-25 14:14:46 +03:00
parent 98b6e446f0 c8f5638780
commit bdb3bb778e
19 changed files with 469 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -1 +1,3 @@
**/*.o **/*.o
**/*.swp
**/*.swo

0
.gitmodules vendored Normal file
View File

49
lv_core/lv_obj.c
View File

@@ -19,6 +19,11 @@
#include "../lv_misc/lv_ufs.h" #include "../lv_misc/lv_ufs.h"
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include "../lv_misc/lv_gc.h"
#if defined(LV_GC_INCLUDE)
# include LV_GC_INCLUDE
#endif /* LV_ENABLE_GC */
/********************* /*********************
* DEFINES * DEFINES
@@ -43,11 +48,6 @@ static lv_res_t lv_obj_signal(lv_obj_t * obj, lv_signal_t sign, void * param);
/********************** /**********************
* STATIC VARIABLES * STATIC VARIABLES
**********************/ **********************/
static lv_obj_t * def_scr = NULL;
static lv_obj_t * act_scr = NULL;
static lv_obj_t * top_layer = NULL;
static lv_obj_t * sys_layer = NULL;
static lv_ll_t scr_ll; /*Linked list of screens*/
/********************** /**********************
* MACROS * MACROS
@@ -62,6 +62,11 @@ static lv_ll_t scr_ll; /*Linked list of screens*/
*/ */
void lv_init(void) void lv_init(void)
{ {
LV_GC_ROOT(_lv_def_scr) = NULL;
LV_GC_ROOT(_lv_act_scr) = NULL;
LV_GC_ROOT(_lv_top_layer) = NULL;
LV_GC_ROOT(_lv_sys_layer) = NULL;
LV_LOG_TRACE("lv_init started"); LV_LOG_TRACE("lv_init started");
/*Initialize the lv_misc modules*/ /*Initialize the lv_misc modules*/
@@ -85,19 +90,19 @@ void lv_init(void)
lv_refr_init(); lv_refr_init();
/*Create the default screen*/ /*Create the default screen*/
lv_ll_init(&scr_ll, sizeof(lv_obj_t)); lv_ll_init(&LV_GC_ROOT(_lv_scr_ll), sizeof(lv_obj_t));
def_scr = lv_obj_create(NULL, NULL); LV_GC_ROOT(_lv_def_scr) = lv_obj_create(NULL, NULL);
act_scr = def_scr; LV_GC_ROOT(_lv_act_scr) = LV_GC_ROOT(_lv_def_scr);
top_layer = lv_obj_create(NULL, NULL); LV_GC_ROOT(_lv_top_layer) = lv_obj_create(NULL, NULL);
lv_obj_set_style(top_layer, &lv_style_transp_fit); lv_obj_set_style(LV_GC_ROOT(_lv_top_layer), &lv_style_transp_fit);
sys_layer = lv_obj_create(NULL, NULL); LV_GC_ROOT(_lv_sys_layer) = lv_obj_create(NULL, NULL);
lv_obj_set_style(sys_layer, &lv_style_transp_fit); lv_obj_set_style(LV_GC_ROOT(_lv_sys_layer), &lv_style_transp_fit);
/*Refresh the screen*/ /*Refresh the screen*/
lv_obj_invalidate(act_scr); lv_obj_invalidate(LV_GC_ROOT(_lv_act_scr));
#if LV_INDEV_READ_PERIOD != 0 #if LV_INDEV_READ_PERIOD != 0
/*Init the input device handling*/ /*Init the input device handling*/
@@ -127,7 +132,7 @@ lv_obj_t * lv_obj_create(lv_obj_t * parent, const lv_obj_t * copy)
if(parent == NULL) { if(parent == NULL) {
LV_LOG_TRACE("Screen create started"); LV_LOG_TRACE("Screen create started");
new_obj = lv_ll_ins_head(&scr_ll); new_obj = lv_ll_ins_head(&LV_GC_ROOT(_lv_scr_ll));
lv_mem_assert(new_obj); lv_mem_assert(new_obj);
if(new_obj == NULL) return NULL; if(new_obj == NULL) return NULL;
@@ -350,7 +355,7 @@ lv_res_t lv_obj_del(lv_obj_t * obj)
/*Remove the object from parent's children list*/ /*Remove the object from parent's children list*/
lv_obj_t * par = lv_obj_get_parent(obj); lv_obj_t * par = lv_obj_get_parent(obj);
if(par == NULL) { /*It is a screen*/ if(par == NULL) { /*It is a screen*/
lv_ll_rem(&scr_ll, obj); lv_ll_rem(&LV_GC_ROOT(_lv_scr_ll), obj);
} else { } else {
lv_ll_rem(&(par->child_ll), obj); lv_ll_rem(&(par->child_ll), obj);
} }
@@ -406,7 +411,7 @@ void lv_obj_invalidate(const lv_obj_t * obj)
{ {
if(lv_obj_get_hidden(obj)) return; if(lv_obj_get_hidden(obj)) return;
/*Invalidate the object only if it belongs to the 'act_scr'*/ /*Invalidate the object only if it belongs to the 'LV_GC_ROOT(_lv_act_scr)'*/
lv_obj_t * obj_scr = lv_obj_get_screen(obj); lv_obj_t * obj_scr = lv_obj_get_screen(obj);
if(obj_scr == lv_scr_act() || if(obj_scr == lv_scr_act() ||
obj_scr == lv_layer_top() || obj_scr == lv_layer_top() ||
@@ -451,9 +456,9 @@ void lv_obj_invalidate(const lv_obj_t * obj)
*/ */
void lv_scr_load(lv_obj_t * scr) void lv_scr_load(lv_obj_t * scr)
{ {
act_scr = scr; LV_GC_ROOT(_lv_act_scr) = scr;
lv_obj_invalidate(act_scr); lv_obj_invalidate(LV_GC_ROOT(_lv_act_scr));
} }
/*-------------------- /*--------------------
@@ -1000,7 +1005,7 @@ void lv_obj_refresh_style(lv_obj_t * obj)
void lv_obj_report_style_mod(lv_style_t * style) void lv_obj_report_style_mod(lv_style_t * style)
{ {
lv_obj_t * i; lv_obj_t * i;
LL_READ(scr_ll, i) { LL_READ(LV_GC_ROOT(_lv_scr_ll), i) {
if(i->style_p == style || style == NULL) { if(i->style_p == style || style == NULL) {
lv_obj_refresh_style(i); lv_obj_refresh_style(i);
} }
@@ -1297,7 +1302,7 @@ void lv_obj_animate(lv_obj_t * obj, lv_anim_builtin_t type, uint16_t time, uint1
*/ */
lv_obj_t * lv_scr_act(void) lv_obj_t * lv_scr_act(void)
{ {
return act_scr; return LV_GC_ROOT(_lv_act_scr);
} }
/** /**
@@ -1306,7 +1311,7 @@ lv_obj_t * lv_scr_act(void)
*/ */
lv_obj_t * lv_layer_top(void) lv_obj_t * lv_layer_top(void)
{ {
return top_layer; return LV_GC_ROOT(_lv_top_layer);
} }
/** /**
@@ -1316,7 +1321,7 @@ lv_obj_t * lv_layer_top(void)
*/ */
lv_obj_t * lv_layer_sys(void) lv_obj_t * lv_layer_sys(void)
{ {
return sys_layer; return LV_GC_ROOT(_lv_sys_layer);
} }
/** /**

2
lv_core/lv_obj.h
View File

@@ -451,7 +451,7 @@ void lv_obj_set_drag_parent(lv_obj_t * obj, bool en);
* @param obj pointer to an object * @param obj pointer to an object
* @param en true: enable editing * @param en true: enable editing
*/ */
void lv_obj_set_editable(lv_obj_t * obj, bool en); //void lv_obj_set_editable(lv_obj_t * obj, bool en);
/** /**
* Set the opa scale enable parameter (required to set opa_scale with `lv_obj_set_opa_scale()`) * Set the opa scale enable parameter (required to set opa_scale with `lv_obj_set_opa_scale()`)

20
lv_hal/lv_hal_disp.c
View File

@@ -14,6 +14,12 @@
#include "../lv_hal/lv_hal_disp.h" #include "../lv_hal/lv_hal_disp.h"
#include "../lv_misc/lv_mem.h" #include "../lv_misc/lv_mem.h"
#include "../lv_core/lv_obj.h" #include "../lv_core/lv_obj.h"
#include "../lv_misc/lv_gc.h"
#if defined(LV_GC_INCLUDE)
# include LV_GC_INCLUDE
#endif /* LV_ENABLE_GC */
/********************* /*********************
* DEFINES * DEFINES
@@ -30,7 +36,6 @@
/********************** /**********************
* STATIC VARIABLES * STATIC VARIABLES
**********************/ **********************/
static lv_disp_t * disp_list = NULL;
static lv_disp_t * active; static lv_disp_t * active;
/********************** /**********************
@@ -49,6 +54,7 @@ static lv_disp_t * active;
*/ */
void lv_disp_drv_init(lv_disp_drv_t * driver) void lv_disp_drv_init(lv_disp_drv_t * driver)
{ {
LV_GC_ROOT(_lv_disp_list) = NULL;
driver->disp_fill = NULL; driver->disp_fill = NULL;
driver->disp_map = NULL; driver->disp_map = NULL;
driver->disp_flush = NULL; driver->disp_flush = NULL;
@@ -81,12 +87,12 @@ lv_disp_t * lv_disp_drv_register(lv_disp_drv_t * driver)
node->next = NULL; node->next = NULL;
/* Set first display as active by default */ /* Set first display as active by default */
if(disp_list == NULL) { if(LV_GC_ROOT(_lv_disp_list) == NULL) {
disp_list = node; LV_GC_ROOT(_lv_disp_list) = node;
active = node; active = node;
lv_obj_invalidate(lv_scr_act()); lv_obj_invalidate(lv_scr_act());
} else { } else {
disp_list->next = node; ((lv_disp_t*)LV_GC_ROOT(_lv_disp_list))->next = node;
} }
return node; return node;
@@ -120,10 +126,10 @@ lv_disp_t * lv_disp_get_active(void)
lv_disp_t * lv_disp_next(lv_disp_t * disp) lv_disp_t * lv_disp_next(lv_disp_t * disp)
{ {
if(disp == NULL) { if(disp == NULL) {
return disp_list; return LV_GC_ROOT(_lv_disp_list);
} else { } else {
if(disp_list->next == NULL) return NULL; if(((lv_disp_t*)LV_GC_ROOT(_lv_disp_list))->next == NULL) return NULL;
else return disp_list->next; else return ((lv_disp_t*)LV_GC_ROOT(_lv_disp_list))->next;
} }
} }

16
lv_hal/lv_hal_indev.c
View File

@@ -10,6 +10,12 @@
*********************/ *********************/
#include "../lv_hal/lv_hal_indev.h" #include "../lv_hal/lv_hal_indev.h"
#include "../lv_misc/lv_mem.h" #include "../lv_misc/lv_mem.h"
#include "../lv_misc/lv_gc.h"
#if defined(LV_GC_INCLUDE)
# include LV_GC_INCLUDE
#endif /* LV_ENABLE_GC */
/********************* /*********************
* DEFINES * DEFINES
@@ -22,7 +28,6 @@
/********************** /**********************
* STATIC PROTOTYPES * STATIC PROTOTYPES
**********************/ **********************/
static lv_indev_t * indev_list = NULL;
/********************** /**********************
* STATIC VARIABLES * STATIC VARIABLES
@@ -44,6 +49,7 @@ static lv_indev_t * indev_list = NULL;
*/ */
void lv_indev_drv_init(lv_indev_drv_t * driver) void lv_indev_drv_init(lv_indev_drv_t * driver)
{ {
LV_GC_ROOT(_lv_indev_list) = NULL;
driver->read = NULL; driver->read = NULL;
driver->type = LV_INDEV_TYPE_NONE; driver->type = LV_INDEV_TYPE_NONE;
driver->user_data = NULL; driver->user_data = NULL;
@@ -70,10 +76,10 @@ lv_indev_t * lv_indev_drv_register(lv_indev_drv_t * driver)
node->group = NULL; node->group = NULL;
node->btn_points = NULL; node->btn_points = NULL;
if(indev_list == NULL) { if(LV_GC_ROOT(_lv_indev_list) == NULL) {
indev_list = node; LV_GC_ROOT(_lv_indev_list) = node;
} else { } else {
lv_indev_t * last = indev_list; lv_indev_t * last = LV_GC_ROOT(_lv_indev_list);
while(last->next) while(last->next)
last = last->next; last = last->next;
@@ -92,7 +98,7 @@ lv_indev_t * lv_indev_next(lv_indev_t * indev)
{ {
if(indev == NULL) { if(indev == NULL) {
return indev_list; return LV_GC_ROOT(_lv_indev_list);
} else { } else {
if(indev->next == NULL) return NULL; if(indev->next == NULL) return NULL;
else return indev->next; else return indev->next;

31
lv_misc/lv_anim.c
View File

@@ -14,6 +14,12 @@
#include "../lv_hal/lv_hal_tick.h" #include "../lv_hal/lv_hal_tick.h"
#include "lv_task.h" #include "lv_task.h"
#include "lv_math.h" #include "lv_math.h"
#include "lv_gc.h"
#if defined(LV_GC_INCLUDE)
# include LV_GC_INCLUDE
#endif /* LV_ENABLE_GC */
/********************* /*********************
* DEFINES * DEFINES
@@ -34,7 +40,6 @@ static bool anim_ready_handler(lv_anim_t * a);
/********************** /**********************
* STATIC VARIABLES * STATIC VARIABLES
**********************/ **********************/
static lv_ll_t anim_ll;
static uint32_t last_task_run; static uint32_t last_task_run;
static bool anim_list_changed; static bool anim_list_changed;
@@ -51,7 +56,7 @@ static bool anim_list_changed;
*/ */
void lv_anim_init(void) void lv_anim_init(void)
{ {
lv_ll_init(&anim_ll, sizeof(lv_anim_t)); lv_ll_init(&LV_GC_ROOT(_lv_anim_ll), sizeof(lv_anim_t));
last_task_run = lv_tick_get(); last_task_run = lv_tick_get();
lv_task_create(anim_task, LV_REFR_PERIOD, LV_TASK_PRIO_MID, NULL); lv_task_create(anim_task, LV_REFR_PERIOD, LV_TASK_PRIO_MID, NULL);
} }
@@ -67,7 +72,7 @@ void lv_anim_create(lv_anim_t * anim_p)
if(anim_p->fp != NULL) lv_anim_del(anim_p->var, anim_p->fp); /*fp == NULL would delete all animations of var*/ if(anim_p->fp != NULL) lv_anim_del(anim_p->var, anim_p->fp); /*fp == NULL would delete all animations of var*/
/*Add the new animation to the animation linked list*/ /*Add the new animation to the animation linked list*/
lv_anim_t * new_anim = lv_ll_ins_head(&anim_ll); lv_anim_t * new_anim = lv_ll_ins_head(&LV_GC_ROOT(_lv_anim_ll));
lv_mem_assert(new_anim); lv_mem_assert(new_anim);
if(new_anim == NULL) return; if(new_anim == NULL) return;
@@ -97,13 +102,13 @@ bool lv_anim_del(void * var, lv_anim_fp_t fp)
lv_anim_t * a; lv_anim_t * a;
lv_anim_t * a_next; lv_anim_t * a_next;
bool del = false; bool del = false;
a = lv_ll_get_head(&anim_ll); a = lv_ll_get_head(&LV_GC_ROOT(_lv_anim_ll));
while(a != NULL) { while(a != NULL) {
/*'a' might be deleted, so get the next object while 'a' is valid*/ /*'a' might be deleted, so get the next object while 'a' is valid*/
a_next = lv_ll_get_next(&anim_ll, a); a_next = lv_ll_get_next(&LV_GC_ROOT(_lv_anim_ll), a);
if(a->var == var && (a->fp == fp || fp == NULL)) { if(a->var == var && (a->fp == fp || fp == NULL)) {
lv_ll_rem(&anim_ll, a); lv_ll_rem(&LV_GC_ROOT(_lv_anim_ll), a);
lv_mem_free(a); lv_mem_free(a);
anim_list_changed = true; /*Read by `anim_task`. It need to know if a delete occurred in the linked list*/ anim_list_changed = true; /*Read by `anim_task`. It need to know if a delete occurred in the linked list*/
del = true; del = true;
@@ -123,7 +128,7 @@ uint16_t lv_anim_count_running(void)
{ {
uint16_t cnt = 0; uint16_t cnt = 0;
lv_anim_t * a; lv_anim_t * a;
LL_READ(anim_ll, a) cnt++; LL_READ(LV_GC_ROOT(_lv_anim_ll), a) cnt++;
return cnt++; return cnt++;
} }
@@ -352,12 +357,12 @@ static void anim_task(void * param)
(void)param; (void)param;
lv_anim_t * a; lv_anim_t * a;
LL_READ(anim_ll, a) { LL_READ(LV_GC_ROOT(_lv_anim_ll), a) {
a->has_run = 0; a->has_run = 0;
} }
uint32_t elaps = lv_tick_elaps(last_task_run); uint32_t elaps = lv_tick_elaps(last_task_run);
a = lv_ll_get_head(&anim_ll); a = lv_ll_get_head(&LV_GC_ROOT(_lv_anim_ll));
while(a != NULL) { while(a != NULL) {
/*It can be set by `lv_anim_del()` typically in `end_cb`. If set then an animation delete happened in `anim_ready_handler` /*It can be set by `lv_anim_del()` typically in `end_cb`. If set then an animation delete happened in `anim_ready_handler`
@@ -385,8 +390,8 @@ static void anim_task(void * param)
/* If the linked list changed due to anim. delete then it's not safe to continue /* If the linked list changed due to anim. delete then it's not safe to continue
* the reading of the list from here -> start from the head*/ * the reading of the list from here -> start from the head*/
if(anim_list_changed) a = lv_ll_get_head(&anim_ll); if(anim_list_changed) a = lv_ll_get_head(&LV_GC_ROOT(_lv_anim_ll));
else a = lv_ll_get_next(&anim_ll, a); else a = lv_ll_get_next(&LV_GC_ROOT(_lv_anim_ll), a);
} }
last_task_run = lv_tick_get(); last_task_run = lv_tick_get();
@@ -396,7 +401,7 @@ static void anim_task(void * param)
* Called when an animation is ready to do the necessary thinks * Called when an animation is ready to do the necessary thinks
* e.g. repeat, play back, delete etc. * e.g. repeat, play back, delete etc.
* @param a pointer to an animation descriptor * @param a pointer to an animation descriptor
* @return true: animation delete occurred nnd the `anim_ll` has changed * @return true: animation delete occurred nnd the `LV_GC_ROOT(_lv_anim_ll)` has changed
* */ * */
static bool anim_ready_handler(lv_anim_t * a) static bool anim_ready_handler(lv_anim_t * a)
{ {
@@ -408,7 +413,7 @@ static bool anim_ready_handler(lv_anim_t * a)
(a->repeat == 0 && a->playback == 1 && a->playback_now == 1)) { (a->repeat == 0 && a->playback == 1 && a->playback_now == 1)) {
void (*cb)(void *) = a->end_cb; void (*cb)(void *) = a->end_cb;
void * p = a->var; void * p = a->var;
lv_ll_rem(&anim_ll, a); lv_ll_rem(&LV_GC_ROOT(_lv_anim_ll), a);
lv_mem_free(a); lv_mem_free(a);
anim_list_changed = true; anim_list_changed = true;

9
lv_misc/lv_color.h
View File

@@ -392,6 +392,7 @@ static inline uint8_t lv_color_brightness(lv_color_t color)
#endif #endif
#endif #endif
#define LV_COLOR_HEX(c) LV_COLOR_MAKE(((uint32_t)((uint32_t)c >> 16) & 0xFF), \ #define LV_COLOR_HEX(c) LV_COLOR_MAKE(((uint32_t)((uint32_t)c >> 16) & 0xFF), \
((uint32_t)((uint32_t)c >> 8) & 0xFF), \ ((uint32_t)((uint32_t)c >> 8) & 0xFF), \
((uint32_t) c & 0xFF)) ((uint32_t) c & 0xFF))
@@ -401,6 +402,14 @@ static inline uint8_t lv_color_brightness(lv_color_t color)
((uint32_t)(c & 0xF0) | ((c & 0xF0) >> 4)), \ ((uint32_t)(c & 0xF0) | ((c & 0xF0) >> 4)), \
((uint32_t)(c & 0xF) | ((c & 0xF) << 4))) ((uint32_t)(c & 0xF) | ((c & 0xF) << 4)))
static inline lv_color_t lv_color_hex(uint32_t c){
return LV_COLOR_HEX(c);
}
static inline lv_color_t lv_color_hex3(uint32_t c){
return LV_COLOR_HEX3(c);
}
/** /**
* Convert a HSV color to RGB * Convert a HSV color to RGB

14
lv_misc/lv_fs.c
View File

@@ -11,6 +11,11 @@
#include "lv_ll.h" #include "lv_ll.h"
#include <string.h> #include <string.h>
#include "lv_gc.h"
#if defined(LV_GC_INCLUDE)
# include LV_GC_INCLUDE
#endif /* LV_ENABLE_GC */
/********************* /*********************
* DEFINES * DEFINES
@@ -30,7 +35,6 @@ static lv_fs_drv_t * lv_fs_get_drv(char letter);
/********************** /**********************
* STATIC VARIABLES * STATIC VARIABLES
**********************/ **********************/
static lv_ll_t drv_ll;
/********************** /**********************
* MACROS * MACROS
@@ -45,7 +49,7 @@ static lv_ll_t drv_ll;
*/ */
void lv_fs_init(void) void lv_fs_init(void)
{ {
lv_ll_init(&drv_ll, sizeof(lv_fs_drv_t)); lv_ll_init(&LV_GC_ROOT(_lv_drv_ll), sizeof(lv_fs_drv_t));
} }
@@ -449,7 +453,7 @@ void lv_fs_add_drv(lv_fs_drv_t * drv_p)
{ {
/*Save the new driver*/ /*Save the new driver*/
lv_fs_drv_t * new_drv; lv_fs_drv_t * new_drv;
new_drv = lv_ll_ins_head(&drv_ll); new_drv = lv_ll_ins_head(&LV_GC_ROOT(_lv_drv_ll));
lv_mem_assert(new_drv); lv_mem_assert(new_drv);
if(new_drv == NULL) return; if(new_drv == NULL) return;
@@ -466,7 +470,7 @@ char * lv_fs_get_letters(char * buf)
lv_fs_drv_t * drv; lv_fs_drv_t * drv;
uint8_t i = 0; uint8_t i = 0;
LL_READ(drv_ll, drv) { LL_READ(LV_GC_ROOT(_lv_drv_ll), drv) {
buf[i] = drv->letter; buf[i] = drv->letter;
i++; i++;
} }
@@ -589,7 +593,7 @@ static lv_fs_drv_t * lv_fs_get_drv(char letter)
{ {
lv_fs_drv_t * drv; lv_fs_drv_t * drv;
LL_READ(drv_ll, drv) { LL_READ(LV_GC_ROOT(_lv_drv_ll), drv) {
if(drv->letter == letter) { if(drv->letter == letter) {
return drv; return drv;
} }

40
lv_misc/lv_gc.c Normal file
View File

@@ -0,0 +1,40 @@
/**
* @file lv_gc.c
*
*/
/*********************
* INCLUDES
*********************/
#include "lv_gc.h"
/*********************
* DEFINES
*********************/
/**********************
* TYPEDEFS
**********************/
/**********************
* STATIC PROTOTYPES
**********************/
/**********************
* STATIC VARIABLES
**********************/
#if (!defined(LV_ENABLE_GC)) || LV_ENABLE_GC == 0
LV_ROOTS
#endif /* LV_ENABLE_GC */
/**********************
* MACROS
**********************/
/**********************
* GLOBAL FUNCTIONS
**********************/
/**********************
* STATIC FUNCTIONS
**********************/

77
lv_misc/lv_gc.h Normal file
View File

@@ -0,0 +1,77 @@
/**
* @file lv_gc.h
*
*/
#ifndef LV_GC_H
#define LV_GC_H
#ifdef __cplusplus
extern "C" {
#endif
/*********************
* INCLUDES
*********************/
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"
#endif
#include <stdint.h>
#include <stdbool.h>
#include "lv_mem.h"
#include "lv_ll.h"
/*********************
* DEFINES
*********************/
#define LV_GC_ROOTS(prefix) \
prefix lv_ll_t _lv_task_ll; /*Linked list to store the lv_tasks*/ \
prefix lv_ll_t _lv_scr_ll; /*Linked list of screens*/ \
prefix lv_ll_t _lv_drv_ll;\
prefix lv_ll_t _lv_file_ll;\
prefix lv_ll_t _lv_anim_ll;\
prefix void * _lv_def_scr;\
prefix void * _lv_act_scr;\
prefix void * _lv_top_layer;\
prefix void * _lv_sys_layer;\
prefix void * _lv_task_act;\
prefix void * _lv_indev_list;\
prefix void * _lv_disp_list;\
#define LV_NO_PREFIX
#define LV_ROOTS LV_GC_ROOTS(LV_NO_PREFIX)
#if LV_ENABLE_GC == 1
# if LV_MEM_CUSTOM != 1
# error "GC requires CUSTOM_MEM"
# endif /* LV_MEM_CUSTOM */
#else /* LV_ENABLE_GC */
# define LV_GC_ROOT(x) x
LV_GC_ROOTS(extern)
#endif /* LV_ENABLE_GC */
/**********************
* TYPEDEFS
**********************/
/**********************
* GLOBAL PROTOTYPES
**********************/
/**********************
* MACROS
**********************/
#ifdef __cplusplus
} /* extern "C" */
#endif
#endif /*LV_GC_H*/

47
lv_misc/lv_mem.c
View File

@@ -32,6 +32,8 @@
* TYPEDEFS * TYPEDEFS
**********************/ **********************/
#if LV_ENABLE_GC == 0 /*gc custom allocations must not include header*/
/*The size of this union must be 4 bytes (uint32_t)*/ /*The size of this union must be 4 bytes (uint32_t)*/
typedef union { typedef union {
struct { struct {
@@ -46,6 +48,8 @@ typedef struct {
uint8_t first_data; /*First data byte in the allocated data (Just for easily create a pointer)*/ uint8_t first_data; /*First data byte in the allocated data (Just for easily create a pointer)*/
} lv_mem_ent_t; } lv_mem_ent_t;
#endif /* LV_ENABLE_GC */
/********************** /**********************
* STATIC PROTOTYPES * STATIC PROTOTYPES
**********************/ **********************/
@@ -128,11 +132,11 @@ void * lv_mem_alloc(uint32_t size)
//End if there is not next entry OR the alloc. is successful //End if there is not next entry OR the alloc. is successful
} while(e != NULL && alloc == NULL); } while(e != NULL && alloc == NULL);
#if LV_MEM_ADD_JUNK
if(alloc != NULL) memset(alloc, 0xaa, size);
#endif
#else /*Use custom, user defined malloc function*/ #else /*Use custom, user defined malloc function*/
#if LV_ENABLE_GC == 1 /*gc must not include header*/
alloc = LV_MEM_CUSTOM_ALLOC(size);
#else /* LV_ENABLE_GC */
/*Allocate a header too to store the size*/ /*Allocate a header too to store the size*/
alloc = LV_MEM_CUSTOM_ALLOC(size + sizeof(lv_mem_header_t)); alloc = LV_MEM_CUSTOM_ALLOC(size + sizeof(lv_mem_header_t));
if(alloc != NULL) { if(alloc != NULL) {
@@ -140,6 +144,11 @@ void * lv_mem_alloc(uint32_t size)
((lv_mem_ent_t *) alloc)->header.used = 1; ((lv_mem_ent_t *) alloc)->header.used = 1;
alloc = &((lv_mem_ent_t *) alloc)->first_data; alloc = &((lv_mem_ent_t *) alloc)->first_data;
} }
#endif /* LV_ENABLE_GC */
#endif /* LV_MEM_CUSTOM */
#if LV_MEM_ADD_JUNK
if(alloc != NULL) memset(alloc, 0xaa, size);
#endif #endif
if(alloc == NULL) LV_LOG_WARN("Couldn't allocate memory"); if(alloc == NULL) LV_LOG_WARN("Couldn't allocate memory");
@@ -161,9 +170,11 @@ void lv_mem_free(const void * data)
memset((void *)data, 0xbb, lv_mem_get_size(data)); memset((void *)data, 0xbb, lv_mem_get_size(data));
#endif #endif
#if LV_ENABLE_GC==0
/*e points to the header*/ /*e points to the header*/
lv_mem_ent_t * e = (lv_mem_ent_t *)((uint8_t *) data - sizeof(lv_mem_header_t)); lv_mem_ent_t * e = (lv_mem_ent_t *)((uint8_t *) data - sizeof(lv_mem_header_t));
e->header.used = 0; e->header.used = 0;
#endif
#if LV_MEM_CUSTOM == 0 #if LV_MEM_CUSTOM == 0
#if LV_MEM_AUTO_DEFRAG #if LV_MEM_AUTO_DEFRAG
@@ -181,7 +192,11 @@ void lv_mem_free(const void * data)
} }
#endif #endif
#else /*Use custom, user defined free function*/ #else /*Use custom, user defined free function*/
#if LV_ENABLE_GC==0
LV_MEM_CUSTOM_FREE(e); LV_MEM_CUSTOM_FREE(e);
#else
LV_MEM_CUSTOM_FREE((void*)data);
#endif /*LV_ENABLE_GC*/
#endif #endif
} }
@@ -192,6 +207,9 @@ void lv_mem_free(const void * data)
* @param new_size the desired new size in byte * @param new_size the desired new size in byte
* @return pointer to the new memory * @return pointer to the new memory
*/ */
#if LV_ENABLE_GC==0
void * lv_mem_realloc(void * data_p, uint32_t new_size) void * lv_mem_realloc(void * data_p, uint32_t new_size)
{ {
/*data_p could be previously freed pointer (in this case it is invalid)*/ /*data_p could be previously freed pointer (in this case it is invalid)*/
@@ -232,6 +250,17 @@ void * lv_mem_realloc(void * data_p, uint32_t new_size)
return new_p; return new_p;
} }
#else /* LV_ENABLE_GC */
void * lv_mem_realloc(void * data_p, uint32_t new_size)
{
void * new_p = LV_MEM_CUSTOM_REALLOC(data_p, new_size);
if(new_p == NULL) LV_LOG_WARN("Couldn't allocate memory");
return new_p;
}
#endif /* lv_enable_gc */
/** /**
* Join the adjacent free memory blocks * Join the adjacent free memory blocks
*/ */
@@ -314,6 +343,9 @@ void lv_mem_monitor(lv_mem_monitor_t * mon_p)
* @param data pointer to an allocated memory * @param data pointer to an allocated memory
* @return the size of data memory in bytes * @return the size of data memory in bytes
*/ */
#if LV_ENABLE_GC==0
uint32_t lv_mem_get_size(const void * data) uint32_t lv_mem_get_size(const void * data)
{ {
if(data == NULL) return 0; if(data == NULL) return 0;
@@ -324,6 +356,15 @@ uint32_t lv_mem_get_size(const void * data)
return e->header.d_size; return e->header.d_size;
} }
#else /* LV_ENABLE_GC */
uint32_t lv_mem_get_size(const void * data)
{
return LV_MEM_CUSTOM_GET_SIZE(data);
}
#endif /*LV_ENABLE_GC*/
/********************** /**********************
* STATIC FUNCTIONS * STATIC FUNCTIONS
**********************/ **********************/

271
lv_misc/lv_symbol_def.h
View File

@@ -22,115 +22,182 @@ extern "C" {
#if LV_TXT_UTF8 == 0 #if LV_TXT_UTF8 == 0
#define LV_SYMBOL_GLYPH_FIRST 0xC0 #define LV_SYMBOL_GLYPH_FIRST 0xC0
#define SYMBOL_AUDIO "\xC0" #define SYMBOL_AUDIO _SYMBOL_VALUE1(C0)
#define SYMBOL_VIDEO "\xC1" #define SYMBOL_VIDEO _SYMBOL_VALUE1(C1)
#define SYMBOL_LIST "\xC2" #define SYMBOL_LIST _SYMBOL_VALUE1(C2)
#define SYMBOL_OK "\xC3" #define SYMBOL_OK _SYMBOL_VALUE1(C3)
#define SYMBOL_CLOSE "\xC4" #define SYMBOL_CLOSE _SYMBOL_VALUE1(C4)
#define SYMBOL_POWER "\xC5" #define SYMBOL_POWER _SYMBOL_VALUE1(C5)
#define SYMBOL_SETTINGS "\xC6" #define SYMBOL_SETTINGS _SYMBOL_VALUE1(C6)
#define SYMBOL_TRASH "\xC7" #define SYMBOL_TRASH _SYMBOL_VALUE1(C7)
#define SYMBOL_HOME "\xC8" #define SYMBOL_HOME _SYMBOL_VALUE1(C8)
#define SYMBOL_DOWNLOAD "\xC9" #define SYMBOL_DOWNLOAD _SYMBOL_VALUE1(C9)
#define SYMBOL_DRIVE "\xCA" #define SYMBOL_DRIVE _SYMBOL_VALUE1(CA)
#define SYMBOL_REFRESH "\xCB" #define SYMBOL_REFRESH _SYMBOL_VALUE1(CB)
#define SYMBOL_MUTE "\xCC" #define SYMBOL_MUTE _SYMBOL_VALUE1(CC)
#define SYMBOL_VOLUME_MID "\xCD" #define SYMBOL_VOLUME_MID _SYMBOL_VALUE1(CD)
#define SYMBOL_VOLUME_MAX "\xCE" #define SYMBOL_VOLUME_MAX _SYMBOL_VALUE1(CE)
#define SYMBOL_IMAGE "\xCF" #define SYMBOL_IMAGE _SYMBOL_VALUE1(CF)
#define SYMBOL_EDIT "\xD0" #define SYMBOL_EDIT _SYMBOL_VALUE1(D0)
#define SYMBOL_PREV "\xD1" #define SYMBOL_PREV _SYMBOL_VALUE1(D1)
#define SYMBOL_PLAY "\xD2" #define SYMBOL_PLAY _SYMBOL_VALUE1(D2)
#define SYMBOL_PAUSE "\xD3" #define SYMBOL_PAUSE _SYMBOL_VALUE1(D3)
#define SYMBOL_STOP "\xD4" #define SYMBOL_STOP _SYMBOL_VALUE1(D4)
#define SYMBOL_NEXT "\xD5" #define SYMBOL_NEXT _SYMBOL_VALUE1(D5)
#define SYMBOL_EJECT "\xD6" #define SYMBOL_EJECT _SYMBOL_VALUE1(D6)
#define SYMBOL_LEFT "\xD7" #define SYMBOL_LEFT _SYMBOL_VALUE1(D7)
#define SYMBOL_RIGHT "\xD8" #define SYMBOL_RIGHT _SYMBOL_VALUE1(D8)
#define SYMBOL_PLUS "\xD9" #define SYMBOL_PLUS _SYMBOL_VALUE1(D9)
#define SYMBOL_MINUS "\xDA" #define SYMBOL_MINUS _SYMBOL_VALUE1(DA)
#define SYMBOL_WARNING "\xDB" #define SYMBOL_WARNING _SYMBOL_VALUE1(DB)
#define SYMBOL_SHUFFLE "\xDC" #define SYMBOL_SHUFFLE _SYMBOL_VALUE1(DC)
#define SYMBOL_UP "\xDD" #define SYMBOL_UP _SYMBOL_VALUE1(DD)
#define SYMBOL_DOWN "\xDE" #define SYMBOL_DOWN _SYMBOL_VALUE1(DE)
#define SYMBOL_LOOP "\xDF" #define SYMBOL_LOOP _SYMBOL_VALUE1(DF)
#define SYMBOL_DIRECTORY "\xE0" #define SYMBOL_DIRECTORY _SYMBOL_VALUE1(E0)
#define SYMBOL_UPLOAD "\xE1" #define SYMBOL_UPLOAD _SYMBOL_VALUE1(E1)
#define SYMBOL_CALL "\xE2" #define SYMBOL_CALL _SYMBOL_VALUE1(E2)
#define SYMBOL_CUT "\xE3" #define SYMBOL_CUT _SYMBOL_VALUE1(E3)
#define SYMBOL_COPY "\xE4" #define SYMBOL_COPY _SYMBOL_VALUE1(E4)
#define SYMBOL_SAVE "\xE5" #define SYMBOL_SAVE _SYMBOL_VALUE1(E5)
#define SYMBOL_CHARGE "\xE6" #define SYMBOL_CHARGE _SYMBOL_VALUE1(E6)
#define SYMBOL_BELL "\xE7" #define SYMBOL_BELL _SYMBOL_VALUE1(E7)
#define SYMBOL_KEYBOARD "\xE8" #define SYMBOL_KEYBOARD _SYMBOL_VALUE1(E8)
#define SYMBOL_GPS "\xE9" #define SYMBOL_GPS _SYMBOL_VALUE1(E9)
#define SYMBOL_FILE "\xEA" #define SYMBOL_FILE _SYMBOL_VALUE1(EA)
#define SYMBOL_WIFI "\xEB" #define SYMBOL_WIFI _SYMBOL_VALUE1(EB)
#define SYMBOL_BATTERY_FULL "\xEC" #define SYMBOL_BATTERY_FULL _SYMBOL_VALUE1(EC)
#define SYMBOL_BATTERY_3 "\xED" #define SYMBOL_BATTERY_3 _SYMBOL_VALUE1(ED)
#define SYMBOL_BATTERY_2 "\xEE" #define SYMBOL_BATTERY_2 _SYMBOL_VALUE1(EE)
#define SYMBOL_BATTERY_1 "\xEF" #define SYMBOL_BATTERY_1 _SYMBOL_VALUE1(EF)
#define SYMBOL_BATTERY_EMPTY "\xF0" #define SYMBOL_BATTERY_EMPTY _SYMBOL_VALUE1(F0)
#define SYMBOL_BLUETOOTH "\xF1" #define SYMBOL_BLUETOOTH _SYMBOL_VALUE1(F1)
#define LV_SYMBOL_GLYPH_LAST 0xF1 #define LV_SYMBOL_GLYPH_LAST 0xF1
#define SYMBOL_DUMMY "\xFF" /*Invalid symbol. If written before a string then `lv_img` will show it as a label*/ #define SYMBOL_DUMMY _SYMBOL_VALUE1(xFF) /*Invalid symbol. If written before a string then `lv_img` will show it as a label*/
#else #else
#define LV_SYMBOL_GLYPH_FIRST 0xF800 #define LV_SYMBOL_GLYPH_FIRST 0xF800
#define SYMBOL_AUDIO "\xEF\xA0\x80" #define SYMBOL_AUDIO _SYMBOL_VALUE3(EF,A0,80)
#define SYMBOL_VIDEO "\xEF\xA0\x81" #define SYMBOL_VIDEO _SYMBOL_VALUE3(EF,A0,81)
#define SYMBOL_LIST "\xEF\xA0\x82" #define SYMBOL_LIST _SYMBOL_VALUE3(EF,A0,82)
#define SYMBOL_OK "\xEF\xA0\x83" #define SYMBOL_OK _SYMBOL_VALUE3(EF,A0,83)
#define SYMBOL_CLOSE "\xEF\xA0\x84" #define SYMBOL_CLOSE _SYMBOL_VALUE3(EF,A0,84)
#define SYMBOL_POWER "\xEF\xA0\x85" #define SYMBOL_POWER _SYMBOL_VALUE3(EF,A0,85)
#define SYMBOL_SETTINGS "\xEF\xA0\x86" #define SYMBOL_SETTINGS _SYMBOL_VALUE3(EF,A0,86)
#define SYMBOL_TRASH "\xEF\xA0\x87" #define SYMBOL_TRASH _SYMBOL_VALUE3(EF,A0,87)
#define SYMBOL_HOME "\xEF\xA0\x88" #define SYMBOL_HOME _SYMBOL_VALUE3(EF,A0,88)
#define SYMBOL_DOWNLOAD "\xEF\xA0\x89" #define SYMBOL_DOWNLOAD _SYMBOL_VALUE3(EF,A0,89)
#define SYMBOL_DRIVE "\xEF\xA0\x8A" #define SYMBOL_DRIVE _SYMBOL_VALUE3(EF,A0,8A)
#define SYMBOL_REFRESH "\xEF\xA0\x8B" #define SYMBOL_REFRESH _SYMBOL_VALUE3(EF,A0,8B)
#define SYMBOL_MUTE "\xEF\xA0\x8C" #define SYMBOL_MUTE _SYMBOL_VALUE3(EF,A0,8C)
#define SYMBOL_VOLUME_MID "\xEF\xA0\x8D" #define SYMBOL_VOLUME_MID _SYMBOL_VALUE3(EF,A0,8D)
#define SYMBOL_VOLUME_MAX "\xEF\xA0\x8E" #define SYMBOL_VOLUME_MAX _SYMBOL_VALUE3(EF,A0,8E)
#define SYMBOL_IMAGE "\xEF\xA0\x8F" #define SYMBOL_IMAGE _SYMBOL_VALUE3(EF,A0,8F)
#define SYMBOL_EDIT "\xEF\xA0\x90" #define SYMBOL_EDIT _SYMBOL_VALUE3(EF,A0,90)
#define SYMBOL_PREV "\xEF\xA0\x91" #define SYMBOL_PREV _SYMBOL_VALUE3(EF,A0,91)
#define SYMBOL_PLAY "\xEF\xA0\x92" #define SYMBOL_PLAY _SYMBOL_VALUE3(EF,A0,92)
#define SYMBOL_PAUSE "\xEF\xA0\x93" #define SYMBOL_PAUSE _SYMBOL_VALUE3(EF,A0,93)
#define SYMBOL_STOP "\xEF\xA0\x94" #define SYMBOL_STOP _SYMBOL_VALUE3(EF,A0,94)
#define SYMBOL_NEXT "\xEF\xA0\x95" #define SYMBOL_NEXT _SYMBOL_VALUE3(EF,A0,95)
#define SYMBOL_EJECT "\xEF\xA0\x96" #define SYMBOL_EJECT _SYMBOL_VALUE3(EF,A0,96)
#define SYMBOL_LEFT "\xEF\xA0\x97" #define SYMBOL_LEFT _SYMBOL_VALUE3(EF,A0,97)
#define SYMBOL_RIGHT "\xEF\xA0\x98" #define SYMBOL_RIGHT _SYMBOL_VALUE3(EF,A0,98)
#define SYMBOL_PLUS "\xEF\xA0\x99" #define SYMBOL_PLUS _SYMBOL_VALUE3(EF,A0,99)
#define SYMBOL_MINUS "\xEF\xA0\x9A" #define SYMBOL_MINUS _SYMBOL_VALUE3(EF,A0,9A)
#define SYMBOL_WARNING "\xEF\xA0\x9B" #define SYMBOL_WARNING _SYMBOL_VALUE3(EF,A0,9B)
#define SYMBOL_SHUFFLE "\xEF\xA0\x9C" #define SYMBOL_SHUFFLE _SYMBOL_VALUE3(EF,A0,9C)
#define SYMBOL_UP "\xEF\xA0\x9D" #define SYMBOL_UP _SYMBOL_VALUE3(EF,A0,9D)
#define SYMBOL_DOWN "\xEF\xA0\x9E" #define SYMBOL_DOWN _SYMBOL_VALUE3(EF,A0,9E)
#define SYMBOL_LOOP "\xEF\xA0\x9F" #define SYMBOL_LOOP _SYMBOL_VALUE3(EF,A0,9F)
#define SYMBOL_DIRECTORY "\xEF\xA0\xA0" #define SYMBOL_DIRECTORY _SYMBOL_VALUE3(EF,A0,A0)
#define SYMBOL_UPLOAD "\xEF\xA0\xA1" #define SYMBOL_UPLOAD _SYMBOL_VALUE3(EF,A0,A1)
#define SYMBOL_CALL "\xEF\xA0\xA2" #define SYMBOL_CALL _SYMBOL_VALUE3(EF,A0,A2)
#define SYMBOL_CUT "\xEF\xA0\xA3" #define SYMBOL_CUT _SYMBOL_VALUE3(EF,A0,A3)
#define SYMBOL_COPY "\xEF\xA0\xA4" #define SYMBOL_COPY _SYMBOL_VALUE3(EF,A0,A4)
#define SYMBOL_SAVE "\xEF\xA0\xA5" #define SYMBOL_SAVE _SYMBOL_VALUE3(EF,A0,A5)
#define SYMBOL_CHARGE "\xEF\xA0\xA6" #define SYMBOL_CHARGE _SYMBOL_VALUE3(EF,A0,A6)
#define SYMBOL_BELL "\xEF\xA0\xA7" #define SYMBOL_BELL _SYMBOL_VALUE3(EF,A0,A7)
#define SYMBOL_KEYBOARD "\xEF\xA0\xA8" #define SYMBOL_KEYBOARD _SYMBOL_VALUE3(EF,A0,A8)
#define SYMBOL_GPS "\xEF\xA0\xA9" #define SYMBOL_GPS _SYMBOL_VALUE3(EF,A0,A9)
#define SYMBOL_FILE "\xEF\xA0\xAA" #define SYMBOL_FILE _SYMBOL_VALUE3(EF,A0,AA)
#define SYMBOL_WIFI "\xEF\xA0\xAB" #define SYMBOL_WIFI _SYMBOL_VALUE3(EF,A0,AB)
#define SYMBOL_BATTERY_FULL "\xEF\xA0\xAC" #define SYMBOL_BATTERY_FULL _SYMBOL_VALUE3(EF,A0,AC)
#define SYMBOL_BATTERY_3 "\xEF\xA0\xAD" #define SYMBOL_BATTERY_3 _SYMBOL_VALUE3(EF,A0,AD)
#define SYMBOL_BATTERY_2 "\xEF\xA0\xAE" #define SYMBOL_BATTERY_2 _SYMBOL_VALUE3(EF,A0,AE)
#define SYMBOL_BATTERY_1 "\xEF\xA0\xAF" #define SYMBOL_BATTERY_1 _SYMBOL_VALUE3(EF,A0,AF)
#define SYMBOL_BATTERY_EMPTY "\xEF\xA0\xB0" #define SYMBOL_BATTERY_EMPTY _SYMBOL_VALUE3(EF,A0,B0)
#define SYMBOL_BLUETOOTH "\xEF\xA0\xB1" #define SYMBOL_BLUETOOTH _SYMBOL_VALUE3(EF,A0,B1)
#define LV_SYMBOL_GLYPH_LAST 0xF831 #define LV_SYMBOL_GLYPH_LAST 0xF831
#define SYMBOL_DUMMY "\xEF\xA3\xBF" /*Invalid symbol at (U+F831). If written before a string then `lv_img` will show it as a label*/ #define SYMBOL_DUMMY _SYMBOL_VALUE3(EF,A3,BF) /*Invalid symbol at (U+F831). If written before a string then `lv_img` will show it as a label*/
#endif #endif
#define _SYMBOL_VALUE1(x) (0x ## x)
#define _SYMBOL_VALUE3(x, y, z) (0x ## z ## y ## x)
#define _SYMBOL_NUMSTR(sym) LV_ ## sym ## _NUMSTR = sym
enum
{
_SYMBOL_NUMSTR(SYMBOL_AUDIO),
_SYMBOL_NUMSTR(SYMBOL_VIDEO),
_SYMBOL_NUMSTR(SYMBOL_LIST),
_SYMBOL_NUMSTR(SYMBOL_OK),
_SYMBOL_NUMSTR(SYMBOL_CLOSE),
_SYMBOL_NUMSTR(SYMBOL_POWER),
_SYMBOL_NUMSTR(SYMBOL_SETTINGS),
_SYMBOL_NUMSTR(SYMBOL_TRASH),
_SYMBOL_NUMSTR(SYMBOL_HOME),
_SYMBOL_NUMSTR(SYMBOL_DOWNLOAD),
_SYMBOL_NUMSTR(SYMBOL_DRIVE),
_SYMBOL_NUMSTR(SYMBOL_REFRESH),
_SYMBOL_NUMSTR(SYMBOL_MUTE),
_SYMBOL_NUMSTR(SYMBOL_VOLUME_MID),
_SYMBOL_NUMSTR(SYMBOL_VOLUME_MAX),
_SYMBOL_NUMSTR(SYMBOL_IMAGE),
_SYMBOL_NUMSTR(SYMBOL_EDIT),
_SYMBOL_NUMSTR(SYMBOL_PREV),
_SYMBOL_NUMSTR(SYMBOL_PLAY),
_SYMBOL_NUMSTR(SYMBOL_PAUSE),
_SYMBOL_NUMSTR(SYMBOL_STOP),
_SYMBOL_NUMSTR(SYMBOL_NEXT),
_SYMBOL_NUMSTR(SYMBOL_EJECT),
_SYMBOL_NUMSTR(SYMBOL_LEFT),
_SYMBOL_NUMSTR(SYMBOL_RIGHT),
_SYMBOL_NUMSTR(SYMBOL_PLUS),
_SYMBOL_NUMSTR(SYMBOL_MINUS),
_SYMBOL_NUMSTR(SYMBOL_WARNING),
_SYMBOL_NUMSTR(SYMBOL_SHUFFLE),
_SYMBOL_NUMSTR(SYMBOL_UP),
_SYMBOL_NUMSTR(SYMBOL_DOWN),
_SYMBOL_NUMSTR(SYMBOL_LOOP),
_SYMBOL_NUMSTR(SYMBOL_DIRECTORY),
_SYMBOL_NUMSTR(SYMBOL_UPLOAD),
_SYMBOL_NUMSTR(SYMBOL_CALL),
_SYMBOL_NUMSTR(SYMBOL_CUT),
_SYMBOL_NUMSTR(SYMBOL_COPY),
_SYMBOL_NUMSTR(SYMBOL_SAVE),
_SYMBOL_NUMSTR(SYMBOL_CHARGE),
_SYMBOL_NUMSTR(SYMBOL_BELL),
_SYMBOL_NUMSTR(SYMBOL_KEYBOARD),
_SYMBOL_NUMSTR(SYMBOL_GPS),
_SYMBOL_NUMSTR(SYMBOL_FILE),
_SYMBOL_NUMSTR(SYMBOL_WIFI),
_SYMBOL_NUMSTR(SYMBOL_BATTERY_FULL),
_SYMBOL_NUMSTR(SYMBOL_BATTERY_3),
_SYMBOL_NUMSTR(SYMBOL_BATTERY_2),
_SYMBOL_NUMSTR(SYMBOL_BATTERY_1),
_SYMBOL_NUMSTR(SYMBOL_BATTERY_EMPTY),
_SYMBOL_NUMSTR(SYMBOL_BLUETOOTH),
_SYMBOL_NUMSTR(SYMBOL_DUMMY),
};
#undef _SYMBOL_VALUE1
#undef _SYMBOL_VALUE3
#define _SYMBOL_STR_(x) #x
#define _SYMBOL_STR(x) _SYMBOL_STR_(x)
#define _SYMBOL_CHAR(c) \x ## c
#define _SYMBOL_VALUE1(x) _SYMBOL_STR(_SYMBOL_CHAR(x))
#define _SYMBOL_VALUE3(x, y, z) _SYMBOL_STR(_SYMBOL_CHAR(x)_SYMBOL_CHAR(y)_SYMBOL_CHAR(z))
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */

57
lv_misc/lv_task.c
View File

@@ -10,6 +10,11 @@
#include <stddef.h> #include <stddef.h>
#include "lv_task.h" #include "lv_task.h"
#include "../lv_hal/lv_hal_tick.h" #include "../lv_hal/lv_hal_tick.h"
#include "lv_gc.h"
#if defined(LV_GC_INCLUDE)
# include LV_GC_INCLUDE
#endif /* LV_ENABLE_GC */
/********************* /*********************
* DEFINES * DEFINES
@@ -28,12 +33,10 @@ static bool lv_task_exec(lv_task_t * lv_task_p);
/********************** /**********************
* STATIC VARIABLES * STATIC VARIABLES
**********************/ **********************/
static lv_ll_t lv_task_ll; /*Linked list to store the lv_tasks*/
static bool lv_task_run = false; static bool lv_task_run = false;
static uint8_t idle_last = 0; static uint8_t idle_last = 0;
static bool task_deleted; static bool task_deleted;
static bool task_created; static bool task_created;
static lv_task_t * task_act;
/********************** /**********************
* MACROS * MACROS
@@ -48,7 +51,7 @@ static lv_task_t * task_act;
*/ */
void lv_task_init(void) void lv_task_init(void)
{ {
lv_ll_init(&lv_task_ll, sizeof(lv_task_t)); lv_ll_init(&LV_GC_ROOT(_lv_task_ll), sizeof(lv_task_t));
/*Initially enable the lv_task handling*/ /*Initially enable the lv_task handling*/
lv_task_enable(true); lv_task_enable(true);
@@ -84,33 +87,33 @@ LV_ATTRIBUTE_TASK_HANDLER void lv_task_handler(void)
end_flag = true; end_flag = true;
task_deleted = false; task_deleted = false;
task_created = false; task_created = false;
task_act = lv_ll_get_head(&lv_task_ll); LV_GC_ROOT(_lv_task_act) = lv_ll_get_head(&LV_GC_ROOT(_lv_task_ll));
while(task_act) { while(LV_GC_ROOT(_lv_task_act)) {
/* The task might be deleted if it runs only once ('once = 1') /* The task might be deleted if it runs only once ('once = 1')
* So get next element until the current is surely valid*/ * So get next element until the current is surely valid*/
next = lv_ll_get_next(&lv_task_ll, task_act); next = lv_ll_get_next(&LV_GC_ROOT(_lv_task_ll), LV_GC_ROOT(_lv_task_act));
/*We reach priority of the turned off task. There is nothing more to do.*/ /*We reach priority of the turned off task. There is nothing more to do.*/
if(task_act->prio == LV_TASK_PRIO_OFF) { if(((lv_task_t *)LV_GC_ROOT(_lv_task_act))->prio == LV_TASK_PRIO_OFF) {
break; break;
} }
/*Here is the interrupter task. Don't execute it again.*/ /*Here is the interrupter task. Don't execute it again.*/
if(task_act == task_interrupter) { if(LV_GC_ROOT(_lv_task_act) == task_interrupter) {
task_interrupter = NULL; /*From this point only task after the interrupter comes, so the interrupter is not interesting anymore*/ task_interrupter = NULL; /*From this point only task after the interrupter comes, so the interrupter is not interesting anymore*/
task_act = next; LV_GC_ROOT(_lv_task_act) = next;
continue; /*Load the next task*/ continue; /*Load the next task*/
} }
/*Just try to run the tasks with highest priority.*/ /*Just try to run the tasks with highest priority.*/
if(task_act->prio == LV_TASK_PRIO_HIGHEST) { if(((lv_task_t *)LV_GC_ROOT(_lv_task_act))->prio == LV_TASK_PRIO_HIGHEST) {
lv_task_exec(task_act); lv_task_exec(LV_GC_ROOT(_lv_task_act));
} }
/*Tasks with higher priority then the interrupted shall be run in every case*/ /*Tasks with higher priority then the interrupted shall be run in every case*/
else if(task_interrupter) { else if(task_interrupter) {
if(task_act->prio > task_interrupter->prio) { if(((lv_task_t *)LV_GC_ROOT(_lv_task_act))->prio > task_interrupter->prio) {
if(lv_task_exec(task_act)) { if(lv_task_exec(LV_GC_ROOT(_lv_task_act))) {
task_interrupter = task_act; /*Check all tasks again from the highest priority */ task_interrupter = LV_GC_ROOT(_lv_task_act); /*Check all tasks again from the highest priority */
end_flag = false; end_flag = false;
break; break;
} }
@@ -119,8 +122,8 @@ LV_ATTRIBUTE_TASK_HANDLER void lv_task_handler(void)
/* It is no interrupter task or we already reached it earlier. /* It is no interrupter task or we already reached it earlier.
* Just run the remaining tasks*/ * Just run the remaining tasks*/
else { else {
if(lv_task_exec(task_act)) { if(lv_task_exec(LV_GC_ROOT(_lv_task_act))) {
task_interrupter = task_act; /*Check all tasks again from the highest priority */ task_interrupter = LV_GC_ROOT(_lv_task_act); /*Check all tasks again from the highest priority */
end_flag = false; end_flag = false;
break; break;
} }
@@ -129,7 +132,7 @@ LV_ATTRIBUTE_TASK_HANDLER void lv_task_handler(void)
if(task_deleted) break; /*If a task was deleted then this or the next item might be corrupted*/ if(task_deleted) break; /*If a task was deleted then this or the next item might be corrupted*/
if(task_created) break; /*If a task was deleted then this or the next item might be corrupted*/ if(task_created) break; /*If a task was deleted then this or the next item might be corrupted*/
task_act = next; /*Load the next task*/ LV_GC_ROOT(_lv_task_act) = next; /*Load the next task*/
} }
} while(!end_flag); } while(!end_flag);
@@ -164,24 +167,24 @@ lv_task_t * lv_task_create(void (*task)(void *), uint32_t period, lv_task_prio_t
lv_task_t * tmp; lv_task_t * tmp;
/*Create task lists in order of priority from high to low*/ /*Create task lists in order of priority from high to low*/
tmp = lv_ll_get_head(&lv_task_ll); tmp = lv_ll_get_head(&LV_GC_ROOT(_lv_task_ll));
if(NULL == tmp) { /*First task*/ if(NULL == tmp) { /*First task*/
new_lv_task = lv_ll_ins_head(&lv_task_ll); new_lv_task = lv_ll_ins_head(&LV_GC_ROOT(_lv_task_ll));
lv_mem_assert(new_lv_task); lv_mem_assert(new_lv_task);
if(new_lv_task == NULL) return NULL; if(new_lv_task == NULL) return NULL;
} else { } else {
do { do {
if(tmp->prio <= prio) { if(tmp->prio <= prio) {
new_lv_task = lv_ll_ins_prev(&lv_task_ll, tmp); new_lv_task = lv_ll_ins_prev(&LV_GC_ROOT(_lv_task_ll), tmp);
lv_mem_assert(new_lv_task); lv_mem_assert(new_lv_task);
if(new_lv_task == NULL) return NULL; if(new_lv_task == NULL) return NULL;
break; break;
} }
tmp = lv_ll_get_next(&lv_task_ll, tmp); tmp = lv_ll_get_next(&LV_GC_ROOT(_lv_task_ll), tmp);
} while(tmp != NULL); } while(tmp != NULL);
if(tmp == NULL) { /*Only too high priority tasks were found*/ if(tmp == NULL) { /*Only too high priority tasks were found*/
new_lv_task = lv_ll_ins_tail(&lv_task_ll); new_lv_task = lv_ll_ins_tail(&LV_GC_ROOT(_lv_task_ll));
lv_mem_assert(new_lv_task); lv_mem_assert(new_lv_task);
if(new_lv_task == NULL) return NULL; if(new_lv_task == NULL) return NULL;
} }
@@ -205,11 +208,11 @@ lv_task_t * lv_task_create(void (*task)(void *), uint32_t period, lv_task_prio_t
*/ */
void lv_task_del(lv_task_t * lv_task_p) void lv_task_del(lv_task_t * lv_task_p)
{ {
lv_ll_rem(&lv_task_ll, lv_task_p); lv_ll_rem(&LV_GC_ROOT(_lv_task_ll), lv_task_p);
lv_mem_free(lv_task_p); lv_mem_free(lv_task_p);
if(task_act == lv_task_p) task_deleted = true; /*The active task was deleted*/ if(LV_GC_ROOT(_lv_task_act) == lv_task_p) task_deleted = true; /*The active task was deleted*/
} }
/** /**
@@ -221,16 +224,16 @@ void lv_task_set_prio(lv_task_t * lv_task_p, lv_task_prio_t prio)
{ {
/*Find the tasks with new priority*/ /*Find the tasks with new priority*/
lv_task_t * i; lv_task_t * i;
LL_READ(lv_task_ll, i) { LL_READ(LV_GC_ROOT(_lv_task_ll), i) {
if(i->prio <= prio) { if(i->prio <= prio) {
if(i != lv_task_p) lv_ll_move_before(&lv_task_ll, lv_task_p, i); if(i != lv_task_p) lv_ll_move_before(&LV_GC_ROOT(_lv_task_ll), lv_task_p, i);
break; break;
} }
} }
/*There was no such a low priority so far then add the node to the tail*/ /*There was no such a low priority so far then add the node to the tail*/
if(i == NULL) { if(i == NULL) {
lv_ll_move_before(&lv_task_ll, lv_task_p, NULL); lv_ll_move_before(&LV_GC_ROOT(_lv_task_ll), lv_task_p, NULL);
} }

19
lv_misc/lv_ufs.c
View File

@@ -14,6 +14,12 @@
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include <errno.h> #include <errno.h>
#include "lv_gc.h"
#if defined(LV_GC_INCLUDE)
# include LV_GC_INCLUDE
#endif /* LV_ENABLE_GC */
/********************* /*********************
* DEFINES * DEFINES
@@ -32,7 +38,6 @@ static lv_ufs_ent_t * lv_ufs_ent_new(const char * fn);
/********************** /**********************
* STATIC VARIABLES * STATIC VARIABLES
**********************/ **********************/
static lv_ll_t file_ll;
static bool inited = false; static bool inited = false;
/********************** /**********************
@@ -48,7 +53,7 @@ static bool inited = false;
*/ */
void lv_ufs_init(void) void lv_ufs_init(void)
{ {
lv_ll_init(&file_ll, sizeof(lv_ufs_ent_t)); lv_ll_init(&LV_GC_ROOT(_lv_file_ll), sizeof(lv_ufs_ent_t));
lv_fs_drv_t ufs_drv; lv_fs_drv_t ufs_drv;
memset(&ufs_drv, 0, sizeof(lv_fs_drv_t)); /*Initialization*/ memset(&ufs_drv, 0, sizeof(lv_fs_drv_t)); /*Initialization*/
@@ -202,7 +207,7 @@ lv_fs_res_t lv_ufs_remove(const char * fn)
/*Can not be deleted is opened*/ /*Can not be deleted is opened*/
if(ent->oc != 0) return LV_FS_RES_DENIED; if(ent->oc != 0) return LV_FS_RES_DENIED;
lv_ll_rem(&file_ll, ent); lv_ll_rem(&LV_GC_ROOT(_lv_file_ll), ent);
lv_mem_free(ent->fn_d); lv_mem_free(ent->fn_d);
ent->fn_d = NULL; ent->fn_d = NULL;
if(ent->const_data == 0) { if(ent->const_data == 0) {
@@ -412,9 +417,9 @@ lv_fs_res_t lv_ufs_dir_read(void * dir_p, char * fn)
lv_ufs_dir_t * ufs_dir_p = dir_p; lv_ufs_dir_t * ufs_dir_p = dir_p;
if(ufs_dir_p->last_ent == NULL) { if(ufs_dir_p->last_ent == NULL) {
ufs_dir_p->last_ent = lv_ll_get_head(&file_ll); ufs_dir_p->last_ent = lv_ll_get_head(&LV_GC_ROOT(_lv_file_ll));
} else { } else {
ufs_dir_p->last_ent = lv_ll_get_next(&file_ll, ufs_dir_p->last_ent); ufs_dir_p->last_ent = lv_ll_get_next(&LV_GC_ROOT(_lv_file_ll), ufs_dir_p->last_ent);
} }
if(ufs_dir_p->last_ent != NULL) { if(ufs_dir_p->last_ent != NULL) {
@@ -472,7 +477,7 @@ static lv_ufs_ent_t * lv_ufs_ent_get(const char * fn)
{ {
lv_ufs_ent_t * fp; lv_ufs_ent_t * fp;
LL_READ(file_ll, fp) { LL_READ(LV_GC_ROOT(_lv_file_ll), fp) {
if(strcmp(fp->fn_d, fn) == 0) { if(strcmp(fp->fn_d, fn) == 0) {
return fp; return fp;
} }
@@ -490,7 +495,7 @@ static lv_ufs_ent_t * lv_ufs_ent_get(const char * fn)
static lv_ufs_ent_t * lv_ufs_ent_new(const char * fn) static lv_ufs_ent_t * lv_ufs_ent_new(const char * fn)
{ {
lv_ufs_ent_t * new_ent = NULL; lv_ufs_ent_t * new_ent = NULL;
new_ent = lv_ll_ins_head(&file_ll); /*Create a new file*/ new_ent = lv_ll_ins_head(&LV_GC_ROOT(_lv_file_ll)); /*Create a new file*/
lv_mem_assert(new_ent); lv_mem_assert(new_ent);
if(new_ent == NULL) return NULL; if(new_ent == NULL) return NULL;

2
lv_objx/lv_calendar.c
View File

@@ -14,7 +14,7 @@
#include "../lv_misc/lv_math.h" #include "../lv_misc/lv_math.h"
#include "../lv_core/lv_indev.h" #include "../lv_core/lv_indev.h"
#include "../lv_themes/lv_theme.h" #include "../lv_themes/lv_theme.h"
#include <strings.h> #include <string.h>
/********************* /*********************
* DEFINES * DEFINES

6
lv_objx/lv_canvas.c
View File

@@ -77,7 +77,7 @@ lv_obj_t * lv_canvas_create(lv_obj_t * par, const lv_obj_t * copy)
} }
/*Copy an existing canvas*/ /*Copy an existing canvas*/
else { else {
lv_canvas_ext_t * copy_ext = lv_obj_get_ext_attr(copy); //lv_canvas_ext_t * copy_ext = lv_obj_get_ext_attr(copy);
/*Refresh the style with new signal function*/ /*Refresh the style with new signal function*/
lv_obj_refresh_style(new_canvas); lv_obj_refresh_style(new_canvas);
@@ -158,7 +158,7 @@ void lv_canvas_copy_buf(lv_obj_t * canvas, void * to_copy, lv_coord_t w, lv_coor
uint8_t * to_copy8 = (uint8_t *) to_copy; uint8_t * to_copy8 = (uint8_t *) to_copy;
lv_coord_t i; lv_coord_t i;
for(i = 0; i < h; i++) { for(i = 0; i < h; i++) {
memcpy(&ext->dsc.data[px], to_copy8, w * px_size); memcpy((void*)&ext->dsc.data[px], to_copy8, w * px_size);
px += ext->dsc.header.w * px_size; px += ext->dsc.header.w * px_size;
to_copy8 += w * px_size; to_copy8 += w * px_size;
} }
@@ -263,7 +263,7 @@ void lv_canvas_set_style(lv_obj_t * canvas, lv_canvas_style_t type, lv_style_t *
*/ */
lv_style_t * lv_canvas_get_style(const lv_obj_t * canvas, lv_canvas_style_t type) lv_style_t * lv_canvas_get_style(const lv_obj_t * canvas, lv_canvas_style_t type)
{ {
lv_canvas_ext_t * ext = lv_obj_get_ext_attr(canvas); // lv_canvas_ext_t * ext = lv_obj_get_ext_attr(canvas);
lv_style_t * style = NULL; lv_style_t * style = NULL;
switch(type) { switch(type) {

2
lv_objx/lv_ddlist.c
View File

@@ -16,7 +16,7 @@
#include "../lv_themes/lv_theme.h" #include "../lv_themes/lv_theme.h"
#include "../lv_misc/lv_symbol_def.h" #include "../lv_misc/lv_symbol_def.h"
#include "../lv_misc/lv_anim.h" #include "../lv_misc/lv_anim.h"
#include <strings.h> #include <string.h>
/********************* /*********************
* DEFINES * DEFINES

2
lv_objx/lv_ta.h
View File

@@ -264,7 +264,7 @@ uint16_t lv_ta_get_cursor_pos(const lv_obj_t * ta);
* @param ta pointer to a text area object * @param ta pointer to a text area object
* @return true: the cursor is drawn, false: the cursor is hidden * @return true: the cursor is drawn, false: the cursor is hidden
*/ */
bool lv_ta_get_cursor_show(const lv_obj_t * ta); //bool lv_ta_get_cursor_show(const lv_obj_t * ta);
/** /**
* Get the current cursor type. * Get the current cursor type.