Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-02-04 07:13:00 +08:00
Code Issues Projects Releases Wiki Activity

Add reverse value mapping and arc tracking

Browse Source
This commit is contained in:
Adam Martini 2020-06-21 00:26:20 -07:00
parent 4bedc57b7d
commit d60a6cbc76
2 changed files with 47 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/lv_widgets/lv_rotary.c
View File

@ -84,9 +84,9 @@ lv_obj_t * lv_rotary_create(lv_obj_t * par, const lv_obj_t * copy)
ext->cur_value = 0; ext->cur_value = 0;
ext->min_value = 0; ext->min_value = 0;
ext->max_value = 0; ext->max_value = 0;
ext->dragging = false;
ext->sensitivity = 1; ext->sensitivity = 1;
ext->threshold = 1; ext->threshold = 1;
ext->dragging = false;
lv_style_list_init(&ext->style_knob); lv_style_list_init(&ext->style_knob);
/*The signal and design functions are not copied so set them here*/ /*The signal and design functions are not copied so set them here*/
@ -107,10 +107,11 @@ lv_obj_t * lv_rotary_create(lv_obj_t * par, const lv_obj_t * copy)
ext->cur_value = copy_ext->cur_value; ext->cur_value = copy_ext->cur_value;
ext->min_value = copy_ext->min_value; ext->min_value = copy_ext->min_value;
ext->max_value = copy_ext->max_value; ext->max_value = copy_ext->max_value;
ext->dragging = copy_ext->dragging;
ext->sym = copy_ext->sym;
ext->sensitivity = copy_ext->sensitivity; ext->sensitivity = copy_ext->sensitivity;
ext->threshold = copy_ext->threshold; ext->threshold = copy_ext->threshold;
ext->dragging = copy_ext->dragging;
ext->sym = copy_ext->sym;
ext->reverse = copy_ext->reverse;
lv_style_list_copy(&ext->style_knob, &copy_ext->style_knob); lv_style_list_copy(&ext->style_knob, &copy_ext->style_knob);
lv_obj_refresh_style(rotary, LV_OBJ_PART_ALL); lv_obj_refresh_style(rotary, LV_OBJ_PART_ALL);
@ -146,11 +147,19 @@ void lv_rotary_set_value(lv_obj_t * rotary, int16_t value, lv_anim_enable_t anim
ext->cur_value = new_value; ext->cur_value = new_value;
lv_arc_set_end_angle( if (ext->reverse) {
rotary, lv_arc_set_start_angle(
_lv_map(ext->cur_value, ext->min_value, ext->max_value, rotary,
ext->arc.arc_angle_start, 360 + ext->arc.bg_angle_end) _lv_map(ext->cur_value, ext->min_value, ext->max_value,
); ext->arc.arc_angle_start, ext->arc.bg_angle_start)
);
} else {
lv_arc_set_end_angle(
rotary,
_lv_map(ext->cur_value, ext->min_value, ext->max_value,
ext->arc.arc_angle_start, 360 + ext->arc.bg_angle_end)
);
}
} }
/** /**
@ -195,6 +204,27 @@ void lv_rotary_set_symmetric(lv_obj_t * rotary, bool en)
lv_obj_invalidate(rotary); lv_obj_invalidate(rotary);
} }
/**
* Reverse rotary behavior. The indicator will grow from arc end instead of arc start.
* position.
* @param rotary pointer to a rotary object
* @param reverse true: enable disable reverse behavior; false: disable
*/
void lv_rotary_set_reverse(lv_obj_t * rotary, bool reverse)
{
LV_ASSERT_OBJ(rotary, LV_OBJX_NAME);
lv_rotary_ext_t *ext = (lv_rotary_ext_t *)lv_obj_get_ext_attr(rotary);
ext->reverse = reverse;
uint16_t end = ext->arc.arc_angle_end;
ext->arc.arc_angle_end = ext->arc.bg_angle_end;
ext->arc.arc_angle_start= end;
lv_obj_invalidate(rotary);
}
/** /**
* Set the sesitivity of rotary knob increments * Set the sesitivity of rotary knob increments
* position. * position.

9
src/lv_widgets/lv_rotary.h
View File

@ -72,6 +72,7 @@ typedef struct {
lv_coord_t last_drag_x; /*Last drag x coordintate of the rotary*/ lv_coord_t last_drag_x; /*Last drag x coordintate of the rotary*/
uint16_t dragging :1; uint16_t dragging :1;
uint16_t sym :1; uint16_t sym :1;
uint16_t reverse :1;
} lv_rotary_ext_t; } lv_rotary_ext_t;
@ -124,6 +125,14 @@ void lv_rotary_set_range(lv_obj_t * rotary, int16_t min, int16_t max);
*/ */
void lv_rotary_set_symmetric(lv_obj_t * rotary, bool en); void lv_rotary_set_symmetric(lv_obj_t * rotary, bool en);
/**
* Reverse rotary behavior. The indicator will grow from arc end instead of arc start.
* position.
* @param rotary pointer to a rotary object
* @param reverse true: enable disable reverse behavior; false: disable
*/
void lv_rotary_set_reverse(lv_obj_t * rotary, bool reverse);
/** /**
* Set the sesitivity of rotary knob increments * Set the sesitivity of rotary knob increments
* position. * position.