From b7c3732da73b5a0dd6c5dd33ef65f734d171d5cb Mon Sep 17 00:00:00 2001 From: Mattia Maldini Date: Tue, 12 Nov 2019 16:14:18 +0100 Subject: [PATCH] Different wording --- src/lv_objx/lv_lmeter.c | 12 ++++++------ src/lv_objx/lv_lmeter.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/lv_objx/lv_lmeter.c b/src/lv_objx/lv_lmeter.c index b77211009..6e23f24ae 100644 --- a/src/lv_objx/lv_lmeter.c +++ b/src/lv_objx/lv_lmeter.c @@ -169,16 +169,16 @@ void lv_lmeter_set_scale(lv_obj_t * lmeter, uint16_t angle, uint8_t line_cnt) } /** - * Set the rotation settings of a line meter + * Set the angle settings of a line meter * @param lmeter pointer to a line meter object - * @param angle angle of rotation (relative to the northen axis) + * @param angle angle where the meter will be facing (with its center) */ -void lv_lmeter_set_rotation(lv_obj_t * lmeter, uint16_t angle) +void lv_lmeter_set_angle(lv_obj_t * lmeter, uint16_t angle) { lv_lmeter_ext_t * ext = lv_obj_get_ext_attr(lmeter); - if(ext->rotation == angle) return; + if(ext->angle == angle) return; - ext->rotation = angle; + ext->angle = angle; lv_obj_invalidate(lmeter); } @@ -283,7 +283,7 @@ static bool lv_lmeter_design(lv_obj_t * lmeter, const lv_area_t * mask, lv_desig lv_coord_t x_ofs = lv_obj_get_width(lmeter) / 2 + lmeter->coords.x1; lv_coord_t y_ofs = lv_obj_get_height(lmeter) / 2 + lmeter->coords.y1; - int16_t angle_ofs = ext->rotation + 90 + (360 - ext->scale_angle) / 2; + int16_t angle_ofs = ext->angle + 90 + (360 - ext->scale_angle) / 2; int16_t level = (int32_t)((int32_t)(ext->cur_value - ext->min_value) * ext->line_cnt) / (ext->max_value - ext->min_value); uint8_t i; diff --git a/src/lv_objx/lv_lmeter.h b/src/lv_objx/lv_lmeter.h index ea7c08236..49d662819 100644 --- a/src/lv_objx/lv_lmeter.h +++ b/src/lv_objx/lv_lmeter.h @@ -36,7 +36,7 @@ typedef struct /*No inherited ext.*/ /*Ext. of ancestor*/ /*New data for this type */ uint16_t scale_angle; /*Angle of the scale in deg. (0..360)*/ - uint16_t rotation; + uint16_t angle; uint8_t line_cnt; /*Count of lines */ int16_t cur_value; int16_t min_value; @@ -94,7 +94,7 @@ void lv_lmeter_set_scale(lv_obj_t * lmeter, uint16_t angle, uint8_t line_cnt); * @param lmeter pointer to a line meter object * @param angle angle of rotation (relative to the northen axis) */ -void lv_lmeter_set_rotation(lv_obj_t * lmeter, uint16_t angle); +void lv_lmeter_set_angle(lv_obj_t * lmeter, uint16_t angle); /** * Set the styles of a line meter