Skip to content

Commit

Permalink
chore: many trivial spelling and layout fixes (lvgl#3008)
Browse files Browse the repository at this point in the history
Co-authored-by: Gabor Kiss-Vamosi <[email protected]>
  • Loading branch information
ckielstra and kisvegabor authored Jan 17, 2022
1 parent a9a6cb8 commit febafd1
Show file tree
Hide file tree
Showing 128 changed files with 316 additions and 335 deletions.
2 changes: 1 addition & 1 deletion Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -955,7 +955,7 @@ menu "LVGL configuration"
depends on LV_USE_DEMO_MUSIC
default n
config LV_DEMO_MUSIC_LANDSCAPE
bool "Enable Landspace"
bool "Enable Landscape"
depends on LV_USE_DEMO_MUSIC
default n
config LV_DEMO_MUSIC_ROUND
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ LVGL provides everything you need to create an embedded GUI with easy-to-use gra
* Powerful layouts inspired by CSS: [Flexbox](https://docs.lvgl.io/master/layouts/flex.html) and [Grid](https://docs.lvgl.io/master/layouts/grid.html)
* OS, External memory and GPU are supported but not required. (built in support for STM32 DMA2D, and NXP PXP and VGLite)
* Smooth rendering even with a [single frame buffer](https://docs.lvgl.io/master/porting/display.html)
* Written in C and compatibile with C++
* Written in C and compatible with C++
* Micropython Binding exposes [LVGL API in Micropython](https://blog.lvgl.io/2019-02-20/micropython-bindings)
* [Simulator](https://docs.lvgl.io/master/get-started/pc-simulator.html) to develop on PC without embedded hardware
* 100+ simple [Examples](https://github.com/lvgl/lvgl/tree/master/examples)
Expand Down Expand Up @@ -105,7 +105,7 @@ Just to mention some platforms:
- Nordic NRF52 Bluetooth modules
- Quectel modems

LVGL is also avaiable as:
LVGL is also available as:
- [Arduino library](https://docs.lvgl.io/master/get-started/arduino.html)
- [PlatformIO package](https://platformio.org/lib/show/12440/lvgl)
- [Zephyr library](https://docs.zephyrproject.org/latest/reference/kconfig/CONFIG_LVGL.html)
Expand Down
4 changes: 2 additions & 2 deletions demos/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ See in [lv_demo_benchmark](https://github.com/lvgl/lv_examples/tree/master/src/l
### Stress
A stress test for LVGL. It contains a lot of object creation, deletion, animations, style usage, and so on. It can be used if there is any memory corruption during heavy usage or any memory leaks.
See in [lv_demo_stress](https://github.com/lvgl/lv_examples/tree/master/src/lv_demo_stress) folder.
<img src="https://github.com/lvgl/lv_examples/blob/master/src/lv_demo_stress/screenshot1.png?raw=true" width=600px alt="Stress tes tfor LVGL">
<img src="https://github.com/lvgl/lv_examples/blob/master/src/lv_demo_stress/screenshot1.png?raw=true" width=600px alt="Stress test for LVGL">

## Contributing
For contribution and coding style guidelines, please refer to the file docs/CONTRIBUTNG.md in the main LVGL repo:
For contribution and coding style guidelines, please refer to the file docs/CONTRIBUTING.md in the main LVGL repo:
  https://github.com/lvgl/lvgl
4 changes: 2 additions & 2 deletions demos/benchmark/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
## Overview

The benchmark demo tests the performance in various cases.
For example rectangle, border, shadow, text, image blending, image transformation, bleding modes, etc.
For example rectangle, border, shadow, text, image blending, image transformation, blending modes, etc.
All tests are repeated with 50% opacity.

The size an position of the objects during testing are set with a pseudo random number to make the benchmark repeatable.
The size and position of the objects during testing are set with a pseudo random number to make the benchmark repeatable.

On to top of the screen the title of the current test step, and the result of the previous step is displayed.

Expand Down
2 changes: 1 addition & 1 deletion demos/benchmark/lv_demo_benchmark.c
Original file line number Diff line number Diff line change
Expand Up @@ -734,7 +734,7 @@ static void scene_next_task_cb(lv_timer_t * timer)
uint32_t fps_normal_unweighted = fps_normal_sum / weight_normal_sum;
uint32_t fps_opa_unweighted = fps_opa_sum / weight_opa_sum;

uint32_t opa_speed_pct = (fps_opa_unweighted * 100) / fps_normal_unweighted;
uint32_t opa_speed_pct = (fps_opa_unweighted * 100) / fps_normal_unweighted;

lv_obj_clean(lv_scr_act());
scene_bg = NULL;
Expand Down
4 changes: 2 additions & 2 deletions demos/music/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ The music player demo shows what kind of modern, smartphone-like user interfaces
- Zoom the album cover proportionality to the current bass value
- Display the 4 bands on the left side of a circle by default at 0°, 45°, 90°, 135°
- Add extra bars next to the "main bars" with a cosine shape. Add more bars for the lower bands.
- If the there is a large enough bass add a random offset to the position of the bars. E.g. start from 63° istead of 0°. (bars greater than 180° start again from 0°)
- If there no bass add 1 to the offset of the bars (it creates a "walking" effect)
- If there is a large enough bass, add a random offset to the position of the bars. E.g. start from 63° instead of 0°. (bars greater than 180° start again from 0°)
- If there is no bass, add 1 to the offset of the bars (it creates a "walking" effect)
- Mirror the bars to the right side of the circle

## Using spectrum.py
Expand Down
4 changes: 2 additions & 2 deletions demos/music/lv_demo_music_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ lv_obj_t * _lv_demo_music_main_create(lv_obj_t * parent)

start_anim = true;

lv_timer_t * timer = lv_timer_create(stop_start_anim, INTRO_TIME + 6000, NULL);
lv_timer_t * timer = lv_timer_create(stop_start_anim, INTRO_TIME + 6000, NULL);
lv_timer_set_repeat_count(timer, 1);

lv_anim_init(&a);
Expand Down Expand Up @@ -799,7 +799,7 @@ static void spectrum_draw_event_cb(lv_event_t * e)
for(i = 0; i < BAR_CNT; i++) {
uint32_t deg_space = 1;
uint32_t deg = i * DEG_STEP + 90;
uint32_t j = (i + bar_rot + rnd_array[bar_ofs %10]) % BAR_CNT;
uint32_t j = (i + bar_rot + rnd_array[bar_ofs %10]) % BAR_CNT;
uint32_t k = (i + bar_rot + rnd_array[(bar_ofs + 1) % 10]) % BAR_CNT;

uint32_t v = (r[k] * animv + r[j] * (amax - animv)) / amax;
Expand Down
2 changes: 1 addition & 1 deletion demos/stress/lv_demo_stress.c
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ static void obj_test_task_cb(lv_timer_t * tmr)
break;

case 18:
obj = lv_list_create(main_page);
obj = lv_list_create(main_page);
{
lv_obj_t * b;
b = lv_list_add_btn(obj, LV_SYMBOL_OK, "1. Some very long text to scroll");
Expand Down
14 changes: 7 additions & 7 deletions demos/widgets/lv_demo_widgets.c
Original file line number Diff line number Diff line change
Expand Up @@ -101,36 +101,36 @@ void lv_demo_widgets(void)
if(disp_size == DISP_LARGE) {
tab_h = 70;
#if LV_FONT_MONTSERRAT_24
font_large = &lv_font_montserrat_24;
font_large = &lv_font_montserrat_24;
#else
LV_LOG_WARN("LV_FONT_MONTSERRAT_24 is not enabled for the widgets demo. Using LV_FONT_DEFAULT instead.");
#endif
#if LV_FONT_MONTSERRAT_16
font_normal = &lv_font_montserrat_16;
font_normal = &lv_font_montserrat_16;
#else
LV_LOG_WARN("LV_FONT_MONTSERRAT_16 is not enabled for the widgets demo. Using LV_FONT_DEFAULT instead.");
#endif
} else if(disp_size == DISP_MEDIUM) {
tab_h = 45;
#if LV_FONT_MONTSERRAT_20
font_large = &lv_font_montserrat_20;
font_large = &lv_font_montserrat_20;
#else
LV_LOG_WARN("LV_FONT_MONTSERRAT_20 is not enabled for the widgets demo. Using LV_FONT_DEFAULT instead.");
#endif
#if LV_FONT_MONTSERRAT_14
font_normal = &lv_font_montserrat_14;
font_normal = &lv_font_montserrat_14;
#else
LV_LOG_WARN("LV_FONT_MONTSERRAT_14 is not enabled for the widgets demo. Using LV_FONT_DEFAULT instead.");
#endif
} else { /* disp_size == DISP_SMALL */
tab_h = 45;
#if LV_FONT_MONTSERRAT_18
font_large = &lv_font_montserrat_18;
font_large = &lv_font_montserrat_18;
#else
LV_LOG_WARN("LV_FONT_MONTSERRAT_18 is not enabled for the widgets demo. Using LV_FONT_DEFAULT instead.");
#endif
#if LV_FONT_MONTSERRAT_12
font_normal = &lv_font_montserrat_12;
font_normal = &lv_font_montserrat_12;
#else
LV_LOG_WARN("LV_FONT_MONTSERRAT_12 is not enabled for the widgets demo. Using LV_FONT_DEFAULT instead.");
#endif
Expand Down Expand Up @@ -1058,7 +1058,7 @@ static void color_event_cb(lv_event_t * e)
}
else if(code == LV_EVENT_CLICKED) {
lv_palette_t * palette_primary = lv_event_get_user_data(e);
lv_palette_t palette_secondary = (*palette_primary) + 3; /*Use an other palette as secondary*/
lv_palette_t palette_secondary = (*palette_primary) + 3; /*Use another palette as secondary*/
if(palette_secondary >= _LV_PALETTE_LAST) palette_secondary = 0;

lv_theme_default_init(NULL, lv_palette_main(*palette_primary), lv_palette_main(palette_secondary), LV_THEME_DEFAULT_DARK, font_normal);
Expand Down
6 changes: 3 additions & 3 deletions demos/widgets/lv_demo_widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def gauge_anim(a,gauge,val):
def bar_anim(task,bar):
val = bar.get_value()
# print("bar value: ",val)
max_value = bar.get_max_value()
max_value = bar.get_max_value()
val += 1
if val > max_value:
val=0
Expand Down Expand Up @@ -148,7 +148,7 @@ def controls_create(parent):
h.set_style_local_value_str(lv.cont.PART.MAIN, lv.STATE.DEFAULT, "Basics")

disp_size = display.get_size_category()
if disp_size <= lv.DISP_SIZE.SMALL:
if disp_size <= lv.DISP_SIZE.SMALL:
grid_w= lv.page.get_width_grid(lv.page.__cast__(parent),1,1)
# print("grid_w: ",grid_w)
else:
Expand Down Expand Up @@ -338,7 +338,7 @@ def visuals_create(parent):
if grid_w_meter < meter_h:
meter_size = grid_w_meter
else:
meter_size = meter_h
meter_size = meter_h

lmeter = lv.linemeter(parent, None)
lmeter.set_drag_parent(True)
Expand Down
Loading

0 comments on commit febafd1

Please sign in to comment.