From 8c35ff3c3b2ea3862e63470a068a0505b4a01c18 Mon Sep 17 00:00:00 2001 From: Gabor Date: Mon, 15 May 2017 09:48:48 +0200 Subject: [PATCH] Updates before release --- lv_app/lv_app.c | 11 -- lv_app/lv_app.h | 17 ++- lv_app/lv_app_util/lv_app_fsel.c | 1 + lv_appx/lv_app_visual.c | 182 ------------------------------- lv_appx/lv_app_visual.h | 39 ------- lv_conf_templ.h | 6 + 6 files changed, 20 insertions(+), 236 deletions(-) delete mode 100644 lv_appx/lv_app_visual.c delete mode 100644 lv_appx/lv_app_visual.h diff --git a/lv_app/lv_app.c b/lv_app/lv_app.c index d66a6dc43..d18bc2e17 100644 --- a/lv_app/lv_app.c +++ b/lv_app/lv_app.c @@ -13,12 +13,6 @@ #include "misc/gfx/anim.h" #include "lvgl/lv_obj/lv_refr.h" -#include "../lv_appx/lv_app_example.h" -#include "../lv_appx/lv_app_phantom.h" -#include "../lv_appx/lv_app_sysmon.h" -#include "../lv_appx/lv_app_terminal.h" -#include "../lv_appx/lv_app_files.h" -#include "../lv_appx/lv_app_visual.h" /********************* * DEFINES @@ -139,11 +133,6 @@ void lv_app_init(void) dsc = ll_ins_head(&app_dsc_ll); *dsc = lv_app_files_init(); #endif - -#if USE_LV_APP_VISUAL != 0 - dsc = ll_ins_head(&app_dsc_ll); - *dsc = lv_app_visual_init(); -#endif } /** diff --git a/lv_app/lv_app.h b/lv_app/lv_app.h index 6edfa24e7..81d0dd0e0 100644 --- a/lv_app/lv_app.h +++ b/lv_app/lv_app.h @@ -13,10 +13,6 @@ #include "lvgl/lvgl.h" #if LV_APP_ENABLE != 0 -#include "lvgl/lv_app/lv_app_util/lv_app_kb.h" -#include "lvgl/lv_app/lv_app_util/lv_app_fsel.h" -#include "lvgl/lv_app/lv_app_util/lv_app_notice.h" - /********************* * DEFINES @@ -232,6 +228,19 @@ lv_app_style_t * lv_app_style_get(void); * MACROS **********************/ +/********************** + * POST-INCLUDES + *********************/ +#include "lvgl/lv_app/lv_app_util/lv_app_kb.h" +#include "lvgl/lv_app/lv_app_util/lv_app_fsel.h" +#include "lvgl/lv_app/lv_app_util/lv_app_notice.h" + +#include "lvgl/lv_appx/lv_app_example.h" +#include "lvgl/lv_appx/lv_app_phantom.h" +#include "lvgl/lv_appx/lv_app_sysmon.h" +#include "lvgl/lv_appx/lv_app_terminal.h" +#include "lvgl/lv_appx/lv_app_files.h" + #endif /*LV_APP_ENABLE != 0*/ #endif /*LV_APP_H*/ diff --git a/lv_app/lv_app_util/lv_app_fsel.c b/lv_app/lv_app_util/lv_app_fsel.c index 1a41bbea9..e3e377072 100644 --- a/lv_app/lv_app_util/lv_app_fsel.c +++ b/lv_app/lv_app_util/lv_app_fsel.c @@ -95,6 +95,7 @@ void lv_app_fsel_open(const char * path, const char * filter, void * param, void fsel_win = lv_win_create(lv_scr_act(), NULL); lv_obj_set_size(fsel_win, LV_HOR_RES, LV_VER_RES); lv_win_set_styles_cbtn(fsel_win, &app_style->win_cbtn_rel, &app_style->win_cbtn_pr); + lv_obj_set_style(lv_win_get_header(fsel_win), &app_style->menu); lv_win_add_cbtn(fsel_win, SYMBOL_CLOSE, fsel_close_action); diff --git a/lv_appx/lv_app_visual.c b/lv_appx/lv_app_visual.c deleted file mode 100644 index 9b27cba49..000000000 --- a/lv_appx/lv_app_visual.c +++ /dev/null @@ -1,182 +0,0 @@ -/** - * @file lv_app_visual.c - * - */ - -/********************* - * INCLUDES - *********************/ -#include "lv_app_example.h" -#if LV_APP_ENABLE != 0 && USE_LV_APP_VISUAL != 0 - -#include - -/********************* - * DEFINES - *********************/ - -/********************** - * TYPEDEFS - **********************/ - -/*Application specific data for an instance of this application*/ -typedef struct -{ - -}my_app_data_t; - -/*Application specific data a window of this application*/ -typedef struct -{ - -}my_win_data_t; - -/*Application specific data for a shortcut of this application*/ -typedef struct -{ - lv_obj_t * label; -}my_sc_data_t; - -/********************** - * STATIC PROTOTYPES - **********************/ -static void my_app_run(lv_app_inst_t * app, void * conf); -static void my_app_close(lv_app_inst_t * app); -static void my_com_rec(lv_app_inst_t * app_send, lv_app_inst_t * app_rec, lv_app_com_type_t type , const void * data, uint32_t size); -static void my_sc_open(lv_app_inst_t * app, lv_obj_t * sc); -static void my_sc_close(lv_app_inst_t * app); -static void my_win_open(lv_app_inst_t * app, lv_obj_t * win); -static void my_win_close(lv_app_inst_t * app); - -/********************** - * STATIC VARIABLES - **********************/ -static lv_app_dsc_t my_app_dsc = -{ - .name = "Visualizer", - .mode = LV_APP_MODE_NONE, - .app_run = my_app_run, - .app_close = my_app_close, - .com_rec = my_com_rec, - .win_open = my_win_open, - .win_close = my_win_close, - .sc_open = my_sc_open, - .sc_close = my_sc_close, - .app_data_size = sizeof(my_app_data_t), - .sc_data_size = sizeof(my_sc_data_t), - .win_data_size = sizeof(my_win_data_t), -}; - -/********************** - * MACROS - **********************/ - -/********************** - * GLOBAL FUNCTIONS - **********************/ - -/** - * Initialize the application - * @return pointer to the application descriptor of this application - */ -const lv_app_dsc_t * lv_app_visual_init(void) -{ - return &my_app_dsc; -} - -/********************** - * STATIC FUNCTIONS - **********************/ - -/** - * Run an application according to 'app_dsc' - * @param app_dsc pointer to an application descriptor - * @param conf pointer to a lv_app_example_conf_t structure with configuration data or NULL if unused - * @return pointer to the opened application or NULL if any error occurred - */ -static void my_app_run(lv_app_inst_t * app, void * conf) -{ - /*Initialize the application*/ -} - -/** - * Close a running application. - * Close the Window and the Shortcut too if opened. - * Free all the allocated memory by this application. - * @param app pointer to an application - */ -static void my_app_close(lv_app_inst_t * app) -{ - /*No dynamically allocated data in 'my_app_data'*/ -} - -/** - * Read the data have been sent to this application - * @param app_send pointer to an application which sent the message - * @param app_rec pointer to an application which is receiving the message - * @param type type of data from 'lv_app_com_type_t' enum - * @param data pointer to the sent data - * @param size length of 'data' in bytes - */ -static void my_com_rec(lv_app_inst_t * app_send, lv_app_inst_t * app_rec, - lv_app_com_type_t type , const void * data, uint32_t size) -{ - if(type == LV_APP_COM_TYPE_CHAR) { /*data: string*/ - my_sc_data_t * sc_data = app_rec->sc_data; - if (sc_data->label != NULL) { - lv_label_set_text_array(sc_data->label, data, size); - lv_obj_align(sc_data->label , NULL,LV_ALIGN_CENTER, 0, 0); - } - } -} - -/** - * Open a shortcut for an application - * @param app pointer to an application - * @param sc pointer to an object where the application - * can create content of the shortcut - */ -static void my_sc_open(lv_app_inst_t * app, lv_obj_t * sc) -{ - my_sc_data_t * sc_data = app->sc_data; - - sc_data->label = lv_label_create(sc, NULL); - lv_label_set_text(sc_data->label, "Empty"); - lv_obj_align(sc_data->label, NULL, LV_ALIGN_CENTER, 0, 0); -} - -/** - * Close the shortcut of an application - * @param app pointer to an application - */ -static void my_sc_close(lv_app_inst_t * app) -{ - /*No dynamically allocated data in 'my_sc_data'*/ -} - - -/** - * Open the application in a window - * @param app pointer to an application - * @param win pointer to a window object where - * the application can create content - */ -static void my_win_open(lv_app_inst_t * app, lv_obj_t * win) -{ - -} - -/** - * Close the window of an application - * @param app pointer to an application - */ -static void my_win_close(lv_app_inst_t * app) -{ - -} - -/*-------------------- - * OTHER FUNCTIONS - ---------------------*/ - -#endif /*LV_APP_ENABLE != 0 && USE_LV_APP_VISUAL != 0*/ diff --git a/lv_appx/lv_app_visual.h b/lv_appx/lv_app_visual.h deleted file mode 100644 index ce5e26d01..000000000 --- a/lv_appx/lv_app_visual.h +++ /dev/null @@ -1,39 +0,0 @@ -/** - * @file lv_app_visual.h - * - */ - -#ifndef LV_APP_VISUAL_H -#define LV_APP_VISUAL_H - -/********************* - * INCLUDES - *********************/ -#include "lvgl/lv_app/lv_app.h" - -#if LV_APP_ENABLE != 0 && USE_LV_APP_VISUAL != 0 - -/********************* - * DEFINES - *********************/ - -/********************** - * TYPEDEFS - **********************/ -typedef struct -{ - -}lv_app_visual_conf_t; - -/********************** - * GLOBAL PROTOTYPES - **********************/ -const lv_app_dsc_t * lv_app_visual_init(void); - -/********************** - * MACROS - **********************/ - -#endif /*LV_APP_ENABLE != 0 && USE_LV_APP_VISUAL != 0*/ - -#endif /* LV_APP_VISUAL_H */ diff --git a/lv_conf_templ.h b/lv_conf_templ.h index db7c61d39..d673e7e26 100644 --- a/lv_conf_templ.h +++ b/lv_conf_templ.h @@ -208,6 +208,12 @@ /*Example application*/ #define USE_LV_APP_EXAMPLE 1 +/*Phantom application*/ +#define USE_LV_APP_PHANTOM 1 +#if USE_LV_APP_PHANTOM != 0 +/*No settings*/ +#endif + /*System monitor*/ #define USE_LV_APP_SYSMON 1 #if USE_LV_APP_SYSMON != 0