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

Merge branch 'dev-6.1' into dev-7.0

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2019-11-16 11:27:51 +01:00
commit 537f1256c8
3 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lv_misc/lv_color.h
View File

@ -114,10 +114,10 @@ enum {
# define LV_COLOR_GET_B8(c) (c).ch.blue # define LV_COLOR_GET_B8(c) (c).ch.blue
# define LV_COLOR_GET_A8(c) 0xFF # define LV_COLOR_GET_A8(c) 0xFF
# define LV_COLOR_SET_R16(c, v) (c).ch.red = (uint16_t)((v) & 0x1F); # define LV_COLOR_SET_R16(c, v) (c).ch.red = (uint8_t)((v) & 0x1F);
# define LV_COLOR_SET_G16(c, v) (c).ch.green = (uint16_t)((v) & 0x3F); # define LV_COLOR_SET_G16(c, v) (c).ch.green = (uint8_t)((v) & 0x3F);
# define LV_COLOR_SET_G16_SWAP(c, v) {(c).ch.green_h = (uint16_t)(((v) >> 3) & 0x7); (c).ch.green_l = (uint16_t)((v) & 0x7);} # define LV_COLOR_SET_G16_SWAP(c, v) {(c).ch.green_h = (uint8_t)(((v) >> 3) & 0x7); (c).ch.green_l = (uint8_t)((v) & 0x7);}
# define LV_COLOR_SET_B16(c, v) (c).ch.blue = (uint16_t)((v) & 0x1F); # define LV_COLOR_SET_B16(c, v) (c).ch.blue = (uint8_t)((v) & 0x1F);
# define LV_COLOR_SET_A16(c, v) do {} while(0) # define LV_COLOR_SET_A16(c, v) do {} while(0)
# define LV_COLOR_GET_R16(c) (c).ch.red # define LV_COLOR_GET_R16(c) (c).ch.red

24
src/lv_objx/lv_lmeter.c
View File

@ -76,6 +76,7 @@ lv_obj_t * lv_lmeter_create(lv_obj_t * par, const lv_obj_t * copy)
ext->cur_value = 0; ext->cur_value = 0;
ext->line_cnt = 21; /*Odd scale number looks better*/ ext->line_cnt = 21; /*Odd scale number looks better*/
ext->scale_angle = 240; /*(scale_num - 1) * N looks better */ ext->scale_angle = 240; /*(scale_num - 1) * N looks better */
ext->angle_ofs = 0;
/*The signal and design functions are not copied so set them here*/ /*The signal and design functions are not copied so set them here*/
lv_obj_set_signal_cb(new_lmeter, lv_lmeter_signal); lv_obj_set_signal_cb(new_lmeter, lv_lmeter_signal);
@ -178,16 +179,16 @@ void lv_lmeter_set_scale(lv_obj_t * lmeter, uint16_t angle, uint8_t line_cnt)
} }
/** /**
* Set the angle settings of a line meter * Set the set an offset for the line meter's angles to rotate it.
* @param lmeter pointer to a line meter object * @param lmeter pointer to a line meter object
* @param angle angle where the meter will be facing (with its center) * @param angle angle where the meter will be facing (with its center)
*/ */
void lv_lmeter_set_angle(lv_obj_t * lmeter, uint16_t angle) void lv_lmeter_set_angle_offset(lv_obj_t * lmeter, uint16_t angle)
{ {
lv_lmeter_ext_t * ext = lv_obj_get_ext_attr(lmeter); lv_lmeter_ext_t * ext = lv_obj_get_ext_attr(lmeter);
if(ext->angle == angle) return; if(ext->angle_ofs == angle) return;
ext->angle = angle; ext->angle_ofs = angle;
lv_obj_invalidate(lmeter); lv_obj_invalidate(lmeter);
} }
@ -251,7 +252,7 @@ uint8_t lv_lmeter_get_line_count(const lv_obj_t * lmeter)
/** /**
* Get the scale angle of a line meter * Get the scale angle of a line meter
* @param lmeter pointer to a line meter object * @param lmeter pointer to a line meter object
* @return angle of the scale * @return angle_ofs of the scale
*/ */
uint16_t lv_lmeter_get_scale_angle(const lv_obj_t * lmeter) uint16_t lv_lmeter_get_scale_angle(const lv_obj_t * lmeter)
{ {
@ -261,6 +262,17 @@ uint16_t lv_lmeter_get_scale_angle(const lv_obj_t * lmeter)
return ext->scale_angle; return ext->scale_angle;
} }
/**
* get the set an offset for the line meter.
* @param lmeter pointer to a line meter object
* @return angle offset (0..360)
*/
uint16_t lv_lmeter_get_angle_offset(lv_obj_t * lmeter)
{
lv_lmeter_ext_t * ext = lv_obj_get_ext_attr(lmeter);
return ext->angle_ofs;
}
/********************** /**********************
* STATIC FUNCTIONS * STATIC FUNCTIONS
**********************/ **********************/
@ -302,7 +314,7 @@ static lv_design_res_t lv_lmeter_design(lv_obj_t * lmeter, const lv_area_t * cli
lv_coord_t x_ofs = lv_obj_get_width(lmeter) / 2 + lmeter->coords.x1; 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; lv_coord_t y_ofs = lv_obj_get_height(lmeter) / 2 + lmeter->coords.y1;
int16_t angle_ofs = ext->angle + 90 + (360 - ext->scale_angle) / 2; int16_t angle_ofs = ext->angle_ofs + 90 + (360 - ext->scale_angle) / 2;
int16_t level = int16_t level =
(int32_t)((int32_t)(ext->cur_value - ext->min_value) * ext->line_cnt) / (ext->max_value - ext->min_value); (int32_t)((int32_t)(ext->cur_value - ext->min_value) * ext->line_cnt) / (ext->max_value - ext->min_value);
uint8_t i; uint8_t i;

15
src/lv_objx/lv_lmeter.h
View File

@ -36,7 +36,7 @@ typedef struct
/*No inherited ext.*/ /*Ext. of ancestor*/ /*No inherited ext.*/ /*Ext. of ancestor*/
/*New data for this type */ /*New data for this type */
uint16_t scale_angle; /*Angle of the scale in deg. (0..360)*/ uint16_t scale_angle; /*Angle of the scale in deg. (0..360)*/
uint16_t angle; uint16_t angle_ofs;
uint8_t line_cnt; /*Count of lines */ uint8_t line_cnt; /*Count of lines */
int16_t cur_value; int16_t cur_value;
int16_t min_value; int16_t min_value;
@ -90,11 +90,11 @@ void lv_lmeter_set_range(lv_obj_t * lmeter, int16_t min, int16_t max);
void lv_lmeter_set_scale(lv_obj_t * lmeter, uint16_t angle, uint8_t line_cnt); 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 set an offset for the line meter's angles to rotate it.
* @param lmeter pointer to a line meter object * @param lmeter pointer to a line meter object
* @param angle angle of rotation (relative to the northen axis) * @param angle angle offset (0..360), rotates clockwise
*/ */
void lv_lmeter_set_angle(lv_obj_t * lmeter, uint16_t angle); void lv_lmeter_set_angle_offset(lv_obj_t * lmeter, uint16_t angle);
/** /**
* Set the styles of a line meter * Set the styles of a line meter
@ -147,6 +147,13 @@ uint8_t lv_lmeter_get_line_count(const lv_obj_t * lmeter);
*/ */
uint16_t lv_lmeter_get_scale_angle(const lv_obj_t * lmeter); uint16_t lv_lmeter_get_scale_angle(const lv_obj_t * lmeter);
/**
* get the set an offset for the line meter.
* @param lmeter pointer to a line meter object
* @return angle offset (0..360)
*/
uint16_t lv_lmeter_get_angle_offset(lv_obj_t * lmeter);
/** /**
* Get the style of a line meter * Get the style of a line meter
* @param lmeter pointer to a line meter object * @param lmeter pointer to a line meter object