chore(format) add formatting for examples & demos, merge test config

This commit is contained in:
embeddedt
2022-02-13 13:59:17 -05:00
parent ba38a4bb76
commit 9771050b99
85 changed files with 2438 additions and 2388 deletions

View File

@@ -56,7 +56,7 @@ typedef struct {
uint32_t fps_normal; uint32_t fps_normal;
uint32_t fps_opa; uint32_t fps_opa;
uint8_t weight; uint8_t weight;
}scene_dsc_t; } scene_dsc_t;
/********************** /**********************
* STATIC PROTOTYPES * STATIC PROTOTYPES
@@ -662,12 +662,13 @@ static void monitor_cb(lv_disp_drv_t * drv, uint32_t time, uint32_t px)
if(opa_mode) { if(opa_mode) {
scenes[scene_act].refr_cnt_opa ++; scenes[scene_act].refr_cnt_opa ++;
scenes[scene_act].time_sum_opa += time; scenes[scene_act].time_sum_opa += time;
} else { }
else {
scenes[scene_act].refr_cnt_normal ++; scenes[scene_act].refr_cnt_normal ++;
scenes[scene_act].time_sum_normal += time; scenes[scene_act].time_sum_normal += time;
} }
// lv_obj_invalidate(lv_scr_act()); // lv_obj_invalidate(lv_scr_act());
} }
static void scene_next_task_cb(lv_timer_t * timer) static void scene_next_task_cb(lv_timer_t * timer)
@@ -680,24 +681,31 @@ static void scene_next_task_cb(lv_timer_t * timer)
if(scenes[scene_act].time_sum_opa == 0) scenes[scene_act].time_sum_opa = 1; if(scenes[scene_act].time_sum_opa == 0) scenes[scene_act].time_sum_opa = 1;
scenes[scene_act].fps_opa = (1000 * scenes[scene_act].refr_cnt_opa) / scenes[scene_act].time_sum_opa; scenes[scene_act].fps_opa = (1000 * scenes[scene_act].refr_cnt_opa) / scenes[scene_act].time_sum_opa;
if(scenes[scene_act].create_cb) scene_act++; /*If still there are scenes go to the next*/ if(scenes[scene_act].create_cb) scene_act++; /*If still there are scenes go to the next*/
} else { }
else {
scene_act ++; scene_act ++;
} }
opa_mode = false; opa_mode = false;
} else { }
else {
if(scenes[scene_act].time_sum_normal == 0) scenes[scene_act].time_sum_normal = 1; if(scenes[scene_act].time_sum_normal == 0) scenes[scene_act].time_sum_normal = 1;
scenes[scene_act].fps_normal = (1000 * scenes[scene_act].refr_cnt_normal) / scenes[scene_act].time_sum_normal; scenes[scene_act].fps_normal = (1000 * scenes[scene_act].refr_cnt_normal) / scenes[scene_act].time_sum_normal;
opa_mode = true; opa_mode = true;
} }
if(scenes[scene_act].create_cb) { if(scenes[scene_act].create_cb) {
lv_label_set_text_fmt(title, "%"LV_PRId32"/%d: %s%s", scene_act * 2 + (opa_mode ? 1 : 0), (sizeof(scenes) / sizeof(scene_dsc_t) * 2) - 2, scenes[scene_act].name, opa_mode ? " + opa" : ""); lv_label_set_text_fmt(title, "%"LV_PRId32"/%d: %s%s", scene_act * 2 + (opa_mode ? 1 : 0),
(sizeof(scenes) / sizeof(scene_dsc_t) * 2) - 2, scenes[scene_act].name, opa_mode ? " + opa" : "");
if(opa_mode) { if(opa_mode) {
lv_label_set_text_fmt(subtitle, "Result of \"%s\": %"LV_PRId32" FPS", scenes[scene_act].name, scenes[scene_act].fps_normal); lv_label_set_text_fmt(subtitle, "Result of \"%s\": %"LV_PRId32" FPS", scenes[scene_act].name,
} else { scenes[scene_act].fps_normal);
}
else {
if(scene_act > 0) { if(scene_act > 0) {
lv_label_set_text_fmt(subtitle, "Result of \"%s + opa\": %"LV_PRId32" FPS", scenes[scene_act - 1].name, scenes[scene_act - 1].fps_opa); lv_label_set_text_fmt(subtitle, "Result of \"%s + opa\": %"LV_PRId32" FPS", scenes[scene_act - 1].name,
} else { scenes[scene_act - 1].fps_opa);
}
else {
lv_label_set_text(subtitle, ""); lv_label_set_text(subtitle, "");
} }
} }
@@ -750,36 +758,36 @@ static void scene_next_task_cb(lv_timer_t * timer)
lv_coord_t w = lv_obj_get_content_width(lv_scr_act()); lv_coord_t w = lv_obj_get_content_width(lv_scr_act());
lv_obj_t * table = lv_table_create(lv_scr_act()); lv_obj_t * table = lv_table_create(lv_scr_act());
// lv_obj_clean_style_list(table, LV_PART_MAIN); // lv_obj_clean_style_list(table, LV_PART_MAIN);
lv_table_set_col_cnt(table, 2); lv_table_set_col_cnt(table, 2);
lv_table_set_col_width(table, 0, (w * 3) / 4 - 3); lv_table_set_col_width(table, 0, (w * 3) / 4 - 3);
lv_table_set_col_width(table, 1, w / 4 - 3); lv_table_set_col_width(table, 1, w / 4 - 3);
lv_obj_set_width(table, lv_pct(100)); lv_obj_set_width(table, lv_pct(100));
// static lv_style_t style_cell_slow; // static lv_style_t style_cell_slow;
// static lv_style_t style_cell_very_slow; // static lv_style_t style_cell_very_slow;
// static lv_style_t style_cell_title; // static lv_style_t style_cell_title;
// //
// lv_style_init(&style_cell_title); // lv_style_init(&style_cell_title);
// lv_style_set_bg_color(&style_cell_title, LV_STATE_DEFAULT, lv_palette_main(LV_PALETTE_GREY)); // lv_style_set_bg_color(&style_cell_title, LV_STATE_DEFAULT, lv_palette_main(LV_PALETTE_GREY));
// lv_style_set_bg_opa(&style_cell_title, LV_STATE_DEFAULT, LV_OPA_50); // lv_style_set_bg_opa(&style_cell_title, LV_STATE_DEFAULT, LV_OPA_50);
// //
// lv_style_init(&style_cell_slow); // lv_style_init(&style_cell_slow);
// lv_style_set_text_color(&style_cell_slow, LV_STATE_DEFAULT, LV_COLOR_ORANGE); // lv_style_set_text_color(&style_cell_slow, LV_STATE_DEFAULT, LV_COLOR_ORANGE);
// //
// lv_style_init(&style_cell_very_slow); // lv_style_init(&style_cell_very_slow);
// lv_style_set_text_color(&style_cell_very_slow, LV_STATE_DEFAULT, lv_palette_main(LV_PALETTE_RED)); // lv_style_set_text_color(&style_cell_very_slow, LV_STATE_DEFAULT, lv_palette_main(LV_PALETTE_RED));
// lv_obj_add_style(table, LV_TABLE_PART_CELL2, &style_cell_slow); // lv_obj_add_style(table, LV_TABLE_PART_CELL2, &style_cell_slow);
// lv_obj_add_style(table, LV_TABLE_PART_CELL3, &style_cell_very_slow); // lv_obj_add_style(table, LV_TABLE_PART_CELL3, &style_cell_very_slow);
// lv_obj_add_style(table, LV_TABLE_PART_CELL4, &style_cell_title); // lv_obj_add_style(table, LV_TABLE_PART_CELL4, &style_cell_title);
uint16_t row = 0; uint16_t row = 0;
lv_table_add_cell_ctrl(table, row, 0, LV_TABLE_CELL_CTRL_MERGE_RIGHT); lv_table_add_cell_ctrl(table, row, 0, LV_TABLE_CELL_CTRL_MERGE_RIGHT);
lv_table_set_cell_value(table, row, 0, "Slow but common cases"); lv_table_set_cell_value(table, row, 0, "Slow but common cases");
// lv_table_set_cell_type(table, row, 0, 4); // lv_table_set_cell_type(table, row, 0, 4);
LV_LOG("\r\n" LV_LOG("\r\n"
"LVGL v%d.%d.%d " LVGL_VERSION_INFO "LVGL v%d.%d.%d " LVGL_VERSION_INFO
@@ -796,8 +804,8 @@ static void scene_next_task_cb(lv_timer_t * timer)
lv_snprintf(buf, sizeof(buf), "%"LV_PRIu32, scenes[i].fps_normal); lv_snprintf(buf, sizeof(buf), "%"LV_PRIu32, scenes[i].fps_normal);
lv_table_set_cell_value(table, row, 1, buf); lv_table_set_cell_value(table, row, 1, buf);
// lv_table_set_cell_type(table, row, 0, 2); // lv_table_set_cell_type(table, row, 0, 2);
// lv_table_set_cell_type(table, row, 1, 2); // lv_table_set_cell_type(table, row, 1, 2);
LV_LOG("%s,%s\r\n", scenes[i].name, buf); LV_LOG("%s,%s\r\n", scenes[i].name, buf);
@@ -813,8 +821,8 @@ static void scene_next_task_cb(lv_timer_t * timer)
lv_snprintf(buf, sizeof(buf), "%"LV_PRIu32, scenes[i].fps_opa); lv_snprintf(buf, sizeof(buf), "%"LV_PRIu32, scenes[i].fps_opa);
lv_table_set_cell_value(table, row, 1, buf); lv_table_set_cell_value(table, row, 1, buf);
// lv_table_set_cell_type(table, row, 0, 2); // lv_table_set_cell_type(table, row, 0, 2);
// lv_table_set_cell_type(table, row, 1, 2); // lv_table_set_cell_type(table, row, 1, 2);
LV_LOG("%s\r\n", buf); LV_LOG("%s\r\n", buf);
row++; row++;
@@ -830,7 +838,7 @@ static void scene_next_task_cb(lv_timer_t * timer)
lv_table_add_cell_ctrl(table, row, 0, LV_TABLE_CELL_CTRL_MERGE_RIGHT); lv_table_add_cell_ctrl(table, row, 0, LV_TABLE_CELL_CTRL_MERGE_RIGHT);
lv_table_set_cell_value(table, row, 0, "All cases"); lv_table_set_cell_value(table, row, 0, "All cases");
// lv_table_set_cell_type(table, row, 0, 4); // lv_table_set_cell_type(table, row, 0, 4);
row++; row++;
for(i = 0; i < sizeof(scenes) / sizeof(scene_dsc_t) - 1; i++) { for(i = 0; i < sizeof(scenes) / sizeof(scene_dsc_t) - 1; i++) {
@@ -840,12 +848,12 @@ static void scene_next_task_cb(lv_timer_t * timer)
lv_table_set_cell_value(table, row, 1, buf); lv_table_set_cell_value(table, row, 1, buf);
if(scenes[i].fps_normal < 10) { if(scenes[i].fps_normal < 10) {
// lv_table_set_cell_type(table, row, 0, 3); // lv_table_set_cell_type(table, row, 0, 3);
// lv_table_set_cell_type(table, row, 1, 3); // lv_table_set_cell_type(table, row, 1, 3);
} }
else if(scenes[i].fps_normal < 20) { else if(scenes[i].fps_normal < 20) {
// lv_table_set_cell_type(table, row, 0, 2); // lv_table_set_cell_type(table, row, 0, 2);
// lv_table_set_cell_type(table, row, 1, 2); // lv_table_set_cell_type(table, row, 1, 2);
} }
LV_LOG("%s,%s\r\n", scenes[i].name, buf); LV_LOG("%s,%s\r\n", scenes[i].name, buf);
@@ -862,12 +870,12 @@ static void scene_next_task_cb(lv_timer_t * timer)
if(scenes[i].fps_opa < 10) { if(scenes[i].fps_opa < 10) {
// lv_table_set_cell_type(table, row, 0, 3); // lv_table_set_cell_type(table, row, 0, 3);
// lv_table_set_cell_type(table, row, 1, 3); // lv_table_set_cell_type(table, row, 1, 3);
} }
else if(scenes[i].fps_opa < 20) { else if(scenes[i].fps_opa < 20) {
// lv_table_set_cell_type(table, row, 0, 2); // lv_table_set_cell_type(table, row, 0, 2);
// lv_table_set_cell_type(table, row, 1, 2); // lv_table_set_cell_type(table, row, 1, 2);
} }
LV_LOG("%s\r\n", buf); LV_LOG("%s\r\n", buf);
@@ -875,7 +883,7 @@ static void scene_next_task_cb(lv_timer_t * timer)
row++; row++;
} }
// lv_page_set_scrl_layout(page, LV_LAYOUT_COLUMN_LEFT); // lv_page_set_scrl_layout(page, LV_LAYOUT_COLUMN_LEFT);
} }
} }

View File

@@ -31,7 +31,7 @@ static void ta_event_cb(lv_event_t * e);
/********************** /**********************
* STATIC VARIABLES * STATIC VARIABLES
**********************/ **********************/
static lv_group_t* g; static lv_group_t * g;
static lv_obj_t * tv; static lv_obj_t * tv;
static lv_obj_t * t1; static lv_obj_t * t1;
static lv_obj_t * t2; static lv_obj_t * t2;
@@ -49,18 +49,18 @@ void lv_demo_keypad_encoder(void)
g = lv_group_create(); g = lv_group_create();
lv_group_set_default(g); lv_group_set_default(g);
lv_indev_t* cur_drv = NULL; lv_indev_t * cur_drv = NULL;
for (;;) { for(;;) {
cur_drv = lv_indev_get_next(cur_drv); cur_drv = lv_indev_get_next(cur_drv);
if (!cur_drv) { if(!cur_drv) {
break; break;
} }
if (cur_drv->driver->type == LV_INDEV_TYPE_KEYPAD) { if(cur_drv->driver->type == LV_INDEV_TYPE_KEYPAD) {
lv_indev_set_group(cur_drv, g); lv_indev_set_group(cur_drv, g);
} }
if (cur_drv->driver->type == LV_INDEV_TYPE_ENCODER) { if(cur_drv->driver->type == LV_INDEV_TYPE_ENCODER) {
lv_indev_set_group(cur_drv, g); lv_indev_set_group(cur_drv, g);
} }
} }
@@ -152,7 +152,7 @@ static void text_input_create(lv_obj_t * parent)
lv_textarea_set_one_line(ta2, true); lv_textarea_set_one_line(ta2, true);
lv_textarea_set_placeholder_text(ta2, "Type something"); lv_textarea_set_placeholder_text(ta2, "Type something");
lv_obj_t *kb = lv_keyboard_create(lv_scr_act()); lv_obj_t * kb = lv_keyboard_create(lv_scr_act());
lv_obj_add_flag(kb, LV_OBJ_FLAG_HIDDEN); lv_obj_add_flag(kb, LV_OBJ_FLAG_HIDDEN);
lv_obj_add_event_cb(ta1, ta_event_cb, LV_EVENT_ALL, kb); lv_obj_add_event_cb(ta1, ta_event_cb, LV_EVENT_ALL, kb);

View File

@@ -16,23 +16,23 @@ extern "C" {
#include "../lvgl.h" #include "../lvgl.h"
#if LV_USE_DEMO_WIDGETS #if LV_USE_DEMO_WIDGETS
#include "widgets/lv_demo_widgets.h" #include "widgets/lv_demo_widgets.h"
#endif #endif
#if LV_USE_DEMO_BENCHMARK #if LV_USE_DEMO_BENCHMARK
#include "benchmark/lv_demo_benchmark.h" #include "benchmark/lv_demo_benchmark.h"
#endif #endif
#if LV_USE_DEMO_STRESS #if LV_USE_DEMO_STRESS
#include "stress/lv_demo_stress.h" #include "stress/lv_demo_stress.h"
#endif #endif
#if LV_USE_DEMO_KEYPAD_AND_ENCODER #if LV_USE_DEMO_KEYPAD_AND_ENCODER
#include "keypad_encoder/lv_demo_keypad_encoder.h" #include "keypad_encoder/lv_demo_keypad_encoder.h"
#endif #endif
#if LV_USE_DEMO_MUSIC #if LV_USE_DEMO_MUSIC
#include "music/lv_demo_music.h" #include "music/lv_demo_music.h"
#endif #endif
/********************* /*********************

View File

@@ -25,7 +25,7 @@
* STATIC PROTOTYPES * STATIC PROTOTYPES
**********************/ **********************/
#if LV_DEMO_MUSIC_AUTO_PLAY #if LV_DEMO_MUSIC_AUTO_PLAY
static void auto_step_cb(lv_timer_t * timer); static void auto_step_cb(lv_timer_t * timer);
#endif #endif
/********************** /**********************
@@ -87,20 +87,20 @@ static const char * genre_list[] = {
}; };
static const uint32_t time_list[] = { static const uint32_t time_list[] = {
1*60 + 14, 1 * 60 + 14,
2*60 + 26, 2 * 60 + 26,
1*60 + 54, 1 * 60 + 54,
2*60 + 24, 2 * 60 + 24,
2*60 + 37, 2 * 60 + 37,
3*60 + 33, 3 * 60 + 33,
1*60 + 56, 1 * 60 + 56,
3*60 + 31, 3 * 60 + 31,
2*60 + 20, 2 * 60 + 20,
2*60 + 19, 2 * 60 + 19,
2*60 + 20, 2 * 60 + 20,
2*60 + 19, 2 * 60 + 19,
2*60 + 20, 2 * 60 + 20,
2*60 + 19, 2 * 60 + 19,
}; };
/********************** /**********************

View File

@@ -102,7 +102,7 @@ lv_obj_t * _lv_demo_music_list_create(lv_obj_t * parent)
lv_style_init(&style_artist); lv_style_init(&style_artist);
lv_style_set_text_font(&style_artist, font_small); lv_style_set_text_font(&style_artist, font_small);
lv_style_set_text_color(&style_artist,lv_color_hex(0xb1b0be)); lv_style_set_text_color(&style_artist, lv_color_hex(0xb1b0be));
lv_style_init(&style_time); lv_style_init(&style_time);
lv_style_set_text_font(&style_time, font_medium); lv_style_set_text_font(&style_time, font_medium);

View File

@@ -23,11 +23,11 @@
#define BAR_COLOR2 lv_color_hex(0x6f8af6) #define BAR_COLOR2 lv_color_hex(0x6f8af6)
#define BAR_COLOR3 lv_color_hex(0xffffff) #define BAR_COLOR3 lv_color_hex(0xffffff)
#if LV_DEMO_MUSIC_LARGE #if LV_DEMO_MUSIC_LARGE
# define BAR_COLOR1_STOP 160 #define BAR_COLOR1_STOP 160
# define BAR_COLOR2_STOP 200 #define BAR_COLOR2_STOP 200
#else #else
# define BAR_COLOR1_STOP 80 #define BAR_COLOR1_STOP 80
# define BAR_COLOR2_STOP 100 #define BAR_COLOR2_STOP 100
#endif #endif
#define BAR_COLOR3_STOP (2 * LV_HOR_RES / 3) #define BAR_COLOR3_STOP (2 * LV_HOR_RES / 3)
#define BAR_CNT 20 #define BAR_CNT 20
@@ -106,16 +106,18 @@ static const uint16_t rnd_array[30] = {994, 285, 553, 11, 792, 707, 966, 641, 85
* Callback adapter function to convert parameter types to avoid compile-time * Callback adapter function to convert parameter types to avoid compile-time
* warning. * warning.
*/ */
static void _img_set_zoom_anim_cb(void * obj, int32_t zoom) { static void _img_set_zoom_anim_cb(void * obj, int32_t zoom)
lv_img_set_zoom((lv_obj_t*)obj, (uint16_t)zoom); {
lv_img_set_zoom((lv_obj_t *)obj, (uint16_t)zoom);
} }
/* /*
* Callback adapter function to convert parameter types to avoid compile-time * Callback adapter function to convert parameter types to avoid compile-time
* warning. * warning.
*/ */
static void _obj_set_x_anim_cb(void * obj, int32_t x) { static void _obj_set_x_anim_cb(void * obj, int32_t x)
lv_obj_set_x((lv_obj_t*)obj, (lv_coord_t)x); {
lv_obj_set_x((lv_obj_t *)obj, (lv_coord_t)x);
} }
lv_obj_t * _lv_demo_music_main_create(lv_obj_t * parent) lv_obj_t * _lv_demo_music_main_create(lv_obj_t * parent)
@@ -154,7 +156,8 @@ lv_obj_t * _lv_demo_music_main_create(lv_obj_t * parent)
LV_GRID_FR(3), /*Spacer*/ LV_GRID_FR(3), /*Spacer*/
LV_GRID_CONTENT, /*Handle box*/ LV_GRID_CONTENT, /*Handle box*/
LV_DEMO_MUSIC_HANDLE_SIZE, /*Spacing*/ LV_DEMO_MUSIC_HANDLE_SIZE, /*Spacing*/
LV_GRID_TEMPLATE_LAST}; LV_GRID_TEMPLATE_LAST
};
grid_rows[1] = LV_VER_RES; grid_rows[1] = LV_VER_RES;
@@ -184,7 +187,8 @@ lv_obj_t * _lv_demo_music_main_create(lv_obj_t * parent)
LV_GRID_CONTENT, /*Handle box*/ LV_GRID_CONTENT, /*Handle box*/
LV_GRID_FR(1), /*Spacer*/ LV_GRID_FR(1), /*Spacer*/
LV_DEMO_MUSIC_HANDLE_SIZE, /*Spacing*/ LV_DEMO_MUSIC_HANDLE_SIZE, /*Spacing*/
LV_GRID_TEMPLATE_LAST}; LV_GRID_TEMPLATE_LAST
};
lv_obj_set_grid_dsc_array(cont, grid_cols, grid_rows); lv_obj_set_grid_dsc_array(cont, grid_cols, grid_rows);
lv_obj_set_style_grid_row_align(cont, LV_GRID_ALIGN_SPACE_BETWEEN, 0); lv_obj_set_style_grid_row_align(cont, LV_GRID_ALIGN_SPACE_BETWEEN, 0);
@@ -207,7 +211,8 @@ lv_obj_t * _lv_demo_music_main_create(lv_obj_t * parent)
LV_GRID_CONTENT, /*Handle box*/ LV_GRID_CONTENT, /*Handle box*/
LV_GRID_FR(1), /*Spacer*/ LV_GRID_FR(1), /*Spacer*/
LV_DEMO_MUSIC_HANDLE_SIZE, /*Spacing*/ LV_DEMO_MUSIC_HANDLE_SIZE, /*Spacing*/
LV_GRID_TEMPLATE_LAST}; LV_GRID_TEMPLATE_LAST
};
lv_obj_set_grid_dsc_array(cont, grid_cols, grid_rows); lv_obj_set_grid_dsc_array(cont, grid_cols, grid_rows);
lv_obj_set_style_grid_row_align(cont, LV_GRID_ALIGN_SPACE_BETWEEN, 0); lv_obj_set_style_grid_row_align(cont, LV_GRID_ALIGN_SPACE_BETWEEN, 0);
@@ -292,17 +297,20 @@ void _lv_demo_music_album_next(bool next)
if(next) { if(next) {
id++; id++;
if(id >= ACTIVE_TRACK_CNT) id = 0; if(id >= ACTIVE_TRACK_CNT) id = 0;
} else { }
else {
if(id == 0) { if(id == 0) {
id = ACTIVE_TRACK_CNT - 1; id = ACTIVE_TRACK_CNT - 1;
} else { }
else {
id--; id--;
} }
} }
if(playing) { if(playing) {
_lv_demo_music_play(id); _lv_demo_music_play(id);
} else { }
else {
track_load(id); track_load(id);
} }
} }
@@ -381,21 +389,21 @@ static lv_obj_t * create_cont(lv_obj_t * parent)
lv_obj_t * placeholder1 = lv_obj_create(main_cont); lv_obj_t * placeholder1 = lv_obj_create(main_cont);
lv_obj_remove_style_all(placeholder1); lv_obj_remove_style_all(placeholder1);
lv_obj_clear_flag(placeholder1, LV_OBJ_FLAG_CLICKABLE); lv_obj_clear_flag(placeholder1, LV_OBJ_FLAG_CLICKABLE);
// lv_obj_set_style_bg_color(placeholder1, lv_color_hex(0xff0000), 0); // lv_obj_set_style_bg_color(placeholder1, lv_color_hex(0xff0000), 0);
// lv_obj_set_style_bg_opa(placeholder1, LV_OPA_50, 0); // lv_obj_set_style_bg_opa(placeholder1, LV_OPA_50, 0);
lv_obj_t * placeholder2 = lv_obj_create(main_cont); lv_obj_t * placeholder2 = lv_obj_create(main_cont);
lv_obj_remove_style_all(placeholder2); lv_obj_remove_style_all(placeholder2);
lv_obj_clear_flag(placeholder2, LV_OBJ_FLAG_CLICKABLE); lv_obj_clear_flag(placeholder2, LV_OBJ_FLAG_CLICKABLE);
// lv_obj_set_style_bg_color(placeholder2, lv_color_hex(0x00ff00), 0); // lv_obj_set_style_bg_color(placeholder2, lv_color_hex(0x00ff00), 0);
// lv_obj_set_style_bg_opa(placeholder2, LV_OPA_50, 0); // lv_obj_set_style_bg_opa(placeholder2, LV_OPA_50, 0);
#if LV_DEMO_MUSIC_SQUARE || LV_DEMO_MUSIC_ROUND #if LV_DEMO_MUSIC_SQUARE || LV_DEMO_MUSIC_ROUND
lv_obj_t * placeholder3 = lv_obj_create(main_cont); lv_obj_t * placeholder3 = lv_obj_create(main_cont);
lv_obj_remove_style_all(placeholder3); lv_obj_remove_style_all(placeholder3);
lv_obj_clear_flag(placeholder3, LV_OBJ_FLAG_CLICKABLE); lv_obj_clear_flag(placeholder3, LV_OBJ_FLAG_CLICKABLE);
// lv_obj_set_style_bg_color(placeholder3, lv_color_hex(0x0000ff), 0); // lv_obj_set_style_bg_color(placeholder3, lv_color_hex(0x0000ff), 0);
// lv_obj_set_style_bg_opa(placeholder3, LV_OPA_20, 0); // lv_obj_set_style_bg_opa(placeholder3, LV_OPA_20, 0);
lv_obj_set_size(placeholder1, lv_pct(100), LV_VER_RES); lv_obj_set_size(placeholder1, lv_pct(100), LV_VER_RES);
lv_obj_set_y(placeholder1, 0); lv_obj_set_y(placeholder1, 0);
@@ -423,13 +431,13 @@ static void create_wave_images(lv_obj_t * parent)
LV_IMG_DECLARE(img_lv_demo_music_wave_top); LV_IMG_DECLARE(img_lv_demo_music_wave_top);
LV_IMG_DECLARE(img_lv_demo_music_wave_bottom); LV_IMG_DECLARE(img_lv_demo_music_wave_bottom);
lv_obj_t * wave_top = lv_img_create(parent); lv_obj_t * wave_top = lv_img_create(parent);
lv_img_set_src(wave_top,&img_lv_demo_music_wave_top); lv_img_set_src(wave_top, &img_lv_demo_music_wave_top);
lv_obj_set_width(wave_top, LV_HOR_RES); lv_obj_set_width(wave_top, LV_HOR_RES);
lv_obj_align(wave_top, LV_ALIGN_TOP_MID, 0, 0); lv_obj_align(wave_top, LV_ALIGN_TOP_MID, 0, 0);
lv_obj_add_flag(wave_top, LV_OBJ_FLAG_IGNORE_LAYOUT); lv_obj_add_flag(wave_top, LV_OBJ_FLAG_IGNORE_LAYOUT);
lv_obj_t * wave_bottom = lv_img_create(parent); lv_obj_t * wave_bottom = lv_img_create(parent);
lv_img_set_src(wave_bottom,&img_lv_demo_music_wave_bottom); lv_img_set_src(wave_bottom, &img_lv_demo_music_wave_bottom);
lv_obj_set_width(wave_bottom, LV_HOR_RES); lv_obj_set_width(wave_bottom, LV_HOR_RES);
lv_obj_align(wave_bottom, LV_ALIGN_BOTTOM_MID, 0, 0); lv_obj_align(wave_bottom, LV_ALIGN_BOTTOM_MID, 0, 0);
lv_obj_add_flag(wave_bottom, LV_OBJ_FLAG_IGNORE_LAYOUT); lv_obj_add_flag(wave_bottom, LV_OBJ_FLAG_IGNORE_LAYOUT);
@@ -538,7 +546,7 @@ static lv_obj_t * create_ctrl_box(lv_obj_t * parent)
#else #else
lv_obj_set_style_pad_bottom(cont, 8, 0); lv_obj_set_style_pad_bottom(cont, 8, 0);
#endif #endif
static const lv_coord_t grid_col[] = {LV_GRID_FR(2), LV_GRID_FR(3),LV_GRID_FR(5), LV_GRID_FR(5), LV_GRID_FR(5), LV_GRID_FR(3), LV_GRID_FR(2), LV_GRID_TEMPLATE_LAST}; static const lv_coord_t grid_col[] = {LV_GRID_FR(2), LV_GRID_FR(3), LV_GRID_FR(5), LV_GRID_FR(5), LV_GRID_FR(5), LV_GRID_FR(3), LV_GRID_FR(2), LV_GRID_TEMPLATE_LAST};
static const lv_coord_t grid_row[] = {LV_GRID_CONTENT, LV_GRID_CONTENT, LV_GRID_TEMPLATE_LAST}; static const lv_coord_t grid_row[] = {LV_GRID_CONTENT, LV_GRID_CONTENT, LV_GRID_TEMPLATE_LAST};
lv_obj_set_grid_dsc_array(cont, grid_col, grid_row); lv_obj_set_grid_dsc_array(cont, grid_col, grid_row);
@@ -669,13 +677,15 @@ static void track_load(uint32_t id)
#if LV_DEMO_MUSIC_LANDSCAPE #if LV_DEMO_MUSIC_LANDSCAPE
if(next) { if(next) {
lv_anim_set_values(&a, 0, - LV_HOR_RES / 7); lv_anim_set_values(&a, 0, - LV_HOR_RES / 7);
} else { }
else {
lv_anim_set_values(&a, 0, LV_HOR_RES / 7); lv_anim_set_values(&a, 0, LV_HOR_RES / 7);
} }
#else #else
if(next) { if(next) {
lv_anim_set_values(&a, 0, - LV_HOR_RES / 2); lv_anim_set_values(&a, 0, - LV_HOR_RES / 2);
} else { }
else {
lv_anim_set_values(&a, 0, LV_HOR_RES / 2); lv_anim_set_values(&a, 0, LV_HOR_RES / 2);
} }
#endif #endif
@@ -799,7 +809,7 @@ static void spectrum_draw_event_cb(lv_event_t * e)
for(i = 0; i < BAR_CNT; i++) { for(i = 0; i < BAR_CNT; i++) {
uint32_t deg_space = 1; uint32_t deg_space = 1;
uint32_t deg = i * DEG_STEP + 90; uint32_t deg = i * DEG_STEP + 90;
uint32_t j = (i + bar_rot + rnd_array[bar_ofs %10]) % BAR_CNT; uint32_t j = (i + bar_rot + rnd_array[bar_ofs % 10]) % BAR_CNT;
uint32_t k = (i + bar_rot + rnd_array[(bar_ofs + 1) % 10]) % BAR_CNT; uint32_t k = (i + bar_rot + rnd_array[(bar_ofs + 1) % 10]) % BAR_CNT;
uint32_t v = (r[k] * animv + r[j] * (amax - animv)) / amax; uint32_t v = (r[k] * animv + r[j] * (amax - animv)) / amax;
@@ -811,8 +821,10 @@ static void spectrum_draw_event_cb(lv_event_t * e)
if(v < BAR_COLOR1_STOP) draw_dsc.bg_color = BAR_COLOR1; if(v < BAR_COLOR1_STOP) draw_dsc.bg_color = BAR_COLOR1;
else if(v > BAR_COLOR3_STOP) draw_dsc.bg_color = BAR_COLOR3; else if(v > BAR_COLOR3_STOP) draw_dsc.bg_color = BAR_COLOR3;
else if(v > BAR_COLOR2_STOP) draw_dsc.bg_color = lv_color_mix(BAR_COLOR3, BAR_COLOR2, ((v - BAR_COLOR2_STOP) * 255) / (BAR_COLOR3_STOP-BAR_COLOR2_STOP)); else if(v > BAR_COLOR2_STOP) draw_dsc.bg_color = lv_color_mix(BAR_COLOR3, BAR_COLOR2,
else draw_dsc.bg_color = lv_color_mix(BAR_COLOR2, BAR_COLOR1, ((v - BAR_COLOR1_STOP) * 255) / (BAR_COLOR2_STOP - BAR_COLOR1_STOP)); ((v - BAR_COLOR2_STOP) * 255) / (BAR_COLOR3_STOP - BAR_COLOR2_STOP));
else draw_dsc.bg_color = lv_color_mix(BAR_COLOR2, BAR_COLOR1,
((v - BAR_COLOR1_STOP) * 255) / (BAR_COLOR2_STOP - BAR_COLOR1_STOP));
uint32_t di = deg + deg_space; uint32_t di = deg + deg_space;
@@ -859,7 +871,7 @@ static void spectrum_anim_cb(void * a, int32_t v)
static int32_t last_bass = -1000; static int32_t last_bass = -1000;
static int32_t dir = 1; static int32_t dir = 1;
if(spectrum[spectrum_i][0] > 12) { if(spectrum[spectrum_i][0] > 12) {
if(spectrum_i-last_bass > 5) { if(spectrum_i - last_bass > 5) {
bass_cnt++; bass_cnt++;
last_bass = spectrum_i; last_bass = spectrum_i;
if(bass_cnt >= 2) { if(bass_cnt >= 2) {
@@ -869,7 +881,7 @@ static void spectrum_anim_cb(void * a, int32_t v)
} }
} }
} }
if(spectrum[spectrum_i][0] < 4) bar_rot+= dir; if(spectrum[spectrum_i][0] < 4) bar_rot += dir;
lv_img_set_zoom(album_img_obj, LV_IMG_ZOOM_NONE + spectrum[spectrum_i][0]); lv_img_set_zoom(album_img_obj, LV_IMG_ZOOM_NONE + spectrum[spectrum_i][0]);
} }
@@ -929,7 +941,8 @@ static void play_event_click_cb(lv_event_t * e)
lv_obj_t * obj = lv_event_get_target(e); lv_obj_t * obj = lv_event_get_target(e);
if(lv_obj_has_state(obj, LV_STATE_CHECKED)) { if(lv_obj_has_state(obj, LV_STATE_CHECKED)) {
_lv_demo_music_resume(); _lv_demo_music_resume();
} else { }
else {
_lv_demo_music_pause(); _lv_demo_music_pause();
} }
} }

View File

@@ -60,11 +60,10 @@ static void obj_test_task_cb(lv_timer_t * tmr)
lv_anim_t a; lv_anim_t a;
lv_obj_t * obj; lv_obj_t * obj;
// printf("step start: %d\n", state); // printf("step start: %d\n", state);
switch(state) { switch(state) {
case -1: case -1: {
{
lv_res_t res = lv_mem_test(); lv_res_t res = lv_mem_test();
if(res != LV_RES_OK) { if(res != LV_RES_OK) {
LV_LOG_ERROR("Memory integrity error"); LV_LOG_ERROR("Memory integrity error");
@@ -81,7 +80,7 @@ static void obj_test_task_cb(lv_timer_t * tmr)
case 0: case 0:
/* Holder for all object types */ /* Holder for all object types */
main_page = lv_obj_create(lv_scr_act()); main_page = lv_obj_create(lv_scr_act());
lv_obj_set_size(main_page, LV_HOR_RES / 2 , LV_VER_RES); lv_obj_set_size(main_page, LV_HOR_RES / 2, LV_VER_RES);
lv_obj_set_flex_flow(main_page, LV_FLEX_FLOW_COLUMN); lv_obj_set_flex_flow(main_page, LV_FLEX_FLOW_COLUMN);
@@ -91,8 +90,7 @@ static void obj_test_task_cb(lv_timer_t * tmr)
lv_label_set_text(obj, "Multi line\n"LV_SYMBOL_OK LV_SYMBOL_CLOSE LV_SYMBOL_WIFI); lv_label_set_text(obj, "Multi line\n"LV_SYMBOL_OK LV_SYMBOL_CLOSE LV_SYMBOL_WIFI);
break; break;
case 1: case 1: {
{
obj = lv_tabview_create(lv_scr_act(), LV_DIR_TOP, 50); obj = lv_tabview_create(lv_scr_act(), LV_DIR_TOP, 50);
lv_obj_set_size(obj, LV_HOR_RES / 2, LV_VER_RES / 2); lv_obj_set_size(obj, LV_HOR_RES / 2, LV_VER_RES / 2);
lv_obj_align(obj, LV_ALIGN_BOTTOM_RIGHT, 0, 0); lv_obj_align(obj, LV_ALIGN_BOTTOM_RIGHT, 0, 0);
@@ -148,12 +146,12 @@ static void obj_test_task_cb(lv_timer_t * tmr)
lv_obj_set_style_bg_img_src(obj, LV_SYMBOL_DUMMY"Text from\nstyle", 0); lv_obj_set_style_bg_img_src(obj, LV_SYMBOL_DUMMY"Text from\nstyle", 0);
lv_obj_del_async(obj); /*Delete on next call of `lv_task_handler` (so not now)*/ lv_obj_del_async(obj); /*Delete on next call of `lv_task_handler` (so not now)*/
// obj = lv_btn_create(main_page); // obj = lv_btn_create(main_page);
// lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT); // lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT);
// lv_obj_set_style_bg_img_src(obj, LV_SYMBOL_LEFT); // lv_obj_set_style_bg_img_src(obj, LV_SYMBOL_LEFT);
// lv_obj_set_style_bg_img_opa(obj, LV_OPA_50); // lv_obj_set_style_bg_img_opa(obj, LV_OPA_50);
// lv_obj_set_style_bg_img_tiled(obj, true); // lv_obj_set_style_bg_img_tiled(obj, true);
// lv_obj_scroll_to_view(obj, LV_ANIM_ON); // lv_obj_scroll_to_view(obj, LV_ANIM_ON);
break; break;
case 5: case 5:
@@ -258,8 +256,7 @@ static void obj_test_task_cb(lv_timer_t * tmr)
lv_textarea_set_one_line(ta, false); lv_textarea_set_one_line(ta, false);
break; break;
case 16: case 16: {
{
lv_obj_t * tv = lv_tileview_create(lv_scr_act()); lv_obj_t * tv = lv_tileview_create(lv_scr_act());
lv_obj_set_size(tv, 200, 200); lv_obj_set_size(tv, 200, 200);
auto_del(tv, LV_DEMO_STRESS_TIME_STEP * 4 + 5); auto_del(tv, LV_DEMO_STRESS_TIME_STEP * 4 + 5);
@@ -424,7 +421,7 @@ static void obj_test_task_cb(lv_timer_t * tmr)
break; break;
} }
// printf("step end: %d\n", state); // printf("step end: %d\n", state);
state ++; state ++;
} }

View File

@@ -25,7 +25,7 @@ typedef enum {
DISP_SMALL, DISP_SMALL,
DISP_MEDIUM, DISP_MEDIUM,
DISP_LARGE, DISP_LARGE,
}disp_size_t; } disp_size_t;
/********************** /**********************
* STATIC PROTOTYPES * STATIC PROTOTYPES
@@ -35,8 +35,10 @@ static void analytics_create(lv_obj_t * parent);
static void shop_create(lv_obj_t * parent); static void shop_create(lv_obj_t * parent);
static void color_changer_create(lv_obj_t * parent); static void color_changer_create(lv_obj_t * parent);
static lv_obj_t * create_meter_box(lv_obj_t * parent, const char * title, const char * text1, const char * text2, const char * text3); static lv_obj_t * create_meter_box(lv_obj_t * parent, const char * title, const char * text1, const char * text2,
static lv_obj_t * create_shop_item(lv_obj_t * parent, const void * img_src, const char * name, const char * category, const char * price); const char * text3);
static lv_obj_t * create_shop_item(lv_obj_t * parent, const void * img_src, const char * name, const char * category,
const char * price);
static void color_changer_event_cb(lv_event_t * e); static void color_changer_event_cb(lv_event_t * e);
static void color_event_cb(lv_event_t * e); static void color_event_cb(lv_event_t * e);
@@ -114,7 +116,8 @@ void lv_demo_widgets(void)
#else #else
LV_LOG_WARN("LV_FONT_MONTSERRAT_16 is not enabled for the widgets demo. Using LV_FONT_DEFAULT instead."); LV_LOG_WARN("LV_FONT_MONTSERRAT_16 is not enabled for the widgets demo. Using LV_FONT_DEFAULT instead.");
#endif #endif
} else if(disp_size == DISP_MEDIUM) { }
else if(disp_size == DISP_MEDIUM) {
tab_h = 45; tab_h = 45;
#if LV_FONT_MONTSERRAT_20 #if LV_FONT_MONTSERRAT_20
font_large = &lv_font_montserrat_20; font_large = &lv_font_montserrat_20;
@@ -126,7 +129,8 @@ void lv_demo_widgets(void)
#else #else
LV_LOG_WARN("LV_FONT_MONTSERRAT_14 is not enabled for the widgets demo. Using LV_FONT_DEFAULT instead."); LV_LOG_WARN("LV_FONT_MONTSERRAT_14 is not enabled for the widgets demo. Using LV_FONT_DEFAULT instead.");
#endif #endif
} else { /* disp_size == DISP_SMALL */ }
else { /* disp_size == DISP_SMALL */
tab_h = 45; tab_h = 45;
#if LV_FONT_MONTSERRAT_18 #if LV_FONT_MONTSERRAT_18
font_large = &lv_font_montserrat_18; font_large = &lv_font_montserrat_18;
@@ -141,7 +145,8 @@ void lv_demo_widgets(void)
} }
#if LV_USE_THEME_DEFAULT #if LV_USE_THEME_DEFAULT
lv_theme_default_init(NULL, lv_palette_main(LV_PALETTE_BLUE), lv_palette_main(LV_PALETTE_RED), LV_THEME_DEFAULT_DARK, font_normal); lv_theme_default_init(NULL, lv_palette_main(LV_PALETTE_BLUE), lv_palette_main(LV_PALETTE_RED), LV_THEME_DEFAULT_DARK,
font_normal);
#endif #endif
lv_style_init(&style_text_muted); lv_style_init(&style_text_muted);
@@ -210,7 +215,7 @@ static void profile_create(lv_obj_t * parent)
lv_obj_t * dsc = lv_label_create(panel1); lv_obj_t * dsc = lv_label_create(panel1);
lv_obj_add_style(dsc, &style_text_muted, 0); lv_obj_add_style(dsc, &style_text_muted, 0);
lv_label_set_text(dsc, "This is a short description of me. Take a look at my profile!" ); lv_label_set_text(dsc, "This is a short description of me. Take a look at my profile!");
lv_label_set_long_mode(dsc, LV_LABEL_LONG_WRAP); lv_label_set_long_mode(dsc, LV_LABEL_LONG_WRAP);
lv_obj_t * email_icn = lv_label_create(panel1); lv_obj_t * email_icn = lv_label_create(panel1);
@@ -388,7 +393,8 @@ static void profile_create(lv_obj_t * parent)
-20, -20,
LV_GRID_CONTENT, /*Phone*/ LV_GRID_CONTENT, /*Phone*/
LV_GRID_CONTENT, /*Buttons*/ LV_GRID_CONTENT, /*Buttons*/
LV_GRID_TEMPLATE_LAST}; LV_GRID_TEMPLATE_LAST
};
static lv_coord_t grid_2_col_dsc[] = {LV_GRID_FR(1), LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST}; static lv_coord_t grid_2_col_dsc[] = {LV_GRID_FR(1), LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST};
static lv_coord_t grid_2_row_dsc[] = { static lv_coord_t grid_2_row_dsc[] = {
@@ -460,7 +466,8 @@ static void profile_create(lv_obj_t * parent)
LV_GRID_CONTENT, /*Phone number*/ LV_GRID_CONTENT, /*Phone number*/
LV_GRID_CONTENT, /*Button1*/ LV_GRID_CONTENT, /*Button1*/
LV_GRID_CONTENT, /*Button2*/ LV_GRID_CONTENT, /*Button2*/
LV_GRID_TEMPLATE_LAST}; LV_GRID_TEMPLATE_LAST
};
lv_obj_set_grid_dsc_array(panel1, grid_1_col_dsc, grid_1_row_dsc); lv_obj_set_grid_dsc_array(panel1, grid_1_col_dsc, grid_1_row_dsc);
@@ -638,7 +645,7 @@ static void analytics_create(lv_obj_t * parent)
lv_chart_set_next_value(chart2, ser3, lv_rand(10, 80)); lv_chart_set_next_value(chart2, ser3, lv_rand(10, 80));
lv_meter_scale_t * scale; lv_meter_scale_t * scale;
lv_meter_indicator_t *indic; lv_meter_indicator_t * indic;
meter1 = create_meter_box(parent, "Monthly Target", "Revenue: 63%", "Sales: 44%", "Costs: 58%"); meter1 = create_meter_box(parent, "Monthly Target", "Revenue: 63%", "Sales: 44%", "Costs: 58%");
lv_obj_add_flag(lv_obj_get_parent(meter1), LV_OBJ_FLAG_FLEX_IN_NEW_TRACK); lv_obj_add_flag(lv_obj_get_parent(meter1), LV_OBJ_FLAG_FLEX_IN_NEW_TRACK);
scale = lv_meter_add_scale(meter1); scale = lv_meter_add_scale(meter1);
@@ -715,7 +722,8 @@ static void analytics_create(lv_obj_t * parent)
lv_meter_set_indicator_start_value(meter3, indic, 0); lv_meter_set_indicator_start_value(meter3, indic, 0);
lv_meter_set_indicator_end_value(meter3, indic, 20); lv_meter_set_indicator_end_value(meter3, indic, 20);
indic = lv_meter_add_scale_lines(meter3, scale, lv_palette_darken(LV_PALETTE_RED, 3), lv_palette_darken(LV_PALETTE_RED, 3), true, 0); indic = lv_meter_add_scale_lines(meter3, scale, lv_palette_darken(LV_PALETTE_RED, 3), lv_palette_darken(LV_PALETTE_RED,
3), true, 0);
lv_meter_set_indicator_start_value(meter3, indic, 0); lv_meter_set_indicator_start_value(meter3, indic, 0);
lv_meter_set_indicator_end_value(meter3, indic, 20); lv_meter_set_indicator_end_value(meter3, indic, 20);
@@ -723,7 +731,8 @@ static void analytics_create(lv_obj_t * parent)
lv_meter_set_indicator_start_value(meter3, indic, 20); lv_meter_set_indicator_start_value(meter3, indic, 20);
lv_meter_set_indicator_end_value(meter3, indic, 40); lv_meter_set_indicator_end_value(meter3, indic, 40);
indic = lv_meter_add_scale_lines(meter3, scale, lv_palette_darken(LV_PALETTE_BLUE, 3), lv_palette_darken(LV_PALETTE_BLUE, 3), true, 0); indic = lv_meter_add_scale_lines(meter3, scale, lv_palette_darken(LV_PALETTE_BLUE, 3),
lv_palette_darken(LV_PALETTE_BLUE, 3), true, 0);
lv_meter_set_indicator_start_value(meter3, indic, 20); lv_meter_set_indicator_start_value(meter3, indic, 20);
lv_meter_set_indicator_end_value(meter3, indic, 40); lv_meter_set_indicator_end_value(meter3, indic, 40);
@@ -731,7 +740,8 @@ static void analytics_create(lv_obj_t * parent)
lv_meter_set_indicator_start_value(meter3, indic, 40); lv_meter_set_indicator_start_value(meter3, indic, 40);
lv_meter_set_indicator_end_value(meter3, indic, 60); lv_meter_set_indicator_end_value(meter3, indic, 60);
indic = lv_meter_add_scale_lines(meter3, scale, lv_palette_darken(LV_PALETTE_GREEN, 3), lv_palette_darken(LV_PALETTE_GREEN, 3), true, 0); indic = lv_meter_add_scale_lines(meter3, scale, lv_palette_darken(LV_PALETTE_GREEN, 3),
lv_palette_darken(LV_PALETTE_GREEN, 3), true, 0);
lv_meter_set_indicator_start_value(meter3, indic, 40); lv_meter_set_indicator_start_value(meter3, indic, 40);
lv_meter_set_indicator_end_value(meter3, indic, 60); lv_meter_set_indicator_end_value(meter3, indic, 60);
@@ -758,7 +768,8 @@ static void analytics_create(lv_obj_t * parent)
lv_obj_set_size(meter1, 200, 200); lv_obj_set_size(meter1, 200, 200);
lv_obj_set_size(meter2, 200, 200); lv_obj_set_size(meter2, 200, 200);
lv_obj_set_size(meter3, 200, 200); lv_obj_set_size(meter3, 200, 200);
} else { }
else {
lv_coord_t meter_w = lv_obj_get_width(meter1); lv_coord_t meter_w = lv_obj_get_width(meter1);
lv_obj_set_height(meter1, meter_w); lv_obj_set_height(meter1, meter_w);
lv_obj_set_height(meter2, meter_w); lv_obj_set_height(meter2, meter_w);
@@ -836,7 +847,8 @@ void shop_create(lv_obj_t * parent)
lv_obj_set_grid_cell(amount, LV_GRID_ALIGN_START, 0, 1, LV_GRID_ALIGN_START, 3, 1); lv_obj_set_grid_cell(amount, LV_GRID_ALIGN_START, 0, 1, LV_GRID_ALIGN_START, 3, 1);
lv_obj_set_grid_cell(hint, LV_GRID_ALIGN_START, 0, 1, LV_GRID_ALIGN_START, 4, 1); lv_obj_set_grid_cell(hint, LV_GRID_ALIGN_START, 0, 1, LV_GRID_ALIGN_START, 4, 1);
lv_obj_set_grid_cell(chart3, LV_GRID_ALIGN_STRETCH, 1, 1, LV_GRID_ALIGN_STRETCH, 0, 5); lv_obj_set_grid_cell(chart3, LV_GRID_ALIGN_STRETCH, 1, 1, LV_GRID_ALIGN_STRETCH, 0, 5);
} else if(disp_size == DISP_MEDIUM) { }
else if(disp_size == DISP_MEDIUM) {
static lv_coord_t grid1_col_dsc[] = {LV_GRID_FR(1), LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST}; static lv_coord_t grid1_col_dsc[] = {LV_GRID_FR(1), LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST};
static lv_coord_t grid1_row_dsc[] = { static lv_coord_t grid1_row_dsc[] = {
LV_GRID_CONTENT, /*Title + Date*/ LV_GRID_CONTENT, /*Title + Date*/
@@ -855,7 +867,8 @@ void shop_create(lv_obj_t * parent)
lv_obj_set_grid_cell(amount, LV_GRID_ALIGN_START, 0, 1, LV_GRID_ALIGN_CENTER, 1, 1); lv_obj_set_grid_cell(amount, LV_GRID_ALIGN_START, 0, 1, LV_GRID_ALIGN_CENTER, 1, 1);
lv_obj_set_grid_cell(hint, LV_GRID_ALIGN_START, 1, 1, LV_GRID_ALIGN_CENTER, 1, 1); lv_obj_set_grid_cell(hint, LV_GRID_ALIGN_START, 1, 1, LV_GRID_ALIGN_CENTER, 1, 1);
lv_obj_set_grid_cell(chart3, LV_GRID_ALIGN_END, 0, 2, LV_GRID_ALIGN_STRETCH, 2, 1); lv_obj_set_grid_cell(chart3, LV_GRID_ALIGN_END, 0, 2, LV_GRID_ALIGN_STRETCH, 2, 1);
} else if(disp_size == DISP_SMALL) { }
else if(disp_size == DISP_SMALL) {
static lv_coord_t grid1_col_dsc[] = {LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST}; static lv_coord_t grid1_col_dsc[] = {LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST};
static lv_coord_t grid1_row_dsc[] = { static lv_coord_t grid1_row_dsc[] = {
LV_GRID_CONTENT, /*Title*/ LV_GRID_CONTENT, /*Title*/
@@ -883,7 +896,8 @@ void shop_create(lv_obj_t * parent)
if(disp_size == DISP_SMALL) { if(disp_size == DISP_SMALL) {
lv_obj_add_flag(list, LV_OBJ_FLAG_FLEX_IN_NEW_TRACK); lv_obj_add_flag(list, LV_OBJ_FLAG_FLEX_IN_NEW_TRACK);
lv_obj_set_height(list, LV_PCT(100)); lv_obj_set_height(list, LV_PCT(100));
} else { }
else {
lv_obj_set_height(list, LV_PCT(100)); lv_obj_set_height(list, LV_PCT(100));
lv_obj_set_style_max_height(list, 300, 0); lv_obj_set_style_max_height(list, 300, 0);
} }
@@ -907,7 +921,8 @@ void shop_create(lv_obj_t * parent)
if(disp_size == DISP_SMALL) { if(disp_size == DISP_SMALL) {
lv_obj_add_flag(notifications, LV_OBJ_FLAG_FLEX_IN_NEW_TRACK); lv_obj_add_flag(notifications, LV_OBJ_FLAG_FLEX_IN_NEW_TRACK);
lv_obj_set_height(notifications, LV_PCT(100)); lv_obj_set_height(notifications, LV_PCT(100));
} else { }
else {
lv_obj_set_height(notifications, LV_PCT(100)); lv_obj_set_height(notifications, LV_PCT(100));
lv_obj_set_style_max_height(notifications, 300, 0); lv_obj_set_style_max_height(notifications, 300, 0);
} }
@@ -948,7 +963,8 @@ static void color_changer_create(lv_obj_t * parent)
{ {
static lv_palette_t palette[] = { static lv_palette_t palette[] = {
LV_PALETTE_BLUE, LV_PALETTE_GREEN, LV_PALETTE_BLUE_GREY, LV_PALETTE_ORANGE, LV_PALETTE_BLUE, LV_PALETTE_GREEN, LV_PALETTE_BLUE_GREY, LV_PALETTE_ORANGE,
LV_PALETTE_RED, LV_PALETTE_PURPLE, LV_PALETTE_TEAL, _LV_PALETTE_LAST }; LV_PALETTE_RED, LV_PALETTE_PURPLE, LV_PALETTE_TEAL, _LV_PALETTE_LAST
};
lv_obj_t * color_cont = lv_obj_create(parent); lv_obj_t * color_cont = lv_obj_create(parent);
lv_obj_remove_style_all(color_cont); lv_obj_remove_style_all(color_cont);
@@ -989,7 +1005,8 @@ static void color_changer_create(lv_obj_t * parent)
if(disp_size == DISP_SMALL) { if(disp_size == DISP_SMALL) {
lv_obj_set_size(btn, LV_DPX(42), LV_DPX(42)); lv_obj_set_size(btn, LV_DPX(42), LV_DPX(42));
lv_obj_align(btn, LV_ALIGN_BOTTOM_RIGHT, -LV_DPX(15), -LV_DPX(15)); lv_obj_align(btn, LV_ALIGN_BOTTOM_RIGHT, -LV_DPX(15), -LV_DPX(15));
} else { }
else {
lv_obj_set_size(btn, LV_DPX(50), LV_DPX(50)); lv_obj_set_size(btn, LV_DPX(50), LV_DPX(50));
lv_obj_align(btn, LV_ALIGN_BOTTOM_RIGHT, -LV_DPX(15), -LV_DPX(15)); lv_obj_align(btn, LV_ALIGN_BOTTOM_RIGHT, -LV_DPX(15), -LV_DPX(15));
} }
@@ -1005,7 +1022,8 @@ static void color_changer_anim_cb(void * var, int32_t v)
w = lv_map(v, 0, 256, LV_DPX(52), max_w); w = lv_map(v, 0, 256, LV_DPX(52), max_w);
lv_obj_set_width(obj, w); lv_obj_set_width(obj, w);
lv_obj_align(obj, LV_ALIGN_BOTTOM_RIGHT, - LV_DPX(10), - LV_DPX(10)); lv_obj_align(obj, LV_ALIGN_BOTTOM_RIGHT, - LV_DPX(10), - LV_DPX(10));
} else { }
else {
w = lv_map(v, 0, 256, LV_DPX(60), max_w); w = lv_map(v, 0, 256, LV_DPX(60), max_w);
lv_obj_set_width(obj, w); lv_obj_set_width(obj, w);
lv_obj_align(obj, LV_ALIGN_BOTTOM_RIGHT, - LV_DPX(10), - LV_DPX(10)); lv_obj_align(obj, LV_ALIGN_BOTTOM_RIGHT, - LV_DPX(10), - LV_DPX(10));
@@ -1020,7 +1038,7 @@ static void color_changer_anim_cb(void * var, int32_t v)
} }
static void color_changer_event_cb(lv_event_t *e) static void color_changer_event_cb(lv_event_t * e)
{ {
if(lv_event_get_code(e) == LV_EVENT_CLICKED) { if(lv_event_get_code(e) == LV_EVENT_CLICKED) {
lv_obj_t * color_cont = lv_event_get_user_data(e); lv_obj_t * color_cont = lv_event_get_user_data(e);
@@ -1032,7 +1050,8 @@ static void color_changer_event_cb(lv_event_t *e)
lv_anim_set_values(&a, 0, 256); lv_anim_set_values(&a, 0, 256);
lv_anim_set_time(&a, 200); lv_anim_set_time(&a, 200);
lv_anim_start(&a); lv_anim_start(&a);
} else { }
else {
lv_anim_t a; lv_anim_t a;
lv_anim_init(&a); lv_anim_init(&a);
lv_anim_set_var(&a, color_cont); lv_anim_set_var(&a, color_cont);
@@ -1065,7 +1084,8 @@ static void color_event_cb(lv_event_t * e)
lv_palette_t palette_secondary = (*palette_primary) + 3; /*Use another palette as secondary*/ lv_palette_t palette_secondary = (*palette_primary) + 3; /*Use another palette as secondary*/
if(palette_secondary >= _LV_PALETTE_LAST) palette_secondary = 0; if(palette_secondary >= _LV_PALETTE_LAST) palette_secondary = 0;
lv_theme_default_init(NULL, lv_palette_main(*palette_primary), lv_palette_main(palette_secondary), LV_THEME_DEFAULT_DARK, font_normal); lv_theme_default_init(NULL, lv_palette_main(*palette_primary), lv_palette_main(palette_secondary),
LV_THEME_DEFAULT_DARK, font_normal);
lv_color_t color = lv_palette_main(*palette_primary); lv_color_t color = lv_palette_main(*palette_primary);
lv_style_set_text_color(&style_icon, color); lv_style_set_text_color(&style_icon, color);
@@ -1074,7 +1094,8 @@ static void color_event_cb(lv_event_t * e)
} }
} }
static lv_obj_t * create_meter_box(lv_obj_t * parent, const char * title, const char * text1, const char * text2, const char * text3) static lv_obj_t * create_meter_box(lv_obj_t * parent, const char * title, const char * text1, const char * text2,
const char * text3)
{ {
lv_obj_t * cont = lv_obj_create(parent); lv_obj_t * cont = lv_obj_create(parent);
lv_obj_set_height(cont, LV_SIZE_CONTENT); lv_obj_set_height(cont, LV_SIZE_CONTENT);
@@ -1114,7 +1135,7 @@ static lv_obj_t * create_meter_box(lv_obj_t * parent, const char * title, const
lv_label_set_text(label3, text3); lv_label_set_text(label3, text3);
if(disp_size == DISP_MEDIUM) { if(disp_size == DISP_MEDIUM) {
static lv_coord_t grid_col_dsc[] = {LV_GRID_CONTENT, LV_GRID_FR(1), LV_GRID_CONTENT,LV_GRID_FR(8), LV_GRID_TEMPLATE_LAST}; static lv_coord_t grid_col_dsc[] = {LV_GRID_CONTENT, LV_GRID_FR(1), LV_GRID_CONTENT, LV_GRID_FR(8), LV_GRID_TEMPLATE_LAST};
static lv_coord_t grid_row_dsc[] = {LV_GRID_CONTENT, LV_GRID_FR(1), LV_GRID_CONTENT, LV_GRID_CONTENT, LV_GRID_CONTENT, LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST}; static lv_coord_t grid_row_dsc[] = {LV_GRID_CONTENT, LV_GRID_FR(1), LV_GRID_CONTENT, LV_GRID_CONTENT, LV_GRID_CONTENT, LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST};
lv_obj_set_grid_dsc_array(cont, grid_col_dsc, grid_row_dsc); lv_obj_set_grid_dsc_array(cont, grid_col_dsc, grid_row_dsc);
@@ -1146,7 +1167,8 @@ static lv_obj_t * create_meter_box(lv_obj_t * parent, const char * title, const
} }
static lv_obj_t * create_shop_item(lv_obj_t * parent, const void * img_src, const char * name, const char * category, const char * price) static lv_obj_t * create_shop_item(lv_obj_t * parent, const void * img_src, const char * name, const char * category,
const char * price)
{ {
static lv_coord_t grid_col_dsc[] = {LV_GRID_CONTENT, 5, LV_GRID_FR(1), LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST}; static lv_coord_t grid_col_dsc[] = {LV_GRID_CONTENT, 5, LV_GRID_FR(1), LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST};
static lv_coord_t grid_row_dsc[] = {LV_GRID_FR(1), LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST}; static lv_coord_t grid_row_dsc[] = {LV_GRID_FR(1), LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST};
@@ -1257,9 +1279,10 @@ static void slider_event_cb(lv_event_t * e)
lv_obj_t * obj = lv_event_get_target(e); lv_obj_t * obj = lv_event_get_target(e);
if(code == LV_EVENT_REFR_EXT_DRAW_SIZE) { if(code == LV_EVENT_REFR_EXT_DRAW_SIZE) {
lv_coord_t *s = lv_event_get_param(e); lv_coord_t * s = lv_event_get_param(e);
*s = LV_MAX(*s, 60); *s = LV_MAX(*s, 60);
} else if(code == LV_EVENT_DRAW_PART_END) { }
else if(code == LV_EVENT_DRAW_PART_END) {
lv_obj_draw_part_dsc_t * dsc = lv_event_get_param(e); lv_obj_draw_part_dsc_t * dsc = lv_event_get_param(e);
if(dsc->part == LV_PART_KNOB && lv_obj_has_state(obj, LV_STATE_PRESSED)) { if(dsc->part == LV_PART_KNOB && lv_obj_has_state(obj, LV_STATE_PRESSED)) {
char buf[8]; char buf[8];
@@ -1310,7 +1333,8 @@ static void chart_event_cb(lv_event_t * e)
if(lv_chart_get_type(obj) == LV_CHART_TYPE_BAR) { if(lv_chart_get_type(obj) == LV_CHART_TYPE_BAR) {
const char * month[] = {"I", "II", "III", "IV", "V", "VI", "VII", "VIII", "IX", "X", "XI", "XII"}; const char * month[] = {"I", "II", "III", "IV", "V", "VI", "VII", "VIII", "IX", "X", "XI", "XII"};
lv_snprintf(dsc->text, dsc->text_length, "%s", month[dsc->value]); lv_snprintf(dsc->text, dsc->text_length, "%s", month[dsc->value]);
} else { }
else {
const char * month[] = {"Jan", "Febr", "March", "Apr", "May", "Jun", "July", "Aug", "Sept", "Oct", "Nov", "Dec"}; const char * month[] = {"Jan", "Febr", "March", "Apr", "May", "Jun", "July", "Aug", "Sept", "Oct", "Nov", "Dec"};
lv_snprintf(dsc->text, dsc->text_length, "%s", month[dsc->value]); lv_snprintf(dsc->text, dsc->text_length, "%s", month[dsc->value]);
} }
@@ -1322,13 +1346,15 @@ static void chart_event_cb(lv_event_t * e)
/*Add a line mask that keeps the area below the line*/ /*Add a line mask that keeps the area below the line*/
if(dsc->p1 && dsc->p2) { if(dsc->p1 && dsc->p2) {
lv_draw_mask_line_param_t line_mask_param; lv_draw_mask_line_param_t line_mask_param;
lv_draw_mask_line_points_init(&line_mask_param, dsc->p1->x, dsc->p1->y, dsc->p2->x, dsc->p2->y, LV_DRAW_MASK_LINE_SIDE_BOTTOM); lv_draw_mask_line_points_init(&line_mask_param, dsc->p1->x, dsc->p1->y, dsc->p2->x, dsc->p2->y,
LV_DRAW_MASK_LINE_SIDE_BOTTOM);
int16_t line_mask_id = lv_draw_mask_add(&line_mask_param, NULL); int16_t line_mask_id = lv_draw_mask_add(&line_mask_param, NULL);
/*Add a fade effect: transparent bottom covering top*/ /*Add a fade effect: transparent bottom covering top*/
lv_coord_t h = lv_obj_get_height(obj); lv_coord_t h = lv_obj_get_height(obj);
lv_draw_mask_fade_param_t fade_mask_param; lv_draw_mask_fade_param_t fade_mask_param;
lv_draw_mask_fade_init(&fade_mask_param, &obj->coords, LV_OPA_COVER, obj->coords.y1 + h / 8, LV_OPA_TRANSP, obj->coords.y2); lv_draw_mask_fade_init(&fade_mask_param, &obj->coords, LV_OPA_COVER, obj->coords.y1 + h / 8, LV_OPA_TRANSP,
obj->coords.y2);
int16_t fade_mask_id = lv_draw_mask_add(&fade_mask_param, NULL); int16_t fade_mask_id = lv_draw_mask_add(&fade_mask_param, NULL);
/*Draw a rectangle that will be affected by the mask*/ /*Draw a rectangle that will be affected by the mask*/
@@ -1361,7 +1387,8 @@ static void chart_event_cb(lv_event_t * e)
if(lv_chart_get_type(obj) == LV_CHART_TYPE_LINE) { if(lv_chart_get_type(obj) == LV_CHART_TYPE_LINE) {
dsc->rect_dsc->outline_color = lv_color_white(); dsc->rect_dsc->outline_color = lv_color_white();
dsc->rect_dsc->outline_width = 2; dsc->rect_dsc->outline_width = 2;
} else { }
else {
dsc->rect_dsc->shadow_color = ser->color; dsc->rect_dsc->shadow_color = ser->color;
dsc->rect_dsc->shadow_width = 15; dsc->rect_dsc->shadow_width = 15;
dsc->rect_dsc->shadow_spread = 0; dsc->rect_dsc->shadow_spread = 0;
@@ -1380,11 +1407,13 @@ static void chart_event_cb(lv_event_t * e)
if(ser == lv_chart_get_series_next(obj, NULL)) { if(ser == lv_chart_get_series_next(obj, NULL)) {
txt_area.x1 = dsc->draw_area->x1 + lv_area_get_width(dsc->draw_area) / 2; txt_area.x1 = dsc->draw_area->x1 + lv_area_get_width(dsc->draw_area) / 2;
txt_area.x2 = txt_area.x1 + text_size.x; txt_area.x2 = txt_area.x1 + text_size.x;
} else { }
else {
txt_area.x2 = dsc->draw_area->x1 + lv_area_get_width(dsc->draw_area) / 2; txt_area.x2 = dsc->draw_area->x1 + lv_area_get_width(dsc->draw_area) / 2;
txt_area.x1 = txt_area.x2 - text_size.x; txt_area.x1 = txt_area.x2 - text_size.x;
} }
} else { }
else {
txt_area.x1 = dsc->draw_area->x1 + lv_area_get_width(dsc->draw_area) / 2 - text_size.x / 2; txt_area.x1 = dsc->draw_area->x1 + lv_area_get_width(dsc->draw_area) / 2 - text_size.x / 2;
txt_area.x2 = txt_area.x1 + text_size.x; txt_area.x2 = txt_area.x1 + text_size.x;
txt_area.y2 = dsc->draw_area->y1 - LV_DPX(15); txt_area.y2 = dsc->draw_area->y1 - LV_DPX(15);
@@ -1408,7 +1437,8 @@ static void chart_event_cb(lv_event_t * e)
label_dsc.color = lv_color_white(); label_dsc.color = lv_color_white();
label_dsc.font = font_normal; label_dsc.font = font_normal;
lv_draw_label(dsc->draw_ctx, &label_dsc, &txt_area, buf, NULL); lv_draw_label(dsc->draw_ctx, &label_dsc, &txt_area, buf, NULL);
} else { }
else {
dsc->rect_dsc->outline_width = 0; dsc->rect_dsc->outline_width = 0;
dsc->rect_dsc->shadow_width = 0; dsc->rect_dsc->shadow_width = 0;
} }
@@ -1458,12 +1488,12 @@ static void shop_chart_event_cb(lv_event_t * e)
a.y2 = a.y1 + (clothes[dsc->id] * h) / 100; a.y2 = a.y1 + (clothes[dsc->id] * h) / 100;
draw_rect_dsc.bg_color = lv_palette_main(LV_PALETTE_BLUE); draw_rect_dsc.bg_color = lv_palette_main(LV_PALETTE_BLUE);
draw_rect_dsc.radius = 0; draw_rect_dsc.radius = 0;
lv_draw_rect( dsc->draw_ctx, &draw_rect_dsc, &a); lv_draw_rect(dsc->draw_ctx, &draw_rect_dsc, &a);
a.y1 = a.y2; a.y1 = a.y2;
a.y2 = a.y1 + (services[dsc->id] * h) / 100; a.y2 = a.y1 + (services[dsc->id] * h) / 100;
draw_rect_dsc.bg_color = lv_palette_main(LV_PALETTE_GREEN); draw_rect_dsc.bg_color = lv_palette_main(LV_PALETTE_GREEN);
lv_draw_rect( dsc->draw_ctx, &draw_rect_dsc, &a); lv_draw_rect(dsc->draw_ctx, &draw_rect_dsc, &a);
} }
} }
} }
@@ -1509,7 +1539,8 @@ static void meter2_timer_cb(lv_timer_t * timer)
if(down1) { if(down1) {
session_desktop -= 137; session_desktop -= 137;
if(session_desktop < 1400) down1 = false; if(session_desktop < 1400) down1 = false;
} else { }
else {
session_desktop += 116; session_desktop += 116;
if(session_desktop > 4500) down1 = true; if(session_desktop > 4500) down1 = true;
} }
@@ -1517,7 +1548,8 @@ static void meter2_timer_cb(lv_timer_t * timer)
if(down2) { if(down2) {
session_tablet -= 3; session_tablet -= 3;
if(session_tablet < 1400) down2 = false; if(session_tablet < 1400) down2 = false;
} else { }
else {
session_tablet += 9; session_tablet += 9;
if(session_tablet > 4500) down2 = true; if(session_tablet > 4500) down2 = true;
} }
@@ -1525,7 +1557,8 @@ static void meter2_timer_cb(lv_timer_t * timer)
if(down3) { if(down3) {
session_mobile -= 57; session_mobile -= 57;
if(session_mobile < 1400) down3 = false; if(session_mobile < 1400) down3 = false;
} else { }
else {
session_mobile += 76; session_mobile += 76;
if(session_mobile > 4500) down3 = true; if(session_mobile > 4500) down3 = true;
} }

View File

@@ -20,7 +20,8 @@ static void sw_event_cb(lv_event_t * e)
lv_anim_set_exec_cb(&a, anim_x_cb); lv_anim_set_exec_cb(&a, anim_x_cb);
lv_anim_set_path_cb(&a, lv_anim_path_overshoot); lv_anim_set_path_cb(&a, lv_anim_path_overshoot);
lv_anim_start(&a); lv_anim_start(&a);
} else { }
else {
lv_anim_t a; lv_anim_t a;
lv_anim_init(&a); lv_anim_init(&a);
lv_anim_set_var(&a, label); lv_anim_set_var(&a, label);

View File

@@ -36,8 +36,8 @@ static void anim_x_cb(void * var, int32_t v);
*/ */
void lv_example_anim_3(void) void lv_example_anim_3(void)
{ {
static lv_coord_t col_dsc[] = {LV_GRID_FR(1), 200, LV_GRID_FR(1),LV_GRID_TEMPLATE_LAST}; static lv_coord_t col_dsc[] = {LV_GRID_FR(1), 200, LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST};
static lv_coord_t row_dsc[] = {30, 10, 10, LV_GRID_FR(1),LV_GRID_TEMPLATE_LAST}; static lv_coord_t row_dsc[] = {30, 10, 10, LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST};
/*Create a container with grid*/ /*Create a container with grid*/
lv_obj_t * cont = lv_obj_create(lv_scr_act()); lv_obj_t * cont = lv_obj_create(lv_scr_act());
@@ -124,14 +124,14 @@ static void page_obj_init(lv_obj_t * par)
lv_obj_set_align(ginfo.anim_obj, LV_ALIGN_TOP_LEFT); lv_obj_set_align(ginfo.anim_obj, LV_ALIGN_TOP_LEFT);
lv_obj_clear_flag(ginfo.anim_obj, LV_OBJ_FLAG_SCROLLABLE); lv_obj_clear_flag(ginfo.anim_obj, LV_OBJ_FLAG_SCROLLABLE);
lv_obj_set_style_bg_color(ginfo.anim_obj, lv_palette_main(LV_PALETTE_RED), LV_PART_MAIN); lv_obj_set_style_bg_color(ginfo.anim_obj, lv_palette_main(LV_PALETTE_RED), LV_PART_MAIN);
lv_obj_set_grid_cell(ginfo.anim_obj, LV_GRID_ALIGN_START, 0, 1,LV_GRID_ALIGN_START, 0, 1); lv_obj_set_grid_cell(ginfo.anim_obj, LV_GRID_ALIGN_START, 0, 1, LV_GRID_ALIGN_START, 0, 1);
ginfo.p1_label = lv_label_create(par); ginfo.p1_label = lv_label_create(par);
ginfo.p2_label = lv_label_create(par); ginfo.p2_label = lv_label_create(par);
lv_label_set_text(ginfo.p1_label, "p1:0"); lv_label_set_text(ginfo.p1_label, "p1:0");
lv_label_set_text(ginfo.p2_label, "p2:0"); lv_label_set_text(ginfo.p2_label, "p2:0");
lv_obj_set_grid_cell(ginfo.p1_label, LV_GRID_ALIGN_START, 0, 1,LV_GRID_ALIGN_START, 1, 1); lv_obj_set_grid_cell(ginfo.p1_label, LV_GRID_ALIGN_START, 0, 1, LV_GRID_ALIGN_START, 1, 1);
lv_obj_set_grid_cell(ginfo.p2_label, LV_GRID_ALIGN_START, 0, 1,LV_GRID_ALIGN_START, 2, 1); lv_obj_set_grid_cell(ginfo.p2_label, LV_GRID_ALIGN_START, 0, 1, LV_GRID_ALIGN_START, 2, 1);
ginfo.p1_slider = lv_slider_create(par); ginfo.p1_slider = lv_slider_create(par);
ginfo.p2_slider = lv_slider_create(par); ginfo.p2_slider = lv_slider_create(par);
@@ -141,15 +141,15 @@ static void page_obj_init(lv_obj_t * par)
lv_obj_set_style_pad_all(ginfo.p2_slider, 2, LV_PART_KNOB); lv_obj_set_style_pad_all(ginfo.p2_slider, 2, LV_PART_KNOB);
lv_obj_add_event_cb(ginfo.p1_slider, slider_event_cb, LV_EVENT_VALUE_CHANGED, NULL); lv_obj_add_event_cb(ginfo.p1_slider, slider_event_cb, LV_EVENT_VALUE_CHANGED, NULL);
lv_obj_add_event_cb(ginfo.p2_slider, slider_event_cb, LV_EVENT_VALUE_CHANGED, NULL); lv_obj_add_event_cb(ginfo.p2_slider, slider_event_cb, LV_EVENT_VALUE_CHANGED, NULL);
lv_obj_set_grid_cell(ginfo.p1_slider, LV_GRID_ALIGN_STRETCH, 1, 1,LV_GRID_ALIGN_START, 1, 1); lv_obj_set_grid_cell(ginfo.p1_slider, LV_GRID_ALIGN_STRETCH, 1, 1, LV_GRID_ALIGN_START, 1, 1);
lv_obj_set_grid_cell(ginfo.p2_slider, LV_GRID_ALIGN_STRETCH, 1, 1,LV_GRID_ALIGN_START, 2, 1); lv_obj_set_grid_cell(ginfo.p2_slider, LV_GRID_ALIGN_STRETCH, 1, 1, LV_GRID_ALIGN_START, 2, 1);
ginfo.run_btn = lv_btn_create(par); ginfo.run_btn = lv_btn_create(par);
lv_obj_add_event_cb(ginfo.run_btn, run_btn_event_handler, LV_EVENT_CLICKED, NULL); lv_obj_add_event_cb(ginfo.run_btn, run_btn_event_handler, LV_EVENT_CLICKED, NULL);
lv_obj_t * btn_label = lv_label_create(ginfo.run_btn); lv_obj_t * btn_label = lv_label_create(ginfo.run_btn);
lv_label_set_text(btn_label, LV_SYMBOL_PLAY); lv_label_set_text(btn_label, LV_SYMBOL_PLAY);
lv_obj_center(btn_label); lv_obj_center(btn_label);
lv_obj_set_grid_cell(ginfo.run_btn, LV_GRID_ALIGN_STRETCH, 2, 1,LV_GRID_ALIGN_STRETCH, 1, 2); lv_obj_set_grid_cell(ginfo.run_btn, LV_GRID_ALIGN_STRETCH, 2, 1, LV_GRID_ALIGN_STRETCH, 1, 2);
ginfo.chart = lv_chart_create(par); ginfo.chart = lv_chart_create(par);
lv_obj_set_style_pad_all(ginfo.chart, 0, LV_PART_MAIN); lv_obj_set_style_pad_all(ginfo.chart, 0, LV_PART_MAIN);
@@ -159,7 +159,7 @@ static void page_obj_init(lv_obj_t * par)
lv_chart_set_range(ginfo.chart, LV_CHART_AXIS_PRIMARY_Y, 0, 1024); lv_chart_set_range(ginfo.chart, LV_CHART_AXIS_PRIMARY_Y, 0, 1024);
lv_chart_set_range(ginfo.chart, LV_CHART_AXIS_PRIMARY_X, 0, 1024); lv_chart_set_range(ginfo.chart, LV_CHART_AXIS_PRIMARY_X, 0, 1024);
lv_chart_set_point_count(ginfo.chart, CHART_POINTS_NUM); lv_chart_set_point_count(ginfo.chart, CHART_POINTS_NUM);
lv_obj_set_grid_cell(ginfo.chart, LV_GRID_ALIGN_STRETCH, 0, 3,LV_GRID_ALIGN_STRETCH, 3, 1); lv_obj_set_grid_cell(ginfo.chart, LV_GRID_ALIGN_STRETCH, 0, 3, LV_GRID_ALIGN_STRETCH, 3, 1);
} }
#endif #endif

View File

@@ -93,7 +93,7 @@ static void btn_start_event_handler(lv_event_t * e)
{ {
lv_obj_t * btn = lv_event_get_target(e); lv_obj_t * btn = lv_event_get_target(e);
if (!anim_timeline) { if(!anim_timeline) {
anim_timeline_create(); anim_timeline_create();
} }
@@ -105,7 +105,7 @@ static void btn_start_event_handler(lv_event_t * e)
static void btn_del_event_handler(lv_event_t * e) static void btn_del_event_handler(lv_event_t * e)
{ {
LV_UNUSED(e); LV_UNUSED(e);
if (anim_timeline) { if(anim_timeline) {
lv_anim_timeline_del(anim_timeline); lv_anim_timeline_del(anim_timeline);
anim_timeline = NULL; anim_timeline = NULL;
} }
@@ -114,7 +114,7 @@ static void btn_del_event_handler(lv_event_t * e)
static void btn_stop_event_handler(lv_event_t * e) static void btn_stop_event_handler(lv_event_t * e)
{ {
LV_UNUSED(e); LV_UNUSED(e);
if (anim_timeline) { if(anim_timeline) {
lv_anim_timeline_stop(anim_timeline); lv_anim_timeline_stop(anim_timeline);
} }
} }
@@ -123,7 +123,7 @@ static void slider_prg_event_handler(lv_event_t * e)
{ {
lv_obj_t * slider = lv_event_get_target(e); lv_obj_t * slider = lv_event_get_target(e);
if (!anim_timeline) { if(!anim_timeline) {
anim_timeline_create(); anim_timeline_create();
} }

View File

@@ -7,15 +7,16 @@ static lv_obj_t * label = NULL;
static void timer_cb(lv_timer_t * timer) static void timer_cb(lv_timer_t * timer)
{ {
if (n < 3 || n > 32) { if(n < 3 || n > 32) {
n = 3; n = 3;
} else { }
else {
static uint32_t old_tick = 0; static uint32_t old_tick = 0;
uint32_t tick = lv_tick_get(); uint32_t tick = lv_tick_get();
if (!old_tick) { if(!old_tick) {
old_tick = tick; old_tick = tick;
} }
if (tick - old_tick > 3000) { if(tick - old_tick > 3000) {
n++; n++;
lv_label_set_text_fmt(label, "%d sides", n); lv_label_set_text_fmt(label, "%d sides", n);
old_tick = tick; old_tick = tick;
@@ -35,7 +36,7 @@ static void event_cb(lv_event_t * e)
lv_point_t points[32]; lv_point_t points[32];
int i, r = 150; int i, r = 150;
uint32_t tick = lv_tick_get(); uint32_t tick = lv_tick_get();
for (i = 0; i < n; i++) { for(i = 0; i < n; i++) {
int angle = i * 360 / n + ((tick % 36000) / 100); int angle = i * 360 / n + ((tick % 36000) / 100);
lv_coord_t x = 150 + (r * lv_trigo_cos(angle) >> LV_TRIGO_SHIFT), y = lv_coord_t x = 150 + (r * lv_trigo_cos(angle) >> LV_TRIGO_SHIFT), y =
150 + (r * lv_trigo_sin(angle) >> LV_TRIGO_SHIFT); 150 + (r * lv_trigo_sin(angle) >> LV_TRIGO_SHIFT);

View File

@@ -24,7 +24,7 @@ void lv_example_flex_1(void)
lv_obj_t * label; lv_obj_t * label;
/*Add items to the row*/ /*Add items to the row*/
obj= lv_btn_create(cont_row); obj = lv_btn_create(cont_row);
lv_obj_set_size(obj, 100, LV_PCT(100)); lv_obj_set_size(obj, 100, LV_PCT(100));
label = lv_label_create(obj); label = lv_label_create(obj);

View File

@@ -2,11 +2,11 @@
#ifndef LV_ATTRIBUTE_MEM_ALIGN #ifndef LV_ATTRIBUTE_MEM_ALIGN
#define LV_ATTRIBUTE_MEM_ALIGN #define LV_ATTRIBUTE_MEM_ALIGN
#endif #endif
#ifndef LV_ATTRIBUTE_IMG_BULB_GIF #ifndef LV_ATTRIBUTE_IMG_BULB_GIF
#define LV_ATTRIBUTE_IMG_BULB_GIF #define LV_ATTRIBUTE_IMG_BULB_GIF
#endif #endif
static const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_BULB_GIF uint8_t img_blub_gif_map[] = { static const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_BULB_GIF uint8_t img_blub_gif_map[] = {

View File

@@ -3,11 +3,11 @@
#ifndef LV_ATTRIBUTE_MEM_ALIGN #ifndef LV_ATTRIBUTE_MEM_ALIGN
#define LV_ATTRIBUTE_MEM_ALIGN #define LV_ATTRIBUTE_MEM_ALIGN
#endif #endif
#ifndef LV_ATTRIBUTE_IMG_PNG_DECODER_TEST #ifndef LV_ATTRIBUTE_IMG_PNG_DECODER_TEST
#define LV_ATTRIBUTE_IMG_PNG_DECODER_TEST #define LV_ATTRIBUTE_IMG_PNG_DECODER_TEST
#endif #endif
const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_PNG_DECODER_TEST uint8_t img_wink_png_map[] = { const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_PNG_DECODER_TEST uint8_t img_wink_png_map[] = {

View File

@@ -6,15 +6,15 @@
#if LV_USE_FRAGMENT && LV_BUILD_EXAMPLES #if LV_USE_FRAGMENT && LV_BUILD_EXAMPLES
static void sample_fragment_ctor(lv_fragment_t *self, void *args); static void sample_fragment_ctor(lv_fragment_t * self, void * args);
static lv_obj_t *sample_fragment_create_obj(lv_fragment_t *self, lv_obj_t *parent); static lv_obj_t * sample_fragment_create_obj(lv_fragment_t * self, lv_obj_t * parent);
static lv_obj_t * root = NULL; static lv_obj_t * root = NULL;
struct sample_fragment_t { struct sample_fragment_t {
lv_fragment_t base; lv_fragment_t base;
const char *name; const char * name;
}; };
static const lv_fragment_class_t sample_cls = { static const lv_fragment_class_t sample_cls = {
@@ -27,18 +27,20 @@ void lv_example_fragment_1(void)
{ {
root = lv_obj_create(lv_scr_act()); root = lv_obj_create(lv_scr_act());
lv_obj_set_size(root, LV_PCT(100), LV_PCT(100)); lv_obj_set_size(root, LV_PCT(100), LV_PCT(100));
lv_fragment_manager_t *manager = lv_fragment_manager_create(NULL); lv_fragment_manager_t * manager = lv_fragment_manager_create(NULL);
lv_fragment_t *fragment = lv_fragment_create(&sample_cls, "Fragment"); lv_fragment_t * fragment = lv_fragment_create(&sample_cls, "Fragment");
lv_fragment_manager_replace(manager, fragment, &root); lv_fragment_manager_replace(manager, fragment, &root);
} }
static void sample_fragment_ctor(lv_fragment_t *self, void *args) { static void sample_fragment_ctor(lv_fragment_t * self, void * args)
{
((struct sample_fragment_t *) self)->name = args; ((struct sample_fragment_t *) self)->name = args;
} }
static lv_obj_t *sample_fragment_create_obj(lv_fragment_t *self, lv_obj_t *parent) { static lv_obj_t * sample_fragment_create_obj(lv_fragment_t * self, lv_obj_t * parent)
lv_obj_t *label = lv_label_create(parent); {
lv_obj_t * label = lv_label_create(parent);
lv_obj_set_style_bg_opa(label, LV_OPA_COVER, 0);; lv_obj_set_style_bg_opa(label, LV_OPA_COVER, 0);;
lv_label_set_text_fmt(label, "Hello, %s!", ((struct sample_fragment_t *) self)->name); lv_label_set_text_fmt(label, "Hello, %s!", ((struct sample_fragment_t *) self)->name);
return label; return label;

View File

@@ -6,19 +6,19 @@
#if LV_USE_FRAGMENT && LV_USE_WIN && LV_BUILD_EXAMPLES #if LV_USE_FRAGMENT && LV_USE_WIN && LV_BUILD_EXAMPLES
static void sample_fragment_ctor(lv_fragment_t *self, void *args); static void sample_fragment_ctor(lv_fragment_t * self, void * args);
static lv_obj_t *sample_fragment_create_obj(lv_fragment_t *self, lv_obj_t *parent); static lv_obj_t * sample_fragment_create_obj(lv_fragment_t * self, lv_obj_t * parent);
static void sample_push_click(lv_event_t *e); static void sample_push_click(lv_event_t * e);
static void sample_pop_click(lv_event_t *e); static void sample_pop_click(lv_event_t * e);
static void sample_fragment_inc_click(lv_event_t *e); static void sample_fragment_inc_click(lv_event_t * e);
typedef struct sample_fragment_t { typedef struct sample_fragment_t {
lv_fragment_t base; lv_fragment_t base;
lv_obj_t *label; lv_obj_t * label;
int depth; int depth;
int counter; int counter;
} sample_fragment_t; } sample_fragment_t;
@@ -29,11 +29,11 @@ static const lv_fragment_class_t sample_cls = {
.instance_size = sizeof(sample_fragment_t) .instance_size = sizeof(sample_fragment_t)
}; };
static lv_obj_t *container = NULL; static lv_obj_t * container = NULL;
void lv_example_fragment_2(void) void lv_example_fragment_2(void)
{ {
lv_obj_t *root = lv_obj_create(lv_scr_act()); lv_obj_t * root = lv_obj_create(lv_scr_act());
lv_obj_set_size(root, LV_PCT(100), LV_PCT(100)); lv_obj_set_size(root, LV_PCT(100), LV_PCT(100));
lv_obj_set_layout(root, LV_LAYOUT_GRID); lv_obj_set_layout(root, LV_LAYOUT_GRID);
static const lv_coord_t col_dsc[] = {LV_GRID_FR(1), LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST}; static const lv_coord_t col_dsc[] = {LV_GRID_FR(1), LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST};
@@ -43,67 +43,72 @@ void lv_example_fragment_2(void)
lv_obj_remove_style_all(container); lv_obj_remove_style_all(container);
lv_obj_set_grid_cell(container, LV_GRID_ALIGN_STRETCH, 0, 2, LV_GRID_ALIGN_STRETCH, 0, 1); lv_obj_set_grid_cell(container, LV_GRID_ALIGN_STRETCH, 0, 2, LV_GRID_ALIGN_STRETCH, 0, 1);
lv_obj_t *push_btn = lv_btn_create(root); lv_obj_t * push_btn = lv_btn_create(root);
lv_obj_t *push_label = lv_label_create(push_btn); lv_obj_t * push_label = lv_label_create(push_btn);
lv_label_set_text(push_label, "Push"); lv_label_set_text(push_label, "Push");
lv_obj_t *pop_btn = lv_btn_create(root); lv_obj_t * pop_btn = lv_btn_create(root);
lv_obj_t *pop_label = lv_label_create(pop_btn); lv_obj_t * pop_label = lv_label_create(pop_btn);
lv_label_set_text(pop_label, "Pop"); lv_label_set_text(pop_label, "Pop");
lv_obj_set_grid_cell(push_btn, LV_GRID_ALIGN_START, 0, 1, LV_GRID_ALIGN_CENTER, 1, 1); lv_obj_set_grid_cell(push_btn, LV_GRID_ALIGN_START, 0, 1, LV_GRID_ALIGN_CENTER, 1, 1);
lv_obj_set_grid_cell(pop_btn, LV_GRID_ALIGN_END, 1, 1, LV_GRID_ALIGN_CENTER, 1, 1); lv_obj_set_grid_cell(pop_btn, LV_GRID_ALIGN_END, 1, 1, LV_GRID_ALIGN_CENTER, 1, 1);
lv_fragment_manager_t *manager = lv_fragment_manager_create(NULL); lv_fragment_manager_t * manager = lv_fragment_manager_create(NULL);
int depth = 0; int depth = 0;
lv_fragment_t *fragment = lv_fragment_create(&sample_cls, &depth); lv_fragment_t * fragment = lv_fragment_create(&sample_cls, &depth);
lv_fragment_manager_push(manager, fragment, &container); lv_fragment_manager_push(manager, fragment, &container);
lv_obj_add_event_cb(push_btn, sample_push_click, LV_EVENT_CLICKED, manager); lv_obj_add_event_cb(push_btn, sample_push_click, LV_EVENT_CLICKED, manager);
lv_obj_add_event_cb(pop_btn, sample_pop_click, LV_EVENT_CLICKED, manager); lv_obj_add_event_cb(pop_btn, sample_pop_click, LV_EVENT_CLICKED, manager);
} }
static void sample_fragment_ctor(lv_fragment_t *self, void *args) { static void sample_fragment_ctor(lv_fragment_t * self, void * args)
{
LV_UNUSED(args); LV_UNUSED(args);
((sample_fragment_t *) self)->depth = *((int *) args); ((sample_fragment_t *) self)->depth = *((int *) args);
((sample_fragment_t *) self)->counter = 0; ((sample_fragment_t *) self)->counter = 0;
} }
static lv_obj_t *sample_fragment_create_obj(lv_fragment_t *self, lv_obj_t *parent) { static lv_obj_t * sample_fragment_create_obj(lv_fragment_t * self, lv_obj_t * parent)
sample_fragment_t *fragment = (sample_fragment_t *) self; {
lv_obj_t *content = lv_obj_create(parent); sample_fragment_t * fragment = (sample_fragment_t *) self;
lv_obj_t * content = lv_obj_create(parent);
lv_obj_remove_style_all(content); lv_obj_remove_style_all(content);
lv_obj_set_style_bg_opa(content, LV_OPA_50, 0); lv_obj_set_style_bg_opa(content, LV_OPA_50, 0);
lv_obj_set_style_bg_color(content, lv_palette_main(LV_PALETTE_YELLOW), 0); lv_obj_set_style_bg_color(content, lv_palette_main(LV_PALETTE_YELLOW), 0);
lv_obj_set_size(content, LV_PCT(100), LV_PCT(100)); lv_obj_set_size(content, LV_PCT(100), LV_PCT(100));
lv_obj_set_flex_flow(content, LV_FLEX_FLOW_COLUMN); lv_obj_set_flex_flow(content, LV_FLEX_FLOW_COLUMN);
lv_obj_t *depth = lv_label_create(content); lv_obj_t * depth = lv_label_create(content);
lv_label_set_text_fmt(depth, "Depth: %d", fragment->depth); lv_label_set_text_fmt(depth, "Depth: %d", fragment->depth);
lv_obj_t *label = lv_label_create(content); lv_obj_t * label = lv_label_create(content);
fragment->label = label; fragment->label = label;
lv_label_set_text_fmt(label, "The button has been pressed %d times", fragment->counter); lv_label_set_text_fmt(label, "The button has been pressed %d times", fragment->counter);
lv_obj_t *inc_btn = lv_btn_create(content); lv_obj_t * inc_btn = lv_btn_create(content);
lv_obj_t *inc_label = lv_label_create(inc_btn); lv_obj_t * inc_label = lv_label_create(inc_btn);
lv_label_set_text(inc_label, "+1"); lv_label_set_text(inc_label, "+1");
lv_obj_add_event_cb(inc_btn, sample_fragment_inc_click, LV_EVENT_CLICKED, fragment); lv_obj_add_event_cb(inc_btn, sample_fragment_inc_click, LV_EVENT_CLICKED, fragment);
return content; return content;
} }
static void sample_push_click(lv_event_t *e) { static void sample_push_click(lv_event_t * e)
lv_fragment_manager_t *manager = (lv_fragment_manager_t *) lv_event_get_user_data(e); {
lv_fragment_manager_t * manager = (lv_fragment_manager_t *) lv_event_get_user_data(e);
size_t stack_size = lv_fragment_manager_get_stack_size(manager); size_t stack_size = lv_fragment_manager_get_stack_size(manager);
lv_fragment_t *fragment = lv_fragment_create(&sample_cls, &stack_size); lv_fragment_t * fragment = lv_fragment_create(&sample_cls, &stack_size);
lv_fragment_manager_push(manager, fragment, &container); lv_fragment_manager_push(manager, fragment, &container);
} }
static void sample_pop_click(lv_event_t *e) { static void sample_pop_click(lv_event_t * e)
lv_fragment_manager_t *manager = (lv_fragment_manager_t *) lv_event_get_user_data(e); {
lv_fragment_manager_t * manager = (lv_fragment_manager_t *) lv_event_get_user_data(e);
lv_fragment_manager_pop(manager); lv_fragment_manager_pop(manager);
} }
static void sample_fragment_inc_click(lv_event_t *e) { static void sample_fragment_inc_click(lv_event_t * e)
sample_fragment_t *fragment = (sample_fragment_t *) lv_event_get_user_data(e); {
sample_fragment_t * fragment = (sample_fragment_t *) lv_event_get_user_data(e);
fragment->counter++; fragment->counter++;
lv_label_set_text_fmt(fragment->label, "The button has been pressed %d times", fragment->counter); lv_label_set_text_fmt(fragment->label, "The button has been pressed %d times", fragment->counter);
} }

View File

@@ -1,14 +1,14 @@
#include "../../lv_examples.h" #include "../../lv_examples.h"
#if LV_USE_SNAPSHOT && LV_BUILD_EXAMPLES #if LV_USE_SNAPSHOT && LV_BUILD_EXAMPLES
static void event_cb(lv_event_t* e) static void event_cb(lv_event_t * e)
{ {
lv_obj_t * snapshot_obj = lv_event_get_user_data(e); lv_obj_t * snapshot_obj = lv_event_get_user_data(e);
lv_obj_t * img = lv_event_get_target(e); lv_obj_t * img = lv_event_get_target(e);
if(snapshot_obj) { if(snapshot_obj) {
lv_img_dsc_t* snapshot = (void*)lv_img_get_src(snapshot_obj); lv_img_dsc_t * snapshot = (void *)lv_img_get_src(snapshot_obj);
if(snapshot){ if(snapshot) {
lv_snapshot_free(snapshot); lv_snapshot_free(snapshot);
} }

View File

@@ -3,7 +3,7 @@
* *
*/ */
/*Copy this file as "lv_port_disp.c" and set this value to "1" to enable content*/ /*Copy this file as "lv_port_disp.c" and set this value to "1" to enable content*/
#if 0 #if 0
/********************* /*********************
@@ -88,7 +88,8 @@ void lv_port_disp_init(void)
static lv_disp_draw_buf_t draw_buf_dsc_3; static lv_disp_draw_buf_t draw_buf_dsc_3;
static lv_color_t buf_3_1[MY_DISP_HOR_RES * MY_DISP_VER_RES]; /*A screen sized buffer*/ static lv_color_t buf_3_1[MY_DISP_HOR_RES * MY_DISP_VER_RES]; /*A screen sized buffer*/
static lv_color_t buf_3_2[MY_DISP_HOR_RES * MY_DISP_VER_RES]; /*Another screen sized buffer*/ static lv_color_t buf_3_2[MY_DISP_HOR_RES * MY_DISP_VER_RES]; /*Another screen sized buffer*/
lv_disp_draw_buf_init(&draw_buf_dsc_3, buf_3_1, buf_3_2, MY_DISP_VER_RES * LV_VER_RES_MAX); /*Initialize the display buffer*/ lv_disp_draw_buf_init(&draw_buf_dsc_3, buf_3_1, buf_3_2,
MY_DISP_VER_RES * LV_VER_RES_MAX); /*Initialize the display buffer*/
/*----------------------------------- /*-----------------------------------
* Register the display in LVGL * Register the display in LVGL

View File

@@ -3,7 +3,7 @@
* *
*/ */
/*Copy this file as "lv_port_disp.h" and set this value to "1" to enable content*/ /*Copy this file as "lv_port_disp.h" and set this value to "1" to enable content*/
#if 0 #if 0
#ifndef LV_PORT_DISP_TEMPL_H #ifndef LV_PORT_DISP_TEMPL_H

View File

@@ -3,7 +3,7 @@
* *
*/ */
/*Copy this file as "lv_port_fs.c" and set this value to "1" to enable content*/ /*Copy this file as "lv_port_fs.c" and set this value to "1" to enable content*/
#if 0 #if 0
/********************* /*********************
@@ -33,7 +33,7 @@ static lv_fs_res_t fs_seek(lv_fs_drv_t * drv, void * file_p, uint32_t pos, lv_fs
static lv_fs_res_t fs_size(lv_fs_drv_t * drv, void * file_p, uint32_t * size_p); static lv_fs_res_t fs_size(lv_fs_drv_t * drv, void * file_p, uint32_t * size_p);
static lv_fs_res_t fs_tell(lv_fs_drv_t * drv, void * file_p, uint32_t * pos_p); static lv_fs_res_t fs_tell(lv_fs_drv_t * drv, void * file_p, uint32_t * pos_p);
static void * fs_dir_open(lv_fs_drv_t * drv, const char *path); static void * fs_dir_open(lv_fs_drv_t * drv, const char * path);
static lv_fs_res_t fs_dir_read(lv_fs_drv_t * drv, void * rddir_p, char * fn); static lv_fs_res_t fs_dir_read(lv_fs_drv_t * drv, void * rddir_p, char * fn);
static lv_fs_res_t fs_dir_close(lv_fs_drv_t * drv, void * rddir_p); static lv_fs_res_t fs_dir_close(lv_fs_drv_t * drv, void * rddir_p);
@@ -109,18 +109,15 @@ static void * fs_open(lv_fs_drv_t * drv, const char * path, lv_fs_mode_t mode)
void * f = NULL; void * f = NULL;
if(mode == LV_FS_MODE_WR) if(mode == LV_FS_MODE_WR) {
{
/*Open a file for write*/ /*Open a file for write*/
f = ... /*Add your code here*/ f = ... /*Add your code here*/
} }
else if(mode == LV_FS_MODE_RD) else if(mode == LV_FS_MODE_RD) {
{
/*Open a file for read*/ /*Open a file for read*/
f = ... /*Add your code here*/ f = ... /*Add your code here*/
} }
else if(mode == (LV_FS_MODE_WR | LV_FS_MODE_RD)) else if(mode == (LV_FS_MODE_WR | LV_FS_MODE_RD)) {
{
/*Open a file for read and write*/ /*Open a file for read and write*/
f = ... /*Add your code here*/ f = ... /*Add your code here*/
} }
@@ -217,7 +214,7 @@ static lv_fs_res_t fs_tell(lv_fs_drv_t * drv, void * file_p, uint32_t * pos_p)
* @param path path to a directory * @param path path to a directory
* @return pointer to the directory read descriptor or NULL on error * @return pointer to the directory read descriptor or NULL on error
*/ */
static void * fs_dir_open(lv_fs_drv_t * drv, const char *path) static void * fs_dir_open(lv_fs_drv_t * drv, const char * path)
{ {
void * dir = NULL; void * dir = NULL;
/*Add your code here*/ /*Add your code here*/
@@ -233,7 +230,7 @@ static void * fs_dir_open(lv_fs_drv_t * drv, const char *path)
* @param fn pointer to a buffer to store the filename * @param fn pointer to a buffer to store the filename
* @return LV_FS_RES_OK: no error or any error from @lv_fs_res_t enum * @return LV_FS_RES_OK: no error or any error from @lv_fs_res_t enum
*/ */
static lv_fs_res_t fs_dir_read(lv_fs_drv_t * drv, void * rddir_p, char *fn) static lv_fs_res_t fs_dir_read(lv_fs_drv_t * drv, void * rddir_p, char * fn)
{ {
lv_fs_res_t res = LV_FS_RES_NOT_IMP; lv_fs_res_t res = LV_FS_RES_NOT_IMP;

View File

@@ -3,7 +3,7 @@
* *
*/ */
/*Copy this file as "lv_port_fs.h" and set this value to "1" to enable content*/ /*Copy this file as "lv_port_fs.h" and set this value to "1" to enable content*/
#if 0 #if 0
#ifndef LV_PORT_FS_TEMPL_H #ifndef LV_PORT_FS_TEMPL_H
@@ -29,7 +29,7 @@ extern "C" {
/********************** /**********************
* GLOBAL PROTOTYPES * GLOBAL PROTOTYPES
**********************/ **********************/
void lv_port_fs_init(void); void lv_port_fs_init(void);
/********************** /**********************
* MACROS * MACROS

View File

@@ -3,7 +3,7 @@
* *
*/ */
/*Copy this file as "lv_port_indev.c" and set this value to "1" to enable content*/ /*Copy this file as "lv_port_indev.c" and set this value to "1" to enable content*/
#if 0 #if 0
/********************* /*********************
@@ -195,7 +195,8 @@ static void touchpad_read(lv_indev_drv_t * indev_drv, lv_indev_data_t * data)
if(touchpad_is_pressed()) { if(touchpad_is_pressed()) {
touchpad_get_xy(&last_x, &last_y); touchpad_get_xy(&last_x, &last_y);
data->state = LV_INDEV_STATE_PR; data->state = LV_INDEV_STATE_PR;
} else { }
else {
data->state = LV_INDEV_STATE_REL; data->state = LV_INDEV_STATE_REL;
} }
@@ -240,7 +241,8 @@ static void mouse_read(lv_indev_drv_t * indev_drv, lv_indev_data_t * data)
/*Get whether the mouse button is pressed or released*/ /*Get whether the mouse button is pressed or released*/
if(mouse_is_pressed()) { if(mouse_is_pressed()) {
data->state = LV_INDEV_STATE_PR; data->state = LV_INDEV_STATE_PR;
} else { }
else {
data->state = LV_INDEV_STATE_REL; data->state = LV_INDEV_STATE_REL;
} }
} }
@@ -305,7 +307,8 @@ static void keypad_read(lv_indev_drv_t * indev_drv, lv_indev_data_t * data)
} }
last_key = act_key; last_key = act_key;
} else { }
else {
data->state = LV_INDEV_STATE_REL; data->state = LV_INDEV_STATE_REL;
} }
@@ -369,7 +372,8 @@ static void button_read(lv_indev_drv_t * indev_drv, lv_indev_data_t * data)
if(btn_act >= 0) { if(btn_act >= 0) {
data->state = LV_INDEV_STATE_PR; data->state = LV_INDEV_STATE_PR;
last_btn = btn_act; last_btn = btn_act;
} else { }
else {
data->state = LV_INDEV_STATE_REL; data->state = LV_INDEV_STATE_REL;
} }

View File

@@ -4,7 +4,7 @@
* *
*/ */
/*Copy this file as "lv_port_indev.h" and set this value to "1" to enable content*/ /*Copy this file as "lv_port_indev.h" and set this value to "1" to enable content*/
#if 0 #if 0
#ifndef LV_PORT_INDEV_TEMPL_H #ifndef LV_PORT_INDEV_TEMPL_H

View File

@@ -34,7 +34,8 @@ void lv_example_scroll_2(void)
if(i == 3) { if(i == 3) {
lv_label_set_text_fmt(label, "Panel %"LV_PRIu32"\nno snap", i); lv_label_set_text_fmt(label, "Panel %"LV_PRIu32"\nno snap", i);
lv_obj_clear_flag(btn, LV_OBJ_FLAG_SNAPPABLE); lv_obj_clear_flag(btn, LV_OBJ_FLAG_SNAPPABLE);
} else { }
else {
lv_label_set_text_fmt(label, "Panel %"LV_PRIu32, i); lv_label_set_text_fmt(label, "Panel %"LV_PRIu32, i);
} }

View File

@@ -13,7 +13,8 @@ void lv_example_scroll_5(void)
lv_obj_center(obj); lv_obj_center(obj);
lv_obj_t * label = lv_label_create(obj); lv_obj_t * label = lv_label_create(obj);
lv_label_set_text(label,"میکروکُنترولر (به انگلیسی: Microcontroller) گونه‌ای ریزپردازنده است که دارای حافظهٔ دسترسی تصادفی (RAM) و حافظهٔ فقط‌خواندنی (ROM)، تایمر، پورت‌های ورودی و خروجی (I/O) و درگاه ترتیبی (Serial Port پورت سریال)، درون خود تراشه است، و می‌تواند به تنهایی ابزارهای دیگر را کنترل کند. به عبارت دیگر یک میکروکنترلر، مدار مجتمع کوچکی است که از یک CPU کوچک و اجزای دیگری مانند تایمر، درگاه‌های ورودی و خروجی آنالوگ و دیجیتال و حافظه تشکیل شده‌است."); lv_label_set_text(label,
"میکروکُنترولر (به انگلیسی: Microcontroller) گونه‌ای ریزپردازنده است که دارای حافظهٔ دسترسی تصادفی (RAM) و حافظهٔ فقط‌خواندنی (ROM)، تایمر، پورت‌های ورودی و خروجی (I/O) و درگاه ترتیبی (Serial Port پورت سریال)، درون خود تراشه است، و می‌تواند به تنهایی ابزارهای دیگر را کنترل کند. به عبارت دیگر یک میکروکنترلر، مدار مجتمع کوچکی است که از یک CPU کوچک و اجزای دیگری مانند تایمر، درگاه‌های ورودی و خروجی آنالوگ و دیجیتال و حافظه تشکیل شده‌است.");
lv_obj_set_width(label, 400); lv_obj_set_width(label, 400);
lv_obj_set_style_text_font(label, &lv_font_dejavu_16_persian_hebrew, 0); lv_obj_set_style_text_font(label, &lv_font_dejavu_16_persian_hebrew, 0);

View File

@@ -27,7 +27,8 @@ static void scroll_event_cb(lv_event_t * e)
/*If diff_y is out of the circle use the last point of the circle (the radius)*/ /*If diff_y is out of the circle use the last point of the circle (the radius)*/
if(diff_y >= r) { if(diff_y >= r) {
x = r; x = r;
} else { }
else {
/*Use Pythagoras theorem to get x from radius and y*/ /*Use Pythagoras theorem to get x from radius and y*/
uint32_t x_sqr = r * r - diff_y * diff_y; uint32_t x_sqr = r * r - diff_y * diff_y;
lv_sqrt_res_t res; lv_sqrt_res_t res;

View File

@@ -16,7 +16,7 @@ void lv_example_style_12(void)
lv_obj_add_style(obj, &style, 0); lv_obj_add_style(obj, &style, 0);
/*Overwrite the background color locally*/ /*Overwrite the background color locally*/
lv_obj_set_style_bg_color(obj,lv_palette_main(LV_PALETTE_ORANGE), LV_PART_MAIN); lv_obj_set_style_bg_color(obj, lv_palette_main(LV_PALETTE_ORANGE), LV_PART_MAIN);
lv_obj_center(obj); lv_obj_center(obj);
} }

View File

@@ -17,8 +17,8 @@ void lv_example_style_5(void)
/*Add a shadow*/ /*Add a shadow*/
lv_style_set_shadow_width(&style, 55); lv_style_set_shadow_width(&style, 55);
lv_style_set_shadow_color(&style, lv_palette_main(LV_PALETTE_BLUE)); lv_style_set_shadow_color(&style, lv_palette_main(LV_PALETTE_BLUE));
// lv_style_set_shadow_ofs_x(&style, 10); // lv_style_set_shadow_ofs_x(&style, 10);
// lv_style_set_shadow_ofs_y(&style, 20); // lv_style_set_shadow_ofs_y(&style, 20);
/*Create an object with the new style*/ /*Create an object with the new style*/
lv_obj_t * obj = lv_obj_create(lv_scr_act()); lv_obj_t * obj = lv_obj_create(lv_scr_act());

View File

@@ -4,7 +4,7 @@ LV_IMG_DECLARE(animimg001)
LV_IMG_DECLARE(animimg002) LV_IMG_DECLARE(animimg002)
LV_IMG_DECLARE(animimg003) LV_IMG_DECLARE(animimg003)
static const lv_img_dsc_t* anim_imgs[3] = { static const lv_img_dsc_t * anim_imgs[3] = {
&animimg001, &animimg001,
&animimg002, &animimg002,
&animimg003, &animimg003,
@@ -14,7 +14,7 @@ void lv_example_animimg_1(void)
{ {
lv_obj_t * animimg0 = lv_animimg_create(lv_scr_act()); lv_obj_t * animimg0 = lv_animimg_create(lv_scr_act());
lv_obj_center(animimg0); lv_obj_center(animimg0);
lv_animimg_set_src(animimg0, (lv_img_dsc_t**) anim_imgs, 3); lv_animimg_set_src(animimg0, (lv_img_dsc_t **) anim_imgs, 3);
lv_animimg_set_duration(animimg0, 1000); lv_animimg_set_duration(animimg0, 1000);
lv_animimg_set_repeat_count(animimg0, LV_ANIM_REPEAT_INFINITE); lv_animimg_set_repeat_count(animimg0, LV_ANIM_REPEAT_INFINITE);
lv_animimg_start(animimg0); lv_animimg_start(animimg0);

View File

@@ -1,7 +1,7 @@
#include "../../lv_examples.h" #include "../../lv_examples.h"
#if LV_USE_BAR && LV_BUILD_EXAMPLES #if LV_USE_BAR && LV_BUILD_EXAMPLES
static void set_value(void *bar, int32_t v) static void set_value(void * bar, int32_t v)
{ {
lv_bar_set_value(bar, v, LV_ANIM_OFF); lv_bar_set_value(bar, v, LV_ANIM_OFF);
} }
@@ -11,7 +11,7 @@ static void event_cb(lv_event_t * e)
lv_obj_draw_part_dsc_t * dsc = lv_event_get_param(e); lv_obj_draw_part_dsc_t * dsc = lv_event_get_param(e);
if(dsc->part != LV_PART_INDICATOR) return; if(dsc->part != LV_PART_INDICATOR) return;
lv_obj_t * obj= lv_event_get_target(e); lv_obj_t * obj = lv_event_get_target(e);
lv_draw_label_dsc_t label_dsc; lv_draw_label_dsc_t label_dsc;
lv_draw_label_dsc_init(&label_dsc); lv_draw_label_dsc_init(&label_dsc);
@@ -21,7 +21,8 @@ static void event_cb(lv_event_t * e)
lv_snprintf(buf, sizeof(buf), "%d", (int)lv_bar_get_value(obj)); lv_snprintf(buf, sizeof(buf), "%d", (int)lv_bar_get_value(obj));
lv_point_t txt_size; lv_point_t txt_size;
lv_txt_get_size(&txt_size, buf, label_dsc.font, label_dsc.letter_space, label_dsc.line_space, LV_COORD_MAX, label_dsc.flag); lv_txt_get_size(&txt_size, buf, label_dsc.font, label_dsc.letter_space, label_dsc.line_space, LV_COORD_MAX,
label_dsc.flag);
lv_area_t txt_area; lv_area_t txt_area;
/*If the indicator is long enough put the text inside on the right*/ /*If the indicator is long enough put the text inside on the right*/

View File

@@ -16,7 +16,8 @@ static void event_handler(lv_event_t * e)
static const char * btnm_map[] = {"1", "2", "3", "4", "5", "\n", static const char * btnm_map[] = {"1", "2", "3", "4", "5", "\n",
"6", "7", "8", "9", "0", "\n", "6", "7", "8", "9", "0", "\n",
"Action1", "Action2", ""}; "Action1", "Action2", ""
};
void lv_example_btnmatrix_1(void) void lv_example_btnmatrix_1(void)
{ {

View File

@@ -34,8 +34,8 @@ void lv_example_canvas_2(void)
/*Create hole on the canvas*/ /*Create hole on the canvas*/
uint32_t x; uint32_t x;
uint32_t y; uint32_t y;
for( y = 10; y < 30; y++) { for(y = 10; y < 30; y++) {
for( x = 5; x < 20; x++) { for(x = 5; x < 20; x++) {
lv_canvas_set_px_color(canvas, x, y, c0); lv_canvas_set_px_color(canvas, x, y, c0);
} }
} }

View File

@@ -16,13 +16,15 @@ static void draw_event_cb(lv_event_t * e)
/*Add a line mask that keeps the area below the line*/ /*Add a line mask that keeps the area below the line*/
lv_draw_mask_line_param_t line_mask_param; lv_draw_mask_line_param_t line_mask_param;
lv_draw_mask_line_points_init(&line_mask_param, dsc->p1->x, dsc->p1->y, dsc->p2->x, dsc->p2->y, LV_DRAW_MASK_LINE_SIDE_BOTTOM); lv_draw_mask_line_points_init(&line_mask_param, dsc->p1->x, dsc->p1->y, dsc->p2->x, dsc->p2->y,
LV_DRAW_MASK_LINE_SIDE_BOTTOM);
int16_t line_mask_id = lv_draw_mask_add(&line_mask_param, NULL); int16_t line_mask_id = lv_draw_mask_add(&line_mask_param, NULL);
/*Add a fade effect: transparent bottom covering top*/ /*Add a fade effect: transparent bottom covering top*/
lv_coord_t h = lv_obj_get_height(obj); lv_coord_t h = lv_obj_get_height(obj);
lv_draw_mask_fade_param_t fade_mask_param; lv_draw_mask_fade_param_t fade_mask_param;
lv_draw_mask_fade_init(&fade_mask_param, &obj->coords, LV_OPA_COVER, obj->coords.y1 + h / 8, LV_OPA_TRANSP,obj->coords.y2); lv_draw_mask_fade_init(&fade_mask_param, &obj->coords, LV_OPA_COVER, obj->coords.y1 + h / 8, LV_OPA_TRANSP,
obj->coords.y2);
int16_t fade_mask_id = lv_draw_mask_add(&fade_mask_param, NULL); int16_t fade_mask_id = lv_draw_mask_add(&fade_mask_param, NULL);
/*Draw a rectangle that will be affected by the mask*/ /*Draw a rectangle that will be affected by the mask*/
@@ -77,7 +79,8 @@ static void draw_event_cb(lv_event_t * e)
if(dsc->id == 1 || dsc->id == 3) { if(dsc->id == 1 || dsc->id == 3) {
dsc->line_dsc->color = lv_palette_main(LV_PALETTE_GREEN); dsc->line_dsc->color = lv_palette_main(LV_PALETTE_GREEN);
} else { }
else {
dsc->line_dsc->color = lv_palette_lighten(LV_PALETTE_GREY, 1); dsc->line_dsc->color = lv_palette_lighten(LV_PALETTE_GREY, 1);
} }
} }

View File

@@ -38,7 +38,8 @@ void lv_example_chart_3(void)
/*Add two data series*/ /*Add two data series*/
lv_chart_series_t * ser1 = lv_chart_add_series(chart, lv_palette_lighten(LV_PALETTE_GREEN, 2), LV_CHART_AXIS_PRIMARY_Y); lv_chart_series_t * ser1 = lv_chart_add_series(chart, lv_palette_lighten(LV_PALETTE_GREEN, 2), LV_CHART_AXIS_PRIMARY_Y);
lv_chart_series_t * ser2 = lv_chart_add_series(chart, lv_palette_darken(LV_PALETTE_GREEN, 2), LV_CHART_AXIS_SECONDARY_Y); lv_chart_series_t * ser2 = lv_chart_add_series(chart, lv_palette_darken(LV_PALETTE_GREEN, 2),
LV_CHART_AXIS_SECONDARY_Y);
/*Set the next points on 'ser1'*/ /*Set the next points on 'ser1'*/
lv_chart_set_next_value(chart, ser1, 31); lv_chart_set_next_value(chart, ser1, 31);

View File

@@ -78,8 +78,8 @@ void lv_example_chart_4(void)
lv_chart_series_t * ser2 = lv_chart_add_series(chart, lv_palette_main(LV_PALETTE_GREEN), LV_CHART_AXIS_PRIMARY_Y); lv_chart_series_t * ser2 = lv_chart_add_series(chart, lv_palette_main(LV_PALETTE_GREEN), LV_CHART_AXIS_PRIMARY_Y);
uint32_t i; uint32_t i;
for(i = 0; i < 10; i++) { for(i = 0; i < 10; i++) {
lv_chart_set_next_value(chart, ser1, lv_rand(60,90)); lv_chart_set_next_value(chart, ser1, lv_rand(60, 90));
lv_chart_set_next_value(chart, ser2, lv_rand(10,40)); lv_chart_set_next_value(chart, ser2, lv_rand(10, 40));
} }
} }

View File

@@ -44,7 +44,7 @@ static const lv_coord_t ecg_sample[] = {
-202, -223, -235, -243, -237, -240, -256, -298, -345, -393, -432, -475, -518, -565, -596, -619, -623, -623, -614, -202, -223, -235, -243, -237, -240, -256, -298, -345, -393, -432, -475, -518, -565, -596, -619, -623, -623, -614,
-599, -583, -559, -524, -477, -425, -383, -357, -331, -301, -252, -198, -143, -96, -57, -29, -8, 10, 31, 45, 60, 65, -599, -583, -559, -524, -477, -425, -383, -357, -331, -301, -252, -198, -143, -96, -57, -29, -8, 10, 31, 45, 60, 65,
70, 74, 76, 79, 82, 79, 75, 62, 70, 74, 76, 79, 82, 79, 75, 62,
}; };
static void slider_x_event_cb(lv_event_t * e) static void slider_x_event_cb(lv_event_t * e)
{ {

View File

@@ -74,7 +74,7 @@ void lv_example_chart_6(void)
ser = lv_chart_add_series(chart, lv_palette_main(LV_PALETTE_RED), LV_CHART_AXIS_PRIMARY_Y); ser = lv_chart_add_series(chart, lv_palette_main(LV_PALETTE_RED), LV_CHART_AXIS_PRIMARY_Y);
uint32_t i; uint32_t i;
for(i = 0; i < 10; i++) { for(i = 0; i < 10; i++) {
lv_chart_set_next_value(chart, ser, lv_rand(10,90)); lv_chart_set_next_value(chart, ser, lv_rand(10, 90));
} }
lv_chart_set_zoom_x(chart, 500); lv_chart_set_zoom_x(chart, 500);

View File

@@ -30,7 +30,7 @@ static void add_data(lv_timer_t * timer)
{ {
LV_UNUSED(timer); LV_UNUSED(timer);
lv_obj_t * chart = timer->user_data; lv_obj_t * chart = timer->user_data;
lv_chart_set_next_value2(chart, lv_chart_get_series_next(chart, NULL), lv_rand(0,200), lv_rand(0,1000)); lv_chart_set_next_value2(chart, lv_chart_get_series_next(chart, NULL), lv_rand(0, 200), lv_rand(0, 1000));
} }
/** /**

View File

@@ -2,10 +2,9 @@
#if LV_USE_CHART && LV_DRAW_COMPLEX && LV_BUILD_EXAMPLES #if LV_USE_CHART && LV_DRAW_COMPLEX && LV_BUILD_EXAMPLES
/* A struct is used to keep track of the series list because later we need to draw to the series in the reverse order to which they were initialised. */ /* A struct is used to keep track of the series list because later we need to draw to the series in the reverse order to which they were initialised. */
typedef struct typedef struct {
{ lv_obj_t * obj;
lv_obj_t *obj; lv_chart_series_t * series_list[3];
lv_chart_series_t *series_list[3];
} stacked_area_chart_t; } stacked_area_chart_t;
static stacked_area_chart_t stacked_area_chart; static stacked_area_chart_t stacked_area_chart;
@@ -13,20 +12,20 @@ static stacked_area_chart_t stacked_area_chart;
/** /**
* Callback which draws the blocks of colour under the lines * Callback which draws the blocks of colour under the lines
**/ **/
static void draw_event_cb(lv_event_t *e) static void draw_event_cb(lv_event_t * e)
{ {
lv_obj_t *obj = lv_event_get_target(e); lv_obj_t * obj = lv_event_get_target(e);
/*Add the faded area before the lines are drawn*/ /*Add the faded area before the lines are drawn*/
lv_obj_draw_part_dsc_t *dsc = lv_event_get_draw_part_dsc(e); lv_obj_draw_part_dsc_t * dsc = lv_event_get_draw_part_dsc(e);
if (dsc->part == LV_PART_ITEMS) if(dsc->part == LV_PART_ITEMS) {
{ if(!dsc->p1 || !dsc->p2)
if (!dsc->p1 || !dsc->p2)
return; return;
/*Add a line mask that keeps the area below the line*/ /*Add a line mask that keeps the area below the line*/
lv_draw_mask_line_param_t line_mask_param; lv_draw_mask_line_param_t line_mask_param;
lv_draw_mask_line_points_init(&line_mask_param, dsc->p1->x, dsc->p1->y, dsc->p2->x, dsc->p2->y, LV_DRAW_MASK_LINE_SIDE_BOTTOM); lv_draw_mask_line_points_init(&line_mask_param, dsc->p1->x, dsc->p1->y, dsc->p2->x, dsc->p2->y,
LV_DRAW_MASK_LINE_SIDE_BOTTOM);
int16_t line_mask_id = lv_draw_mask_add(&line_mask_param, NULL); int16_t line_mask_id = lv_draw_mask_add(&line_mask_param, NULL);
/*Draw a rectangle that will be affected by the mask*/ /*Draw a rectangle that will be affected by the mask*/
@@ -39,7 +38,8 @@ static void draw_event_cb(lv_event_t *e)
a.x1 = dsc->p1->x; a.x1 = dsc->p1->x;
a.x2 = dsc->p2->x; a.x2 = dsc->p2->x;
a.y1 = LV_MIN(dsc->p1->y, dsc->p2->y); a.y1 = LV_MIN(dsc->p1->y, dsc->p2->y);
a.y2 = obj->coords.y2 - 13; /* -13 cuts off where the rectangle draws over the chart margin. Without this an area of 0 doesn't look like 0 */ a.y2 = obj->coords.y2 -
13; /* -13 cuts off where the rectangle draws over the chart margin. Without this an area of 0 doesn't look like 0 */
lv_draw_rect(dsc->draw_ctx, &draw_rect_dsc, &a); lv_draw_rect(dsc->draw_ctx, &draw_rect_dsc, &a);
/*Remove the mask*/ /*Remove the mask*/
@@ -55,8 +55,7 @@ static int32_t round_fixed_point(int32_t n, int8_t shift)
{ {
/* Create a bitmask to isolates the decimal part of the fixed point number */ /* Create a bitmask to isolates the decimal part of the fixed point number */
int32_t mask = 1; int32_t mask = 1;
for (int32_t bit_pos = 0; bit_pos < shift; bit_pos++) for(int32_t bit_pos = 0; bit_pos < shift; bit_pos++) {
{
mask = (mask << 1) + 1; mask = (mask << 1) + 1;
} }
@@ -83,19 +82,21 @@ void lv_example_chart_8(void)
lv_obj_add_event_cb(stacked_area_chart.obj, draw_event_cb, LV_EVENT_DRAW_PART_BEGIN, NULL); lv_obj_add_event_cb(stacked_area_chart.obj, draw_event_cb, LV_EVENT_DRAW_PART_BEGIN, NULL);
/* Set range to 0 to 100 for percentages. Draw ticks */ /* Set range to 0 to 100 for percentages. Draw ticks */
lv_chart_set_range(stacked_area_chart.obj,LV_CHART_AXIS_PRIMARY_Y,0,100); lv_chart_set_range(stacked_area_chart.obj, LV_CHART_AXIS_PRIMARY_Y, 0, 100);
lv_chart_set_axis_tick(stacked_area_chart.obj, LV_CHART_AXIS_PRIMARY_Y, 3, 0, 5, 1, true, 30); lv_chart_set_axis_tick(stacked_area_chart.obj, LV_CHART_AXIS_PRIMARY_Y, 3, 0, 5, 1, true, 30);
/*Set point size to 0 so the lines are smooth */ /*Set point size to 0 so the lines are smooth */
lv_obj_set_style_size(stacked_area_chart.obj, 0, LV_PART_INDICATOR); lv_obj_set_style_size(stacked_area_chart.obj, 0, LV_PART_INDICATOR);
/*Add some data series*/ /*Add some data series*/
stacked_area_chart.series_list[0] = lv_chart_add_series(stacked_area_chart.obj, lv_palette_main(LV_PALETTE_RED), LV_CHART_AXIS_PRIMARY_Y); stacked_area_chart.series_list[0] = lv_chart_add_series(stacked_area_chart.obj, lv_palette_main(LV_PALETTE_RED),
stacked_area_chart.series_list[1] = lv_chart_add_series(stacked_area_chart.obj, lv_palette_main(LV_PALETTE_BLUE), LV_CHART_AXIS_PRIMARY_Y); LV_CHART_AXIS_PRIMARY_Y);
stacked_area_chart.series_list[2] = lv_chart_add_series(stacked_area_chart.obj, lv_palette_main(LV_PALETTE_GREEN), LV_CHART_AXIS_PRIMARY_Y); stacked_area_chart.series_list[1] = lv_chart_add_series(stacked_area_chart.obj, lv_palette_main(LV_PALETTE_BLUE),
LV_CHART_AXIS_PRIMARY_Y);
stacked_area_chart.series_list[2] = lv_chart_add_series(stacked_area_chart.obj, lv_palette_main(LV_PALETTE_GREEN),
LV_CHART_AXIS_PRIMARY_Y);
for (int point = 0; point < 10; point++) for(int point = 0; point < 10; point++) {
{
/* Make some random data */ /* Make some random data */
uint32_t vals[3] = {lv_rand(10, 20), lv_rand(20, 30), lv_rand(20, 30)}; uint32_t vals[3] = {lv_rand(10, 20), lv_rand(20, 30), lv_rand(20, 30)};
@@ -106,8 +107,7 @@ void lv_example_chart_8(void)
uint32_t decimal_sum = 0; uint32_t decimal_sum = 0;
/* Fixed point cascade rounding ensures percentages add to 100 */ /* Fixed point cascade rounding ensures percentages add to 100 */
for (int32_t series_index = 0; series_index < 3; series_index++) for(int32_t series_index = 0; series_index < 3; series_index++) {
{
decimal_sum += (((vals[series_index] * 100) << fixed_point_shift) / total); decimal_sum += (((vals[series_index] * 100) << fixed_point_shift) / total);
int_sum += (vals[series_index] * 100) / total; int_sum += (vals[series_index] * 100) / total;
@@ -120,7 +120,8 @@ void lv_example_chart_8(void)
/* Draw to the series in the reverse order to which they were initialised. /* Draw to the series in the reverse order to which they were initialised.
Without this the higher values will draw on top of the lower ones. Without this the higher values will draw on top of the lower ones.
This is because the Z-height of a series matches the order it was initialised */ This is because the Z-height of a series matches the order it was initialised */
lv_chart_set_next_value(stacked_area_chart.obj, stacked_area_chart.series_list[3 - series_index - 1], draw_heights[series_index]); lv_chart_set_next_value(stacked_area_chart.obj, stacked_area_chart.series_list[3 - series_index - 1],
draw_heights[series_index]);
} }
} }

View File

@@ -59,7 +59,7 @@ void lv_example_checkbox_2(void)
lv_obj_set_size(cont1, lv_pct(40), lv_pct(80)); lv_obj_set_size(cont1, lv_pct(40), lv_pct(80));
lv_obj_add_event_cb(cont1, radio_event_handler, LV_EVENT_CLICKED, &active_index_1); lv_obj_add_event_cb(cont1, radio_event_handler, LV_EVENT_CLICKED, &active_index_1);
for (i = 0;i < 5;i++) { for(i = 0; i < 5; i++) {
lv_snprintf(buf, sizeof(buf), "A %d", (int)i + 1); lv_snprintf(buf, sizeof(buf), "A %d", (int)i + 1);
radiobutton_create(cont1, buf); radiobutton_create(cont1, buf);
@@ -73,7 +73,7 @@ void lv_example_checkbox_2(void)
lv_obj_set_x(cont2, lv_pct(50)); lv_obj_set_x(cont2, lv_pct(50));
lv_obj_add_event_cb(cont2, radio_event_handler, LV_EVENT_CLICKED, &active_index_2); lv_obj_add_event_cb(cont2, radio_event_handler, LV_EVENT_CLICKED, &active_index_2);
for (i = 0;i < 3;i++) { for(i = 0; i < 3; i++) {
lv_snprintf(buf, sizeof(buf), "B %d", (int)i + 1); lv_snprintf(buf, sizeof(buf), "B %d", (int)i + 1);
radiobutton_create(cont2, buf); radiobutton_create(cont2, buf);
} }

View File

@@ -43,7 +43,8 @@ static void slider_event_cb(lv_event_t * e)
LV_UNUSED(e); LV_UNUSED(e);
/*Recolor the image based on the sliders' values*/ /*Recolor the image based on the sliders' values*/
lv_color_t color = lv_color_make(lv_slider_get_value(red_slider), lv_slider_get_value(green_slider), lv_slider_get_value(blue_slider)); lv_color_t color = lv_color_make(lv_slider_get_value(red_slider), lv_slider_get_value(green_slider),
lv_slider_get_value(blue_slider));
lv_opa_t intense = lv_slider_get_value(intense_slider); lv_opa_t intense = lv_slider_get_value(intense_slider);
lv_obj_set_style_img_recolor_opa(img1, intense, 0); lv_obj_set_style_img_recolor_opa(img1, intense, 0);
lv_obj_set_style_img_recolor(img1, color, 0); lv_obj_set_style_img_recolor(img1, color, 0);

View File

@@ -20,7 +20,7 @@ static void ta_event_cb(lv_event_t * e)
void lv_example_keyboard_1(void) void lv_example_keyboard_1(void)
{ {
/*Create a keyboard to use it with an of the text areas*/ /*Create a keyboard to use it with an of the text areas*/
lv_obj_t *kb = lv_keyboard_create(lv_scr_act()); lv_obj_t * kb = lv_keyboard_create(lv_scr_act());
/*Create a text area. The keyboard will write here*/ /*Create a text area. The keyboard will write here*/
lv_obj_t * ta; lv_obj_t * ta;

View File

@@ -13,14 +13,16 @@ void lv_example_label_3(void)
lv_obj_align(ltr_label, LV_ALIGN_TOP_LEFT, 5, 5); lv_obj_align(ltr_label, LV_ALIGN_TOP_LEFT, 5, 5);
lv_obj_t * rtl_label = lv_label_create(lv_scr_act()); lv_obj_t * rtl_label = lv_label_create(lv_scr_act());
lv_label_set_text(rtl_label, "מעבד, או בשמו המלא יחידת עיבוד מרכזית (באנגלית: CPU - Central Processing Unit)."); lv_label_set_text(rtl_label,
"מעבד, או בשמו המלא יחידת עיבוד מרכזית (באנגלית: CPU - Central Processing Unit).");
lv_obj_set_style_base_dir(rtl_label, LV_BASE_DIR_RTL, 0); lv_obj_set_style_base_dir(rtl_label, LV_BASE_DIR_RTL, 0);
lv_obj_set_style_text_font(rtl_label, &lv_font_dejavu_16_persian_hebrew, 0); lv_obj_set_style_text_font(rtl_label, &lv_font_dejavu_16_persian_hebrew, 0);
lv_obj_set_width(rtl_label, 310); lv_obj_set_width(rtl_label, 310);
lv_obj_align(rtl_label, LV_ALIGN_LEFT_MID, 5, 0); lv_obj_align(rtl_label, LV_ALIGN_LEFT_MID, 5, 0);
lv_obj_t * cz_label = lv_label_create(lv_scr_act()); lv_obj_t * cz_label = lv_label_create(lv_scr_act());
lv_label_set_text(cz_label, "嵌入式系统Embedded System\n是一种嵌入机械或电气系统内部、具有专一功能和实时计算性能的计算机系统。"); lv_label_set_text(cz_label,
"嵌入式系统Embedded System\n是一种嵌入机械或电气系统内部、具有专一功能和实时计算性能的计算机系统。");
lv_obj_set_style_text_font(cz_label, &lv_font_simsun_16_cjk, 0); lv_obj_set_style_text_font(cz_label, &lv_font_simsun_16_cjk, 0);
lv_obj_set_width(cz_label, 310); lv_obj_set_width(cz_label, 310);
lv_obj_align(cz_label, LV_ALIGN_BOTTOM_LEFT, 5, -5); lv_obj_align(cz_label, LV_ALIGN_BOTTOM_LEFT, 5, -5);

View File

@@ -4,76 +4,67 @@
#include "../../lv_examples.h" #include "../../lv_examples.h"
#if LV_USE_LIST && LV_BUILD_EXAMPLES #if LV_USE_LIST && LV_BUILD_EXAMPLES
static lv_obj_t* list1; static lv_obj_t * list1;
static lv_obj_t* list2; static lv_obj_t * list2;
static lv_obj_t* currentButton = NULL; static lv_obj_t * currentButton = NULL;
static void event_handler(lv_event_t* e) static void event_handler(lv_event_t * e)
{ {
lv_event_code_t code = lv_event_get_code(e); lv_event_code_t code = lv_event_get_code(e);
lv_obj_t* obj = lv_event_get_target(e); lv_obj_t * obj = lv_event_get_target(e);
if (code == LV_EVENT_CLICKED) if(code == LV_EVENT_CLICKED) {
{
LV_LOG_USER("Clicked: %s", lv_list_get_btn_text(list1, obj)); LV_LOG_USER("Clicked: %s", lv_list_get_btn_text(list1, obj));
if (currentButton == obj) if(currentButton == obj) {
{
currentButton = NULL; currentButton = NULL;
} }
else else {
{
currentButton = obj; currentButton = obj;
} }
lv_obj_t* parent = lv_obj_get_parent(obj); lv_obj_t * parent = lv_obj_get_parent(obj);
uint32_t i; uint32_t i;
for (i = 0; i < lv_obj_get_child_cnt(parent); i++) for(i = 0; i < lv_obj_get_child_cnt(parent); i++) {
{ lv_obj_t * child = lv_obj_get_child(parent, i);
lv_obj_t* child = lv_obj_get_child(parent, i); if(child == currentButton) {
if (child == currentButton)
{
lv_obj_add_state(child, LV_STATE_CHECKED); lv_obj_add_state(child, LV_STATE_CHECKED);
} }
else else {
{
lv_obj_clear_state(child, LV_STATE_CHECKED); lv_obj_clear_state(child, LV_STATE_CHECKED);
} }
} }
} }
} }
static void event_handler_top(lv_event_t* e) static void event_handler_top(lv_event_t * e)
{ {
lv_event_code_t code = lv_event_get_code(e); lv_event_code_t code = lv_event_get_code(e);
if (code == LV_EVENT_CLICKED) if(code == LV_EVENT_CLICKED) {
{ if(currentButton == NULL) return;
if (currentButton == NULL) return;
lv_obj_move_background(currentButton); lv_obj_move_background(currentButton);
lv_obj_scroll_to_view(currentButton, LV_ANIM_ON); lv_obj_scroll_to_view(currentButton, LV_ANIM_ON);
} }
} }
static void event_handler_up(lv_event_t* e) static void event_handler_up(lv_event_t * e)
{ {
lv_event_code_t code = lv_event_get_code(e); lv_event_code_t code = lv_event_get_code(e);
if ((code == LV_EVENT_CLICKED) || (code == LV_EVENT_LONG_PRESSED_REPEAT)) if((code == LV_EVENT_CLICKED) || (code == LV_EVENT_LONG_PRESSED_REPEAT)) {
{ if(currentButton == NULL) return;
if (currentButton == NULL) return;
uint32_t index = lv_obj_get_index(currentButton); uint32_t index = lv_obj_get_index(currentButton);
if (index <= 0) return; if(index <= 0) return;
lv_obj_move_to_index(currentButton, index - 1); lv_obj_move_to_index(currentButton, index - 1);
lv_obj_scroll_to_view(currentButton, LV_ANIM_ON); lv_obj_scroll_to_view(currentButton, LV_ANIM_ON);
} }
} }
static void event_handler_center(lv_event_t* e) static void event_handler_center(lv_event_t * e)
{ {
const lv_event_code_t code = lv_event_get_code(e); const lv_event_code_t code = lv_event_get_code(e);
if ((code == LV_EVENT_CLICKED) || (code == LV_EVENT_LONG_PRESSED_REPEAT)) if((code == LV_EVENT_CLICKED) || (code == LV_EVENT_LONG_PRESSED_REPEAT)) {
{ if(currentButton == NULL) return;
if (currentButton == NULL) return;
lv_obj_t* parent = lv_obj_get_parent(currentButton); lv_obj_t * parent = lv_obj_get_parent(currentButton);
const uint32_t pos = lv_obj_get_child_cnt(parent) / 2; const uint32_t pos = lv_obj_get_child_cnt(parent) / 2;
lv_obj_move_to_index(currentButton, pos); lv_obj_move_to_index(currentButton, pos);
@@ -82,12 +73,11 @@ static void event_handler_center(lv_event_t* e)
} }
} }
static void event_handler_dn(lv_event_t* e) static void event_handler_dn(lv_event_t * e)
{ {
const lv_event_code_t code = lv_event_get_code(e); const lv_event_code_t code = lv_event_get_code(e);
if ((code == LV_EVENT_CLICKED) || (code == LV_EVENT_LONG_PRESSED_REPEAT)) if((code == LV_EVENT_CLICKED) || (code == LV_EVENT_LONG_PRESSED_REPEAT)) {
{ if(currentButton == NULL) return;
if (currentButton == NULL) return;
const uint32_t index = lv_obj_get_index(currentButton); const uint32_t index = lv_obj_get_index(currentButton);
lv_obj_move_to_index(currentButton, index + 1); lv_obj_move_to_index(currentButton, index + 1);
@@ -95,31 +85,27 @@ static void event_handler_dn(lv_event_t* e)
} }
} }
static void event_handler_bottom(lv_event_t* e) static void event_handler_bottom(lv_event_t * e)
{ {
const lv_event_code_t code = lv_event_get_code(e); const lv_event_code_t code = lv_event_get_code(e);
if (code == LV_EVENT_CLICKED) if(code == LV_EVENT_CLICKED) {
{ if(currentButton == NULL) return;
if (currentButton == NULL) return;
lv_obj_move_foreground(currentButton); lv_obj_move_foreground(currentButton);
lv_obj_scroll_to_view(currentButton, LV_ANIM_ON); lv_obj_scroll_to_view(currentButton, LV_ANIM_ON);
} }
} }
static void event_handler_swap(lv_event_t* e) static void event_handler_swap(lv_event_t * e)
{ {
const lv_event_code_t code = lv_event_get_code(e); const lv_event_code_t code = lv_event_get_code(e);
// lv_obj_t* obj = lv_event_get_target(e); // lv_obj_t* obj = lv_event_get_target(e);
if ((code == LV_EVENT_CLICKED) || (code == LV_EVENT_LONG_PRESSED_REPEAT)) if((code == LV_EVENT_CLICKED) || (code == LV_EVENT_LONG_PRESSED_REPEAT)) {
{
uint32_t cnt = lv_obj_get_child_cnt(list1); uint32_t cnt = lv_obj_get_child_cnt(list1);
for (int i = 0; i < 100; i++) for(int i = 0; i < 100; i++)
if (cnt > 1) if(cnt > 1) {
{ lv_obj_t * obj = lv_obj_get_child(list1, rand() % cnt);
lv_obj_t* obj = lv_obj_get_child(list1, rand() % cnt);
lv_obj_move_to_index(obj, rand() % cnt); lv_obj_move_to_index(obj, rand() % cnt);
if (currentButton != NULL) if(currentButton != NULL) {
{
lv_obj_scroll_to_view(currentButton, LV_ANIM_ON); lv_obj_scroll_to_view(currentButton, LV_ANIM_ON);
} }
} }
@@ -134,14 +120,14 @@ void lv_example_list_2(void)
lv_obj_set_style_pad_row(list1, 5, 0); lv_obj_set_style_pad_row(list1, 5, 0);
/*Add buttons to the list*/ /*Add buttons to the list*/
lv_obj_t* btn; lv_obj_t * btn;
int i; int i;
for (i = 0; i < 15; i++) { for(i = 0; i < 15; i++) {
btn = lv_btn_create(list1); btn = lv_btn_create(list1);
lv_obj_set_width(btn, lv_pct(50)); lv_obj_set_width(btn, lv_pct(50));
lv_obj_add_event_cb(btn, event_handler, LV_EVENT_CLICKED, NULL); lv_obj_add_event_cb(btn, event_handler, LV_EVENT_CLICKED, NULL);
lv_obj_t* lab = lv_label_create(btn); lv_obj_t * lab = lv_label_create(btn);
lv_label_set_text_fmt(lab, "Item %d", i); lv_label_set_text_fmt(lab, "Item %d", i);
} }

View File

@@ -17,11 +17,11 @@ static void float_btn_event_cb(lv_event_t * e)
lv_obj_t * sub_page = lv_menu_page_create(menu, NULL); lv_obj_t * sub_page = lv_menu_page_create(menu, NULL);
cont = lv_menu_cont_create(sub_page); cont = lv_menu_cont_create(sub_page);
label= lv_label_create(cont); label = lv_label_create(cont);
lv_label_set_text_fmt(label, "Hello, I am hiding inside %i", btn_cnt); lv_label_set_text_fmt(label, "Hello, I am hiding inside %i", btn_cnt);
cont = lv_menu_cont_create(main_page); cont = lv_menu_cont_create(main_page);
label= lv_label_create(cont); label = lv_label_create(cont);
lv_label_set_text_fmt(label, "Item %i", btn_cnt); lv_label_set_text_fmt(label, "Item %i", btn_cnt);
lv_menu_set_load_page_event(menu, cont, sub_page); lv_menu_set_load_page_event(menu, cont, sub_page);

View File

@@ -24,7 +24,8 @@ void lv_example_menu_5(void)
lv_color_t bg_color = lv_obj_get_style_bg_color(menu, 0); lv_color_t bg_color = lv_obj_get_style_bg_color(menu, 0);
if(lv_color_brightness(bg_color) > 127) { if(lv_color_brightness(bg_color) > 127) {
lv_obj_set_style_bg_color(menu, lv_color_darken(lv_obj_get_style_bg_color(menu, 0), 10), 0); lv_obj_set_style_bg_color(menu, lv_color_darken(lv_obj_get_style_bg_color(menu, 0), 10), 0);
}else{ }
else {
lv_obj_set_style_bg_color(menu, lv_color_darken(lv_obj_get_style_bg_color(menu, 0), 50), 0); lv_obj_set_style_bg_color(menu, lv_color_darken(lv_obj_get_style_bg_color(menu, 0), 50), 0);
} }
lv_menu_set_mode_root_back_btn(menu, LV_MENU_ROOT_BACK_BTN_ENABLED); lv_menu_set_mode_root_back_btn(menu, LV_MENU_ROOT_BACK_BTN_ENABLED);
@@ -64,8 +65,10 @@ void lv_example_menu_5(void)
lv_obj_t * sub_legal_info_page = lv_menu_page_create(menu, NULL); lv_obj_t * sub_legal_info_page = lv_menu_page_create(menu, NULL);
lv_obj_set_style_pad_hor(sub_legal_info_page, lv_obj_get_style_pad_left(lv_menu_get_main_header(menu), 0), 0); lv_obj_set_style_pad_hor(sub_legal_info_page, lv_obj_get_style_pad_left(lv_menu_get_main_header(menu), 0), 0);
section = lv_menu_section_create(sub_legal_info_page); section = lv_menu_section_create(sub_legal_info_page);
for(uint32_t i=0; i<15; i++){ for(uint32_t i = 0; i < 15; i++) {
create_text(section, NULL, "This is a long long long long long long long long long text, if it is long enough it may scroll.", LV_MENU_ITEM_BUILDER_VARIANT_1); create_text(section, NULL,
"This is a long long long long long long long long long text, if it is long enough it may scroll.",
LV_MENU_ITEM_BUILDER_VARIANT_1);
} }
lv_obj_t * sub_about_page = lv_menu_page_create(menu, NULL); lv_obj_t * sub_about_page = lv_menu_page_create(menu, NULL);
@@ -128,7 +131,8 @@ static void switch_handler(lv_event_t * e)
lv_menu_set_page(menu, NULL); lv_menu_set_page(menu, NULL);
lv_menu_set_sidebar_page(menu, root_page); lv_menu_set_sidebar_page(menu, root_page);
lv_event_send(lv_obj_get_child(lv_obj_get_child(lv_menu_get_cur_sidebar_page(menu), 0), 0), LV_EVENT_CLICKED, NULL); lv_event_send(lv_obj_get_child(lv_obj_get_child(lv_menu_get_cur_sidebar_page(menu), 0), 0), LV_EVENT_CLICKED, NULL);
}else { }
else {
lv_menu_set_sidebar_page(menu, NULL); lv_menu_set_sidebar_page(menu, NULL);
lv_menu_clear_history(menu); /* Clear history because we will be showing the root page later */ lv_menu_clear_history(menu); /* Clear history because we will be showing the root page later */
lv_menu_set_page(menu, root_page); lv_menu_set_page(menu, root_page);
@@ -164,7 +168,8 @@ static lv_obj_t * create_text(lv_obj_t * parent, const char * icon, const char *
return obj; return obj;
} }
static lv_obj_t * create_slider(lv_obj_t * parent, const char * icon, const char * txt, int32_t min, int32_t max, int32_t val) static lv_obj_t * create_slider(lv_obj_t * parent, const char * icon, const char * txt, int32_t min, int32_t max,
int32_t val)
{ {
lv_obj_t * obj = create_text(parent, icon, txt, LV_MENU_ITEM_BUILDER_VARIANT_2); lv_obj_t * obj = create_text(parent, icon, txt, LV_MENU_ITEM_BUILDER_VARIANT_2);

View File

@@ -30,7 +30,8 @@ void lv_example_meter_1(void)
lv_meter_set_indicator_end_value(meter, indic, 20); lv_meter_set_indicator_end_value(meter, indic, 20);
/*Make the tick lines blue at the start of the scale*/ /*Make the tick lines blue at the start of the scale*/
indic = lv_meter_add_scale_lines(meter, scale, lv_palette_main(LV_PALETTE_BLUE), lv_palette_main(LV_PALETTE_BLUE), false, 0); indic = lv_meter_add_scale_lines(meter, scale, lv_palette_main(LV_PALETTE_BLUE), lv_palette_main(LV_PALETTE_BLUE),
false, 0);
lv_meter_set_indicator_start_value(meter, indic, 0); lv_meter_set_indicator_start_value(meter, indic, 0);
lv_meter_set_indicator_end_value(meter, indic, 20); lv_meter_set_indicator_end_value(meter, indic, 20);
@@ -40,7 +41,8 @@ void lv_example_meter_1(void)
lv_meter_set_indicator_end_value(meter, indic, 100); lv_meter_set_indicator_end_value(meter, indic, 100);
/*Make the tick lines red at the end of the scale*/ /*Make the tick lines red at the end of the scale*/
indic = lv_meter_add_scale_lines(meter, scale, lv_palette_main(LV_PALETTE_RED), lv_palette_main(LV_PALETTE_RED), false, 0); indic = lv_meter_add_scale_lines(meter, scale, lv_palette_main(LV_PALETTE_RED), lv_palette_main(LV_PALETTE_RED), false,
0);
lv_meter_set_indicator_start_value(meter, indic, 80); lv_meter_set_indicator_start_value(meter, indic, 80);
lv_meter_set_indicator_end_value(meter, indic, 100); lv_meter_set_indicator_end_value(meter, indic, 100);

View File

@@ -22,7 +22,7 @@ void lv_example_meter_4(void)
/*Add a three arc indicator*/ /*Add a three arc indicator*/
lv_coord_t indic_w = 100; lv_coord_t indic_w = 100;
lv_meter_indicator_t * indic1 = lv_meter_add_arc(meter, scale, indic_w,lv_palette_main(LV_PALETTE_ORANGE), 0); lv_meter_indicator_t * indic1 = lv_meter_add_arc(meter, scale, indic_w, lv_palette_main(LV_PALETTE_ORANGE), 0);
lv_meter_set_indicator_start_value(meter, indic1, 0); lv_meter_set_indicator_start_value(meter, indic1, 0);
lv_meter_set_indicator_end_value(meter, indic1, 40); lv_meter_set_indicator_end_value(meter, indic1, 40);

View File

@@ -9,7 +9,7 @@ static void event_cb(lv_event_t * e)
void lv_example_msgbox_1(void) void lv_example_msgbox_1(void)
{ {
static const char * btns[] ={"Apply", "Close", ""}; static const char * btns[] = {"Apply", "Close", ""};
lv_obj_t * mbox1 = lv_msgbox_create(NULL, "Hello", "This is a message box with two buttons.", btns, true); lv_obj_t * mbox1 = lv_msgbox_create(NULL, "Hello", "This is a message box with two buttons.", btns, true);
lv_obj_add_event_cb(mbox1, event_cb, LV_EVENT_VALUE_CHANGED, NULL); lv_obj_add_event_cb(mbox1, event_cb, LV_EVENT_VALUE_CHANGED, NULL);

View File

@@ -17,7 +17,7 @@ static void event_handler(lv_event_t * e)
*/ */
void lv_example_roller_1(void) void lv_example_roller_1(void)
{ {
lv_obj_t *roller1 = lv_roller_create(lv_scr_act()); lv_obj_t * roller1 = lv_roller_create(lv_scr_act());
lv_roller_set_options(roller1, lv_roller_set_options(roller1,
"January\n" "January\n"
"February\n" "February\n"

View File

@@ -23,7 +23,7 @@ void lv_example_roller_2(void)
lv_style_set_text_font(&style_sel, &lv_font_montserrat_22); lv_style_set_text_font(&style_sel, &lv_font_montserrat_22);
const char * opts = "1\n2\n3\n4\n5\n6\n7\n8\n9\n10"; const char * opts = "1\n2\n3\n4\n5\n6\n7\n8\n9\n10";
lv_obj_t *roller; lv_obj_t * roller;
/*A roller on the left with left aligned text, and custom width*/ /*A roller on the left with left aligned text, and custom width*/
roller = lv_roller_create(lv_scr_act()); roller = lv_roller_create(lv_scr_act());

View File

@@ -9,10 +9,11 @@ static void mask_event_cb(lv_event_t * e)
static int16_t mask_top_id = -1; static int16_t mask_top_id = -1;
static int16_t mask_bottom_id = -1; static int16_t mask_bottom_id = -1;
if (code == LV_EVENT_COVER_CHECK) { if(code == LV_EVENT_COVER_CHECK) {
lv_event_set_cover_res(e, LV_COVER_RES_MASKED); lv_event_set_cover_res(e, LV_COVER_RES_MASKED);
} else if (code == LV_EVENT_DRAW_MAIN_BEGIN) { }
else if(code == LV_EVENT_DRAW_MAIN_BEGIN) {
/* add mask */ /* add mask */
const lv_font_t * font = lv_obj_get_style_text_font(obj, LV_PART_MAIN); const lv_font_t * font = lv_obj_get_style_text_font(obj, LV_PART_MAIN);
lv_coord_t line_space = lv_obj_get_style_text_line_space(obj, LV_PART_MAIN); lv_coord_t line_space = lv_obj_get_style_text_line_space(obj, LV_PART_MAIN);
@@ -34,11 +35,12 @@ static void mask_event_cb(lv_event_t * e)
rect_area.y1 = rect_area.y2 + font_h + line_space - 1; rect_area.y1 = rect_area.y2 + font_h + line_space - 1;
rect_area.y2 = roller_coords.y2; rect_area.y2 = roller_coords.y2;
lv_draw_mask_fade_param_t * fade_mask_bottom =lv_mem_buf_get(sizeof(lv_draw_mask_fade_param_t)); lv_draw_mask_fade_param_t * fade_mask_bottom = lv_mem_buf_get(sizeof(lv_draw_mask_fade_param_t));
lv_draw_mask_fade_init(fade_mask_bottom, &rect_area, LV_OPA_COVER, rect_area.y1, LV_OPA_TRANSP, rect_area.y2); lv_draw_mask_fade_init(fade_mask_bottom, &rect_area, LV_OPA_COVER, rect_area.y1, LV_OPA_TRANSP, rect_area.y2);
mask_bottom_id = lv_draw_mask_add(fade_mask_bottom, NULL); mask_bottom_id = lv_draw_mask_add(fade_mask_bottom, NULL);
} else if (code == LV_EVENT_DRAW_POST_END) { }
else if(code == LV_EVENT_DRAW_POST_END) {
lv_draw_mask_fade_param_t * fade_mask_top = lv_draw_mask_remove_id(mask_top_id); lv_draw_mask_fade_param_t * fade_mask_top = lv_draw_mask_remove_id(mask_top_id);
lv_draw_mask_fade_param_t * fade_mask_bottom = lv_draw_mask_remove_id(mask_bottom_id); lv_draw_mask_fade_param_t * fade_mask_bottom = lv_draw_mask_remove_id(mask_bottom_id);
lv_draw_mask_free_param(fade_mask_top); lv_draw_mask_free_param(fade_mask_top);
@@ -63,7 +65,7 @@ void lv_example_roller_3(void)
lv_style_set_pad_all(&style, 0); lv_style_set_pad_all(&style, 0);
lv_obj_add_style(lv_scr_act(), &style, 0); lv_obj_add_style(lv_scr_act(), &style, 0);
lv_obj_t *roller1 = lv_roller_create(lv_scr_act()); lv_obj_t * roller1 = lv_roller_create(lv_scr_act());
lv_obj_add_style(roller1, &style, 0); lv_obj_add_style(roller1, &style, 0);
lv_obj_set_style_bg_opa(roller1, LV_OPA_TRANSP, LV_PART_SELECTED); lv_obj_set_style_bg_opa(roller1, LV_OPA_TRANSP, LV_PART_SELECTED);

View File

@@ -14,7 +14,7 @@ void lv_example_span_1(void)
lv_obj_t * spans = lv_spangroup_create(lv_scr_act()); lv_obj_t * spans = lv_spangroup_create(lv_scr_act());
lv_obj_set_width(spans, 300); lv_obj_set_width(spans, 300);
lv_obj_set_height(spans,300); lv_obj_set_height(spans, 300);
lv_obj_center(spans); lv_obj_center(spans);
lv_obj_add_style(spans, &style, 0); lv_obj_add_style(spans, &style, 0);

View File

@@ -27,7 +27,8 @@ static void draw_event_cb(lv_event_t * e)
if(chk) { if(chk) {
sw_area.x2 -= 2; sw_area.x2 -= 2;
sw_area.x1 = sw_area.x2 - 16; sw_area.x1 = sw_area.x2 - 16;
} else { }
else {
sw_area.x1 += 2; sw_area.x1 += 2;
sw_area.x2 = sw_area.x1 + 16; sw_area.x2 = sw_area.x1 + 16;
} }

View File

@@ -4,13 +4,13 @@
void lv_example_tabview_1(void) void lv_example_tabview_1(void)
{ {
/*Create a Tab view object*/ /*Create a Tab view object*/
lv_obj_t *tabview; lv_obj_t * tabview;
tabview = lv_tabview_create(lv_scr_act(), LV_DIR_TOP, 50); tabview = lv_tabview_create(lv_scr_act(), LV_DIR_TOP, 50);
/*Add 3 tabs (the tabs are page (lv_page) and can be scrolled*/ /*Add 3 tabs (the tabs are page (lv_page) and can be scrolled*/
lv_obj_t *tab1 = lv_tabview_add_tab(tabview, "Tab 1"); lv_obj_t * tab1 = lv_tabview_add_tab(tabview, "Tab 1");
lv_obj_t *tab2 = lv_tabview_add_tab(tabview, "Tab 2"); lv_obj_t * tab2 = lv_tabview_add_tab(tabview, "Tab 2");
lv_obj_t *tab3 = lv_tabview_add_tab(tabview, "Tab 3"); lv_obj_t * tab3 = lv_tabview_add_tab(tabview, "Tab 3");
/*Add content to the tabs*/ /*Add content to the tabs*/
lv_obj_t * label = lv_label_create(tab1); lv_obj_t * label = lv_label_create(tab1);

View File

@@ -13,7 +13,7 @@ static void scroll_begin_event(lv_event_t * e)
void lv_example_tabview_2(void) void lv_example_tabview_2(void)
{ {
/*Create a Tab view object*/ /*Create a Tab view object*/
lv_obj_t *tabview; lv_obj_t * tabview;
tabview = lv_tabview_create(lv_scr_act(), LV_DIR_LEFT, 80); tabview = lv_tabview_create(lv_scr_act(), LV_DIR_LEFT, 80);
lv_obj_add_event_cb(lv_tabview_get_content(tabview), scroll_begin_event, LV_EVENT_SCROLL_BEGIN, NULL); lv_obj_add_event_cb(lv_tabview_get_content(tabview), scroll_begin_event, LV_EVENT_SCROLL_BEGIN, NULL);
@@ -26,11 +26,11 @@ void lv_example_tabview_2(void)
/*Add 3 tabs (the tabs are page (lv_page) and can be scrolled*/ /*Add 3 tabs (the tabs are page (lv_page) and can be scrolled*/
lv_obj_t *tab1 = lv_tabview_add_tab(tabview, "Tab 1"); lv_obj_t * tab1 = lv_tabview_add_tab(tabview, "Tab 1");
lv_obj_t *tab2 = lv_tabview_add_tab(tabview, "Tab 2"); lv_obj_t * tab2 = lv_tabview_add_tab(tabview, "Tab 2");
lv_obj_t *tab3 = lv_tabview_add_tab(tabview, "Tab 3"); lv_obj_t * tab3 = lv_tabview_add_tab(tabview, "Tab 3");
lv_obj_t *tab4 = lv_tabview_add_tab(tabview, "Tab 4"); lv_obj_t * tab4 = lv_tabview_add_tab(tabview, "Tab 4");
lv_obj_t *tab5 = lv_tabview_add_tab(tabview, "Tab 5"); lv_obj_t * tab5 = lv_tabview_add_tab(tabview, "Tab 5");
lv_obj_set_style_bg_color(tab2, lv_palette_lighten(LV_PALETTE_AMBER, 3), 0); lv_obj_set_style_bg_color(tab2, lv_palette_lighten(LV_PALETTE_AMBER, 3), 0);
lv_obj_set_style_bg_opa(tab2, LV_OPA_COVER, 0); lv_obj_set_style_bg_opa(tab2, LV_OPA_COVER, 0);

View File

@@ -30,7 +30,8 @@ void lv_example_textarea_1(void)
static const char * btnm_map[] = {"1", "2", "3", "\n", static const char * btnm_map[] = {"1", "2", "3", "\n",
"4", "5", "6", "\n", "4", "5", "6", "\n",
"7", "8", "9", "\n", "7", "8", "9", "\n",
LV_SYMBOL_BACKSPACE, "0", LV_SYMBOL_NEW_LINE, ""}; LV_SYMBOL_BACKSPACE, "0", LV_SYMBOL_NEW_LINE, ""
};
lv_obj_t * btnm = lv_btnmatrix_create(lv_scr_act()); lv_obj_t * btnm = lv_btnmatrix_create(lv_scr_act());
lv_obj_set_size(btnm, 200, 150); lv_obj_set_size(btnm, 200, 150);

View File

@@ -32,8 +32,7 @@ static void ta_event_cb(lv_event_t * e)
const char * txt = lv_textarea_get_text(ta); const char * txt = lv_textarea_get_text(ta);
if(txt[0] >= '0' && txt[0] <= '9' && if(txt[0] >= '0' && txt[0] <= '9' &&
txt[1] >= '0' && txt[1] <= '9' && txt[1] >= '0' && txt[1] <= '9' &&
txt[2] != ':') txt[2] != ':') {
{
lv_textarea_set_cursor_pos(ta, 2); lv_textarea_set_cursor_pos(ta, 2);
lv_textarea_add_char(ta, ':'); lv_textarea_add_char(ta, ':');
} }

View File

@@ -8,7 +8,7 @@
*/ */
void lv_example_tileview_1(void) void lv_example_tileview_1(void)
{ {
lv_obj_t *tv = lv_tileview_create(lv_scr_act()); lv_obj_t * tv = lv_tileview_create(lv_scr_act());
/*Tile1: just a label*/ /*Tile1: just a label*/
lv_obj_t * tile1 = lv_tileview_add_tile(tv, 0, 0, LV_DIR_BOTTOM); lv_obj_t * tile1 = lv_tileview_add_tile(tv, 0, 0, LV_DIR_BOTTOM);

View File

@@ -1,26 +0,0 @@
--style=kr
--indent=spaces=4
--indent-classes
--indent-switches
--indent-cases
--indent-preproc-block
--indent-preproc-define
--indent-col1-comments
--pad-oper
--unpad-paren
--align-pointer=middle
--align-reference=middle
--convert-tabs
--max-code-length=120
--break-after-logical
--break-closing-braces
--attach-closing-while
--min-conditional-indent=0
--max-continuation-indent=120
--mode=c
--lineend=linux
--recursive
--suffix=none
--preserve-date
--formatted
--exclude=../tests/src/test_cases/_test_template.c

View File

@@ -23,6 +23,8 @@
--suffix=none --suffix=none
--preserve-date --preserve-date
--formatted --formatted
--ignore-exclude-errors
--exclude=assets
--exclude=../src/extra/libs/gif/gifdec.c --exclude=../src/extra/libs/gif/gifdec.c
--exclude=../src/extra/libs/gif/gifdec.h --exclude=../src/extra/libs/gif/gifdec.h
--exclude=../src/extra/libs/png/lodepng.c --exclude=../src/extra/libs/png/lodepng.c
@@ -33,3 +35,4 @@
--exclude=../src/extra/libs/sjpg/tjpgd.h --exclude=../src/extra/libs/sjpg/tjpgd.h
--exclude=../src/extra/libs/sjpg/tjpgdcnf.h --exclude=../src/extra/libs/sjpg/tjpgdcnf.h
--exclude=../src/lv_conf_internal.h --exclude=../src/lv_conf_internal.h
--exclude=../tests/src/test_cases/_test_template.c

View File

@@ -3,4 +3,6 @@
import os import os
os.system('astyle --options=code-format.cfg "../src/*.c,*.h"') os.system('astyle --options=code-format.cfg "../src/*.c,*.h"')
os.system('astyle --options=code-format-tests.cfg "../tests/src/test_cases/*.c"') os.system('astyle --options=code-format.cfg "../demos/*.c,*.h"')
os.system('astyle --options=code-format.cfg "../examples/*.c,*.h"')
os.system('astyle --options=code-format.cfg "../tests/src/test_cases/*.c"')