Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-21 06:53:01 +08:00
Code Issues Projects Releases Wiki Activity

Add const qualifier to lv_btnm_set_map / static functions

Browse Source
This commit is contained in:
canardos 2019-02-19 15:06:23 +08:00
parent a6d8d1cbc5
commit 1b519cd104
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lv_objx/lv_btnm.c
View File

@ -35,8 +35,8 @@ static bool button_is_inactive(lv_btn_ctrl_t ctrl_bits);
const char * cut_ctrl_byte(const char * btn_str); const char * cut_ctrl_byte(const char * btn_str);
static uint16_t get_button_from_point(lv_obj_t * btnm, lv_point_t * p); static uint16_t get_button_from_point(lv_obj_t * btnm, lv_point_t * p);
static uint16_t get_button_text(lv_obj_t * btnm, uint16_t btn_id); static uint16_t get_button_text(lv_obj_t * btnm, uint16_t btn_id);
static void parse_control_bytes(lv_obj_t * btnm, const char ** map); static void parse_control_bytes(const lv_obj_t * btnm, const char ** map);
static void allocate_btn_areas_and_controls(lv_obj_t * btnm, const char ** map); static void allocate_btn_areas_and_controls(const lv_obj_t * btnm, const char ** map);
static void invalidate_button_area(const lv_obj_t * btnm, uint16_t btn_idx); static void invalidate_button_area(const lv_obj_t * btnm, uint16_t btn_idx);
static bool maps_are_identical(const char ** map1, const char ** map2); static bool maps_are_identical(const char ** map1, const char ** map2);
@ -153,7 +153,7 @@ lv_obj_t * lv_btnm_create(lv_obj_t * par, const lv_obj_t * copy)
* Example (practically use octal numbers): "\224abc": "abc" text * Example (practically use octal numbers): "\224abc": "abc" text
* with 4 width and no long press. * with 4 width and no long press.
*/ */
void lv_btnm_set_map(lv_obj_t * btnm, const char ** map) void lv_btnm_set_map(const lv_obj_t * btnm, const char ** map)
{ {
if(map == NULL) return; if(map == NULL) return;
@ -874,7 +874,7 @@ static lv_res_t lv_btnm_signal(lv_obj_t * btnm, lv_signal_t sign, void * param)
* @param btnm pointer to button matrix object * @param btnm pointer to button matrix object
* @param map_p pointer to a string array * @param map_p pointer to a string array
*/ */
static void allocate_btn_areas_and_controls(lv_obj_t * btnm, const char ** map) static void allocate_btn_areas_and_controls(const lv_obj_t * btnm, const char ** map)
{ {
/*Count the buttons in the map*/ /*Count the buttons in the map*/
uint16_t btn_cnt = 0; uint16_t btn_cnt = 0;
@ -911,7 +911,7 @@ static void allocate_btn_areas_and_controls(lv_obj_t * btnm, const char ** map)
* @param btnm pointer to button matrix object * @param btnm pointer to button matrix object
* @param map_p pointer to a string array * @param map_p pointer to a string array
*/ */
static void parse_control_bytes(lv_obj_t * btnm, const char ** map) static void parse_control_bytes(const lv_obj_t * btnm, const char ** map)
{ {
lv_btnm_ext_t * ext = lv_obj_get_ext_attr(btnm); lv_btnm_ext_t * ext = lv_obj_get_ext_attr(btnm);

2
lv_objx/lv_btnm.h
View File

@ -114,7 +114,7 @@ lv_obj_t * lv_btnm_create(lv_obj_t * par, const lv_obj_t * copy);
* - bit 2..0: button relative width * - bit 2..0: button relative width
* Example (practically use octal numbers): "\224abc": "abc" text with 4 width and no long press * Example (practically use octal numbers): "\224abc": "abc" text with 4 width and no long press
*/ */
void lv_btnm_set_map(lv_obj_t * btnm, const char ** map); void lv_btnm_set_map(const lv_obj_t * btnm, const char ** map);
/** /**
* Set the button control map (hidden, disabled etc.) for a button matrix. The * Set the button control map (hidden, disabled etc.) for a button matrix. The