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

Formatting all header files (*.h) in accordance with project coding style, using the astyle tool and the rules file _astylerc-h.

Browse Source
This commit is contained in:
Alexander
2018-06-18 13:52:14 +03:00
parent 8e9335d49f
commit 5ff4125c56
49 changed files with 271 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lv_objx/lv_bar.h
View File

@@ -1,6 +1,6 @@
/**
* @file lv_bar.h
*
*
*/
#ifndef LV_BAR_H
@@ -38,12 +38,12 @@ typedef struct
int16_t min_value; /*Minimum value of the bar*/
int16_t max_value; /*Maximum value of the bar*/
lv_style_t *style_indic; /*Style of the indicator*/
}lv_bar_ext_t;
} lv_bar_ext_t;
typedef enum {
LV_BAR_STYLE_BG,
LV_BAR_STYLE_INDIC,
}lv_bar_style_t;
} lv_bar_style_t;
/**********************
* GLOBAL PROTOTYPES

18
lv_objx/lv_btn.h
View File

@@ -1,6 +1,6 @@
/**
* @file lv_btn.h
*
*
*/
#ifndef LV_BTN_H
@@ -41,7 +41,7 @@ typedef enum
LV_BTN_STATE_TGL_PR,
LV_BTN_STATE_INA,
LV_BTN_STATE_NUM,
}lv_btn_state_t;
} lv_btn_state_t;
typedef enum
{
@@ -50,20 +50,20 @@ typedef enum
LV_BTN_ACTION_LONG_PR,
LV_BTN_ACTION_LONG_PR_REPEAT,
LV_BTN_ACTION_NUM,
}lv_btn_action_t;
} lv_btn_action_t;
/*Data of button*/
typedef struct
{
lv_cont_ext_t cont; /*Ext. of ancestor*/
/*New data for this type */
lv_action_t actions[LV_BTN_ACTION_NUM];
lv_style_t * styles[LV_BTN_STATE_NUM]; /*Styles in each state*/
lv_cont_ext_t cont; /*Ext. of ancestor*/
/*New data for this type */
lv_action_t actions[LV_BTN_ACTION_NUM];
lv_style_t * styles[LV_BTN_STATE_NUM]; /*Styles in each state*/
lv_btn_state_t state; /*Current state of the button from 'lv_btn_state_t' enum*/
uint8_t toggle :1; /*1: Toggle enabled*/
uint8_t long_pr_action_executed :1; /*1: Long press action executed (Handled by the library)*/
}lv_btn_ext_t;
} lv_btn_ext_t;
/*Styles*/
typedef enum {
@@ -72,7 +72,7 @@ typedef enum {
LV_BTN_STYLE_TGL_REL,
LV_BTN_STYLE_TGL_PR,
LV_BTN_STYLE_INA,
}lv_btn_style_t;
} lv_btn_style_t;
/**********************
* GLOBAL PROTOTYPES

6
lv_objx/lv_btnm.h
View File

@@ -1,6 +1,6 @@
/**
* @file lv_btnm.h
*
*
*/
@@ -55,7 +55,7 @@ typedef struct
uint16_t btn_id_pr; /*Index of the currently pressed button (in `button_areas`) or LV_BTNM_PR_NONE*/
uint16_t btn_id_tgl; /*Index of the currently toggled button (in `button_areas`) or LV_BTNM_PR_NONE */
uint8_t toggle :1; /*Enable toggling*/
}lv_btnm_ext_t;
} lv_btnm_ext_t;
typedef enum {
LV_BTNM_STYLE_BG,
@@ -64,7 +64,7 @@ typedef enum {
LV_BTNM_STYLE_BTN_TGL_REL,
LV_BTNM_STYLE_BTN_TGL_PR,
LV_BTNM_STYLE_BTN_INA,
}lv_btnm_style_t;
} lv_btnm_style_t;
/**********************
* GLOBAL PROTOTYPES

6
lv_objx/lv_cb.h
View File

@@ -1,6 +1,6 @@
/**
* @file lv_cb.h
*
*
*/
#ifndef LV_CB_H
@@ -44,7 +44,7 @@ typedef struct
/*New data for this type */
lv_obj_t * bullet; /*Pointer to button*/
lv_obj_t * label; /*Pointer to label*/
}lv_cb_ext_t;
} lv_cb_ext_t;
typedef enum {
LV_CB_STYLE_BG,
@@ -53,7 +53,7 @@ typedef enum {
LV_CB_STYLE_BOX_TGL_REL,
LV_CB_STYLE_BOX_TGL_PR,
LV_CB_STYLE_BOX_INA,
}lv_cb_style_t;
} lv_cb_style_t;
/**********************
* GLOBAL PROTOTYPES

14
lv_objx/lv_chart.h
View File

@@ -30,7 +30,7 @@ typedef struct
{
lv_coord_t * points;
lv_color_t color;
}lv_chart_series_t;
} lv_chart_series_t;
/*Data of chart */
typedef struct
@@ -49,16 +49,16 @@ typedef struct
uint8_t num; /*Number of data lines in dl_ll*/
lv_opa_t opa; /*Opacity of data lines*/
lv_opa_t dark; /*Dark level of the point/column bottoms*/
}series;
}lv_chart_ext_t;
} series;
} lv_chart_ext_t;
/*Chart types*/
typedef enum
{
LV_CHART_TYPE_LINE = 0x01,
LV_CHART_TYPE_COLUMN = 0x02,
LV_CHART_TYPE_POINT = 0x04,
}lv_chart_type_t;
LV_CHART_TYPE_LINE = 0x01,
LV_CHART_TYPE_COLUMN = 0x02,
LV_CHART_TYPE_POINT = 0x04,
} lv_chart_type_t;
/**********************

26
lv_objx/lv_cont.h
View File

@@ -1,6 +1,6 @@
/**
* @file lv_cont.h
*
*
*/
#ifndef LV_CONT_H
@@ -29,17 +29,17 @@ extern "C" {
/*Layout options*/
typedef enum
{
LV_LAYOUT_OFF = 0,
LV_LAYOUT_CENTER,
LV_LAYOUT_COL_L, /*Column left align*/
LV_LAYOUT_COL_M, /*Column middle align*/
LV_LAYOUT_COL_R, /*Column right align*/
LV_LAYOUT_ROW_T, /*Row top align*/
LV_LAYOUT_ROW_M, /*Row middle align*/
LV_LAYOUT_ROW_B, /*Row bottom align*/
LV_LAYOUT_PRETTY, /*Put as many object as possible in row and begin a new row*/
LV_LAYOUT_GRID, /*Align same-sized object into a grid*/
}lv_layout_t;
LV_LAYOUT_OFF = 0,
LV_LAYOUT_CENTER,
LV_LAYOUT_COL_L, /*Column left align*/
LV_LAYOUT_COL_M, /*Column middle align*/
LV_LAYOUT_COL_R, /*Column right align*/
LV_LAYOUT_ROW_T, /*Row top align*/
LV_LAYOUT_ROW_M, /*Row middle align*/
LV_LAYOUT_ROW_B, /*Row bottom align*/
LV_LAYOUT_PRETTY, /*Put as many object as possible in row and begin a new row*/
LV_LAYOUT_GRID, /*Align same-sized object into a grid*/
} lv_layout_t;
typedef struct
{
@@ -48,7 +48,7 @@ typedef struct
uint8_t layout :4; /*A layout from 'lv_cont_layout_t' enum*/
uint8_t hor_fit :1; /*1: Enable horizontal fit to involve all children*/
uint8_t ver_fit :1; /*1: Enable horizontal fir to involve all children*/
}lv_cont_ext_t;
} lv_cont_ext_t;
/**********************
* GLOBAL PROTOTYPES

6
lv_objx/lv_ddlist.h
View File

@@ -1,6 +1,6 @@
/**
* @file lv_ddlist.h
*
*
*/
#ifndef LV_DDLIST_H
@@ -50,13 +50,13 @@ typedef struct
uint16_t anim_time; /*Open/Close animation time [ms]*/
uint8_t opened :1; /*1: The list is opened*/
lv_coord_t fix_height; /*Height if the ddlist is opened. (0: auto-size)*/
}lv_ddlist_ext_t;
} lv_ddlist_ext_t;
typedef enum {
LV_DDLIST_STYLE_BG,
LV_DDLIST_STYLE_SEL,
LV_DDLIST_STYLE_SB,
}lv_ddlist_style_t;
} lv_ddlist_style_t;
/**********************
* GLOBAL PROTOTYPES

4
lv_objx/lv_gauge.h
View File

@@ -1,6 +1,6 @@
/**
* @file lv_gauge.h
*
*
*/
#ifndef LV_GAUGE_H
@@ -43,7 +43,7 @@ typedef struct
const lv_color_t * needle_colors; /*Color of the needles (lv_color_t my_colors[needle_num])*/
uint8_t needle_count; /*Number of needles*/
uint8_t label_count; /*Number of labels on the scale*/
}lv_gauge_ext_t;
} lv_gauge_ext_t;
/**********************
* GLOBAL PROTOTYPES

4
lv_objx/lv_img.h
View File

@@ -1,6 +1,6 @@
/**
* @file lv_img.h
*
*
*/
#ifndef LV_IMG_H
@@ -42,7 +42,7 @@ typedef struct
uint8_t auto_size :1; /*1: automatically set the object size to the image size*/
uint8_t chroma_keyed :1; /*1: Chroma keyed image, LV_COLOR_TRANSP (lv_conf.h) pixels will be transparent (Handled by the library)*/
uint8_t alpha_byte :1; /*1: Extra byte for every pixel to define opacity*/
}lv_img_ext_t;
} lv_img_ext_t;
/**********************
* GLOBAL PROTOTYPES

8
lv_objx/lv_kb.h
View File

@@ -1,6 +1,6 @@
/**
* @file lv_kb.h
*
*
*/
#ifndef LV_KB_H
@@ -39,7 +39,7 @@ extern "C" {
typedef enum {
LV_KB_MODE_TEXT,
LV_KB_MODE_NUM,
}lv_kb_mode_t;
} lv_kb_mode_t;
/*Data of keyboard*/
@@ -51,7 +51,7 @@ typedef struct {
uint8_t cursor_mng :1; /*1: automatically show/hide cursor when a text area is assigned or left*/
lv_action_t ok_action; /*Called when the "Ok" button is clicked*/
lv_action_t hide_action; /*Called when the "Hide" button is clicked*/
}lv_kb_ext_t;
} lv_kb_ext_t;
typedef enum {
LV_KB_STYLE_BG,
@@ -60,7 +60,7 @@ typedef enum {
LV_KB_STYLE_BTN_TGL_REL,
LV_KB_STYLE_BTN_TGL_PR,
LV_KB_STYLE_BTN_INA,
}lv_kb_style_t;
} lv_kb_style_t;
/**********************
* GLOBAL PROTOTYPES

8
lv_objx/lv_label.h
View File

@@ -1,6 +1,6 @@
/**
* @file lv_rect.h
*
*
*/
#ifndef LV_LABEL_H
@@ -39,13 +39,13 @@ typedef enum
LV_LABEL_LONG_SCROLL, /*Expand the object size and scroll the text on the parent (move the label object)*/
LV_LABEL_LONG_DOT, /*Keep the size and write dots at the end if the text is too long*/
LV_LABEL_LONG_ROLL, /*Keep the size and roll the text infinitely*/
}lv_label_long_mode_t;
} lv_label_long_mode_t;
/*Label align policy*/
typedef enum {
LV_LABEL_ALIGN_LEFT,
LV_LABEL_ALIGN_CENTER,
}lv_label_align_t;
} lv_label_align_t;
/*Data of label*/
typedef struct
@@ -68,7 +68,7 @@ typedef struct
uint8_t expand :1; /*Ignore real width (used by the library with LV_LABEL_LONG_ROLL)*/
uint8_t no_break :1; /*Ignore new line characters*/
uint8_t body_draw :1; /*Draw background body*/
}lv_label_ext_t;
} lv_label_ext_t;
/**********************
* GLOBAL PROTOTYPES

4
lv_objx/lv_led.h
View File

@@ -1,6 +1,6 @@
/**
* @file lv_led.h
*
*
*/
#ifndef LV_LED_H
@@ -32,7 +32,7 @@ typedef struct
/*No inherited ext.*/
/*New data for this type */
uint8_t bright; /*Current brightness of the LED (0..255)*/
}lv_led_ext_t;
} lv_led_ext_t;
/**********************
* GLOBAL PROTOTYPES

2
lv_objx/lv_line.h
View File

@@ -34,7 +34,7 @@ typedef struct
uint16_t point_num; /*Number of points in 'point_array' */
uint8_t auto_size :1; /*1: set obj. width to x max and obj. height to y max */
uint8_t y_inv :1; /*1: y == 0 will be on the bottom*/
}lv_line_ext_t;
} lv_line_ext_t;
/**********************
* GLOBAL PROTOTYPES

6
lv_objx/lv_list.h
View File

@@ -1,6 +1,6 @@
/**
* @file lv_list.h
*
*
*/
#ifndef LV_LIST_H
@@ -51,7 +51,7 @@ typedef struct
uint16_t anim_time; /*Scroll animation time*/
lv_style_t *styles_btn[LV_BTN_STATE_NUM]; /*Styles of the list element buttons*/
lv_style_t *style_img; /*Style of the list element images on buttons*/
}lv_list_ext_t;
} lv_list_ext_t;
typedef enum {
LV_LIST_STYLE_BG,
@@ -62,7 +62,7 @@ typedef enum {
LV_LIST_STYLE_BTN_TGL_REL,
LV_LIST_STYLE_BTN_TGL_PR,
LV_LIST_STYLE_BTN_INA,
}lv_list_style_t;
} lv_list_style_t;
/**********************
* GLOBAL PROTOTYPES

4
lv_objx/lv_lmeter.h
View File

@@ -1,6 +1,6 @@
/**
* @file lv_lmeter.h
*
*
*/
#ifndef LV_LMETER_H
@@ -35,7 +35,7 @@ typedef struct
int16_t cur_value;
int16_t min_value;
int16_t max_value;
}lv_lmeter_ext_t;
} lv_lmeter_ext_t;
/**********************
* GLOBAL PROTOTYPES

6
lv_objx/lv_mbox.h
View File

@@ -1,6 +1,6 @@
/**
* @file lv_mbox.h
*
*
*/
#ifndef LV_MBOX_H
@@ -51,7 +51,7 @@ typedef struct
lv_obj_t *text; /*Text of the message box*/
lv_obj_t *btnm; /*Button matrix for the buttons*/
uint16_t anim_time; /*Duration of close animation [ms] (0: no animation)*/
}lv_mbox_ext_t;
} lv_mbox_ext_t;
typedef enum {
LV_MBOX_STYLE_BG,
@@ -61,7 +61,7 @@ typedef enum {
LV_MBOX_STYLE_BTN_TGL_REL,
LV_MBOX_STYLE_BTN_TGL_PR,
LV_MBOX_STYLE_BTN_INA,
}lv_mbox_style_t;
} lv_mbox_style_t;
/**********************
* GLOBAL PROTOTYPES

6
lv_objx/lv_objx_templ.h
View File

@@ -1,6 +1,6 @@
/**
* @file lv_templ.h
*
*
*/
@@ -37,14 +37,14 @@ extern "C" {
typedef struct {
lv_ANCESTOR_ext_t ANCESTOR; /*Ext. of ancestor*/
/*New data for this type */
}lv_templ_ext_t;
} lv_templ_ext_t;
/*Styles*/
typedef enum {
LV_TEMPL_STYLE_X,
LV_TEMPL_STYLE_Y,
}lv_templ_style_t;
} lv_templ_style_t;
/**********************

10
lv_objx/lv_page.h
View File

@@ -1,6 +1,6 @@
/**
* @file lv_page.h
*
*
*/
#ifndef LV_PAGE_H
@@ -39,7 +39,7 @@ typedef enum
LV_SB_MODE_ON, /*Always show scrollbars*/
LV_SB_MODE_DRAG, /*Show scrollbars when page is being dragged*/
LV_SB_MODE_AUTO, /*Show scrollbars when the scrollable container is large enough to be scrolled*/
}lv_sb_mode_t;
} lv_sb_mode_t;
/*Data of page*/
typedef struct
@@ -56,14 +56,14 @@ typedef struct
uint8_t hor_draw :1; /*1: horizontal scrollbar is visible now (Handled by the library)*/
uint8_t ver_draw :1; /*1: vertical scrollbar is visible now (Handled by the library)*/
uint8_t mode :3; /*Scrollbar visibility from 'lv_page_sb_mode_t'*/
}sb;
}lv_page_ext_t;
} sb;
} lv_page_ext_t;
typedef enum {
LV_PAGE_STYLE_BG,
LV_PAGE_STYLE_SCRL,
LV_PAGE_STYLE_SB,
}lv_page_style_t;
} lv_page_style_t;
/**********************

6
lv_objx/lv_roller.h
View File

@@ -1,6 +1,6 @@
/**
* @file lv_roller.h
*
*
*/
#ifndef LV_ROLLER_H
@@ -35,12 +35,12 @@ extern "C" {
typedef struct {
lv_ddlist_ext_t ddlist; /*Ext. of ancestor*/
/*New data for this type */
}lv_roller_ext_t;
} lv_roller_ext_t;
typedef enum {
LV_ROLLER_STYLE_BG,
LV_ROLLER_STYLE_SEL,
}lv_roller_style_t;
} lv_roller_style_t;
/**********************
* GLOBAL PROTOTYPES

8
lv_objx/lv_slider.h
View File

@@ -1,6 +1,6 @@
/**
* @file lv_slider.h
*
*
*/
#ifndef LV_SLIDER_H
@@ -40,15 +40,15 @@ typedef struct
lv_style_t *style_knob; /*Style of the knob*/
int16_t drag_value; /*Store a temporal value during press until release (Handled by the library)*/
uint8_t knob_in :1; /*1: Draw the knob inside the bar*/
}lv_slider_ext_t;
} lv_slider_ext_t;
/*Built-in styles of slider*/
typedef enum
{
LV_SLIDER_STYLE_BG,
LV_SLIDER_STYLE_BG,
LV_SLIDER_STYLE_INDIC,
LV_SLIDER_STYLE_KNOB,
}lv_slider_style_t;
} lv_slider_style_t;
/**********************
* GLOBAL PROTOTYPES

6
lv_objx/lv_sw.h
View File

@@ -1,6 +1,6 @@
/**
* @file lv_sw.h
*
*
*/
#ifndef LV_SW_H
@@ -39,14 +39,14 @@ typedef struct
lv_style_t *style_knob_off; /*Style of the knob when the switch is OFF*/
lv_style_t *style_knob_on; /*Style of the knob when the switch is ON (NULL to use the same as OFF)*/
uint8_t changed :1; /*Indicates the switch explicitly changed by drag*/
}lv_sw_ext_t;
} lv_sw_ext_t;
typedef enum {
LV_SW_STYLE_BG,
LV_SW_STYLE_INDIC,
LV_SW_STYLE_KNOB_OFF,
LV_SW_STYLE_KNOB_ON,
}lv_sw_style_t;
} lv_sw_style_t;
/**********************
* GLOBAL PROTOTYPES

18
lv_objx/lv_ta.h
View File

@@ -1,6 +1,6 @@
/**
* @file lv_ta.h
*
*
*/
#ifndef LV_TA_H
@@ -40,12 +40,12 @@ extern "C" {
typedef enum {
LV_CURSOR_NONE,
LV_CURSOR_LINE,
LV_CURSOR_BLOCK,
LV_CURSOR_OUTLINE,
LV_CURSOR_UNDERLINE,
LV_CURSOR_LINE,
LV_CURSOR_BLOCK,
LV_CURSOR_OUTLINE,
LV_CURSOR_UNDERLINE,
LV_CURSOR_HIDDEN = 0x10, /*Or it to any value to hide the cursor temporally*/
}lv_cursor_type_t;
} lv_cursor_type_t;
/*Data of text area*/
typedef struct
@@ -62,14 +62,14 @@ typedef struct
uint16_t pos; /*The current cursor position (0: before 1. letter; 1: before 2. letter etc.)*/
lv_cursor_type_t type; /*Shape of the cursor*/
uint8_t state :1; /*Indicates that the cursor is visible now or not (Handled by the library)*/
}cursor;
}lv_ta_ext_t;
} cursor;
} lv_ta_ext_t;
typedef enum {
LV_TA_STYLE_BG,
LV_TA_STYLE_SB,
LV_TA_STYLE_CURSOR,
}lv_ta_style_t;
} lv_ta_style_t;
/**********************
* GLOBAL PROTOTYPES

8
lv_objx/lv_tabview.h
View File

@@ -1,6 +1,6 @@
/**
* @file lv_tabview.h
*
*
*/
#ifndef LV_TABVIEW_H
@@ -44,7 +44,7 @@ typedef void (*lv_tabview_action_t)(lv_obj_t *, uint16_t);
/*Data of tab*/
typedef struct
{
/*Ext. of ancestor*/
/*Ext. of ancestor*/
/*New data for this type */
lv_obj_t * btns;
lv_obj_t * indic;
@@ -58,7 +58,7 @@ typedef struct
uint8_t draging :1;
uint8_t drag_hor :1;
lv_tabview_action_t tab_load_action;
}lv_tabview_ext_t;
} lv_tabview_ext_t;
typedef enum {
LV_TABVIEW_STYLE_BG,
@@ -68,7 +68,7 @@ typedef enum {
LV_TABVIEW_STYLE_BTN_PR,
LV_TABVIEW_STYLE_BTN_TGL_REL,
LV_TABVIEW_STYLE_BTN_TGL_PR,
}lv_tabview_style_t;
} lv_tabview_style_t;
/**********************
* GLOBAL PROTOTYPES

6
lv_objx/lv_win.h
View File

@@ -1,6 +1,6 @@
/**
* @file lv_win.h
*
*
*/
#ifndef LV_WIN_H
@@ -61,7 +61,7 @@ typedef struct
lv_style_t * style_btn_rel; /*Control button releases style*/
lv_style_t * style_btn_pr; /*Control button pressed style*/
lv_coord_t btn_size; /*Size of the control buttons (square)*/
}lv_win_ext_t;
} lv_win_ext_t;
typedef enum {
LV_WIN_STYLE_BG,
@@ -71,7 +71,7 @@ typedef enum {
LV_WIN_STYLE_HEADER,
LV_WIN_STYLE_BTN_REL,
LV_WIN_STYLE_BTN_PR,
}lv_win_style_t;
} lv_win_style_t;
/**********************
* GLOBAL PROTOTYPES