From 789775d8d7b01979d6fb7ea197300ecfb0446338 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Thu, 20 Dec 2018 00:01:05 +0100 Subject: [PATCH] minor fixes --- lv_objx/lv_objx.mk | 3 +++ lv_objx/lv_spinbox.c | 18 +++++++++--------- lv_objx/lv_spinbox.h | 21 +++++++++++++-------- 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/lv_objx/lv_objx.mk b/lv_objx/lv_objx.mk index 509e2dbff..105082b00 100644 --- a/lv_objx/lv_objx.mk +++ b/lv_objx/lv_objx.mk @@ -8,6 +8,7 @@ CSRCS += lv_mbox.c CSRCS += lv_preload.c CSRCS += lv_roller.c CSRCS += lv_tabview.c +CSRCS += lv_tileview.c CSRCS += lv_btn.c CSRCS += lv_calendar.c CSRCS += lv_chart.c @@ -16,9 +17,11 @@ CSRCS += lv_label.c CSRCS += lv_list.c CSRCS += lv_slider.c CSRCS += lv_ta.c +CSRCS += lv_spinbox.c CSRCS += lv_btnm.c CSRCS += lv_cont.c CSRCS += lv_img.c +CSRCS += lv_imgbtn.c CSRCS += lv_led.c CSRCS += lv_lmeter.c CSRCS += lv_page.c diff --git a/lv_objx/lv_spinbox.c b/lv_objx/lv_spinbox.c index 3510d968d..896e1d170 100644 --- a/lv_objx/lv_spinbox.c +++ b/lv_objx/lv_spinbox.c @@ -22,7 +22,7 @@ * STATIC PROTOTYPES **********************/ static lv_res_t lv_spinbox_signal(lv_obj_t * spinbox, lv_signal_t sign, void * param); -static void lv_spinbox_updatevalue(const lv_obj_t * spinbox); +static void lv_spinbox_updatevalue(lv_obj_t * spinbox); /********************** * STATIC VARIABLES @@ -115,7 +115,7 @@ lv_obj_t * lv_spinbox_create(lv_obj_t * par, const lv_obj_t * copy) * @param spinbox pointer to spinbox * @param i value to be set */ -void lv_spinbox_set_value(const lv_obj_t * spinbox, int32_t i) +void lv_spinbox_set_value(lv_obj_t * spinbox, int32_t i) { lv_spinbox_ext_t * ext = lv_obj_get_ext_attr(spinbox); if(ext == NULL) @@ -137,7 +137,7 @@ void lv_spinbox_set_value(const lv_obj_t * spinbox, int32_t i) * @param digit_count number of digit excluding the decimal separator and the sign * @param separator_position number of digit before the decimal point. If 0, decimal point is not shown */ -void lv_spinbox_set_digit_format(const lv_obj_t * spinbox, uint8_t digit_count, uint8_t separator_position) +void lv_spinbox_set_digit_format(lv_obj_t * spinbox, uint8_t digit_count, uint8_t separator_position) { lv_spinbox_ext_t * ext = lv_obj_get_ext_attr(spinbox); if(ext == NULL) @@ -160,7 +160,7 @@ void lv_spinbox_set_digit_format(const lv_obj_t * spinbox, uint8_t digit_count, * @param spinbox pointer to spinbox * @param step steps on increment/decrement */ -void lv_spinbox_set_step(const lv_obj_t * spinbox, uint32_t step) +void lv_spinbox_set_step(lv_obj_t * spinbox, uint32_t step) { lv_spinbox_ext_t * ext = lv_obj_get_ext_attr(spinbox); if(ext == NULL) return; @@ -174,7 +174,7 @@ void lv_spinbox_set_step(const lv_obj_t * spinbox, uint32_t step) * @param range_min maximum value, inclusive * @param range_max minimum value, inclusive */ -void lv_spinbox_set_range(const lv_obj_t * spinbox, int32_t range_min, int32_t range_max) +void lv_spinbox_set_range(lv_obj_t * spinbox, int32_t range_min, int32_t range_max) { lv_spinbox_ext_t * ext = lv_obj_get_ext_attr(spinbox); if(ext == NULL) return; @@ -199,7 +199,7 @@ void lv_spinbox_set_range(const lv_obj_t * spinbox, int32_t range_min, int32_t r * @param spinbox pointer to spinbox * @param cb Callback function called on value change event */ -void lv_spinbox_set_value_changed_cb(const lv_obj_t * spinbox, lv_spinbox_value_changed_cb_t cb) +void lv_spinbox_set_value_changed_cb(lv_obj_t * spinbox, lv_spinbox_value_changed_cb_t cb) { lv_spinbox_ext_t * ext = lv_obj_get_ext_attr(spinbox); ext->value_changed_cb = cb; @@ -210,7 +210,7 @@ void lv_spinbox_set_value_changed_cb(const lv_obj_t * spinbox, lv_spinbox_value_ * @param spinbox pointer to spinbox * @param cb Callback function called on value change event */ -void lv_spinbox_set_padding_left(const lv_obj_t * spinbox, uint8_t padding) +void lv_spinbox_set_padding_left(lv_obj_t * spinbox, uint8_t padding) { lv_spinbox_ext_t * ext = lv_obj_get_ext_attr(spinbox); ext->digit_padding_left = padding; @@ -226,7 +226,7 @@ void lv_spinbox_set_padding_left(const lv_obj_t * spinbox, uint8_t padding) * @param spinbox pointer to spinbox * @return value integer value of the spinbox */ -int32_t lv_spinbox_get_value(const lv_obj_t * spinbox) +int32_t lv_spinbox_get_value(lv_obj_t * spinbox) { lv_spinbox_ext_t * ext = lv_obj_get_ext_attr(spinbox); @@ -422,7 +422,7 @@ static lv_res_t lv_spinbox_signal(lv_obj_t * spinbox, lv_signal_t sign, void * p return res; } -static void lv_spinbox_updatevalue(const lv_obj_t * spinbox) +static void lv_spinbox_updatevalue(lv_obj_t * spinbox) { lv_spinbox_ext_t * ext = lv_obj_get_ext_attr(spinbox); int32_t v = ext->value; diff --git a/lv_objx/lv_spinbox.h b/lv_objx/lv_spinbox.h index 628e5dfae..c2956d055 100644 --- a/lv_objx/lv_spinbox.h +++ b/lv_objx/lv_spinbox.h @@ -22,6 +22,11 @@ extern "C" { #if USE_LV_SPINBOX != 0 +/*Testing of dependencies*/ +#if USE_LV_TA == 0 +#error "lv_spinbox: lv_ta is required. Enable it in lv_conf.h (USE_LV_TA 1) " +#endif + #include "../lv_core/lv_obj.h" #include "../lv_objx/lv_ta.h" @@ -95,7 +100,7 @@ static inline void lv_spinbox_set_style(lv_obj_t * spinbox, lv_spinbox_style_t t * @param spinbox pointer to spinbox * @param i value to be set */ -void lv_spinbox_set_value(const lv_obj_t * spinbox, int32_t i); +void lv_spinbox_set_value(lv_obj_t * spinbox, int32_t i); /** * Set spinbox digit format (digit count and decimal format) @@ -103,14 +108,14 @@ void lv_spinbox_set_value(const lv_obj_t * spinbox, int32_t i); * @param digit_count number of digit excluding the decimal separator and the sign * @param separator_position number of digit before the decimal point. If 0, decimal point is not shown */ -void lv_spinbox_set_digit_format(const lv_obj_t * spinbox, uint8_t digit_count, uint8_t separator_position); +void lv_spinbox_set_digit_format(lv_obj_t * spinbox, uint8_t digit_count, uint8_t separator_position); /** * Set spinbox step * @param spinbox pointer to spinbox * @param step steps on increment/decrement */ -void lv_spinbox_set_step(const lv_obj_t * spinbox, uint32_t step); +void lv_spinbox_set_step(lv_obj_t * spinbox, uint32_t step); /** * Set spinbox value range @@ -118,21 +123,21 @@ void lv_spinbox_set_step(const lv_obj_t * spinbox, uint32_t step); * @param range_min maximum value, inclusive * @param range_max minimum value, inclusive */ -void lv_spinbox_set_range(const lv_obj_t * spinbox, int32_t range_min, int32_t range_max); +void lv_spinbox_set_range(lv_obj_t * spinbox, int32_t range_min, int32_t range_max); /** * Set spinbox callback on calue change * @param spinbox pointer to spinbox * @param cb Callback function called on value change event */ -void lv_spinbox_set_value_changed_cb(const lv_obj_t * spinbox, lv_spinbox_value_changed_cb_t cb); +void lv_spinbox_set_value_changed_cb(lv_obj_t * spinbox, lv_spinbox_value_changed_cb_t cb); /** * Set spinbox left padding in digits count (added between sign and first digit) * @param spinbox pointer to spinbox * @param cb Callback function called on value change event */ -void lv_spinbox_set_padding_left(const lv_obj_t * spinbox, uint8_t padding); +void lv_spinbox_set_padding_left(lv_obj_t * spinbox, uint8_t padding); /*===================== * Getter functions @@ -144,7 +149,7 @@ void lv_spinbox_set_padding_left(const lv_obj_t * spinbox, uint8_t padding); * @param type which style should be get * @return style pointer to the style */ -static inline lv_style_t * lv_spinbox_get_style(const lv_obj_t * spinbox, lv_spinbox_style_t type) +static inline lv_style_t * lv_spinbox_get_style(lv_obj_t * spinbox, lv_spinbox_style_t type) { return lv_ta_get_style(spinbox, type); } @@ -154,7 +159,7 @@ static inline lv_style_t * lv_spinbox_get_style(const lv_obj_t * spinbox, lv_spi * @param spinbox pointer to spinbox * @return value integer value of the spinbox */ -int32_t lv_spinbox_get_value(const lv_obj_t * spinbox); +int32_t lv_spinbox_get_value(lv_obj_t * spinbox); /*===================== * Other functions