Skip to content

Commit febafd1

Browse files
ckielstrakisvegabor
ckielstra
andauthored
chore: many trivial spelling and layout fixes (lvgl#3008)
Co-authored-by: Gabor Kiss-Vamosi <[email protected]>
1 parent a9a6cb8 commit febafd1

File tree

128 files changed

+316
-335
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+316
-335
lines changed

Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -955,7 +955,7 @@ menu "LVGL configuration"
955955
depends on LV_USE_DEMO_MUSIC
956956
default n
957957
config LV_DEMO_MUSIC_LANDSCAPE
958-
bool "Enable Landspace"
958+
bool "Enable Landscape"
959959
depends on LV_USE_DEMO_MUSIC
960960
default n
961961
config LV_DEMO_MUSIC_ROUND

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ LVGL provides everything you need to create an embedded GUI with easy-to-use gra
4242
* Powerful layouts inspired by CSS: [Flexbox](https://docs.lvgl.io/master/layouts/flex.html) and [Grid](https://docs.lvgl.io/master/layouts/grid.html)
4343
* OS, External memory and GPU are supported but not required. (built in support for STM32 DMA2D, and NXP PXP and VGLite)
4444
* Smooth rendering even with a [single frame buffer](https://docs.lvgl.io/master/porting/display.html)
45-
* Written in C and compatibile with C++
45+
* Written in C and compatible with C++
4646
* Micropython Binding exposes [LVGL API in Micropython](https://blog.lvgl.io/2019-02-20/micropython-bindings)
4747
* [Simulator](https://docs.lvgl.io/master/get-started/pc-simulator.html) to develop on PC without embedded hardware
4848
* 100+ simple [Examples](https://github.com/lvgl/lvgl/tree/master/examples)
@@ -105,7 +105,7 @@ Just to mention some platforms:
105105
- Nordic NRF52 Bluetooth modules
106106
- Quectel modems
107107

108-
LVGL is also avaiable as:
108+
LVGL is also available as:
109109
- [Arduino library](https://docs.lvgl.io/master/get-started/arduino.html)
110110
- [PlatformIO package](https://platformio.org/lib/show/12440/lvgl)
111111
- [Zephyr library](https://docs.zephyrproject.org/latest/reference/kconfig/CONFIG_LVGL.html)

demos/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ See in [lv_demo_benchmark](https://github.com/lvgl/lv_examples/tree/master/src/l
4141
### Stress
4242
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.
4343
See in [lv_demo_stress](https://github.com/lvgl/lv_examples/tree/master/src/lv_demo_stress) folder.
44-
<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">
44+
<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">
4545

4646
## Contributing
47-
For contribution and coding style guidelines, please refer to the file docs/CONTRIBUTNG.md in the main LVGL repo:
47+
For contribution and coding style guidelines, please refer to the file docs/CONTRIBUTING.md in the main LVGL repo:
4848
  https://github.com/lvgl/lvgl

demos/benchmark/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
## Overview
44

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

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

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

demos/benchmark/lv_demo_benchmark.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -734,7 +734,7 @@ static void scene_next_task_cb(lv_timer_t * timer)
734734
uint32_t fps_normal_unweighted = fps_normal_sum / weight_normal_sum;
735735
uint32_t fps_opa_unweighted = fps_opa_sum / weight_opa_sum;
736736

737-
uint32_t opa_speed_pct = (fps_opa_unweighted * 100) / fps_normal_unweighted;
737+
uint32_t opa_speed_pct = (fps_opa_unweighted * 100) / fps_normal_unweighted;
738738

739739
lv_obj_clean(lv_scr_act());
740740
scene_bg = NULL;

demos/music/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ The music player demo shows what kind of modern, smartphone-like user interfaces
1717
- Zoom the album cover proportionality to the current bass value
1818
- Display the 4 bands on the left side of a circle by default at 0°, 45°, 90°, 135°
1919
- Add extra bars next to the "main bars" with a cosine shape. Add more bars for the lower bands.
20-
- 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°)
21-
- If there no bass add 1 to the offset of the bars (it creates a "walking" effect)
20+
- 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°)
21+
- If there is no bass, add 1 to the offset of the bars (it creates a "walking" effect)
2222
- Mirror the bars to the right side of the circle
2323

2424
## Using spectrum.py

demos/music/lv_demo_music_main.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ lv_obj_t * _lv_demo_music_main_create(lv_obj_t * parent)
226226

227227
start_anim = true;
228228

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

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

805805
uint32_t v = (r[k] * animv + r[j] * (amax - animv)) / amax;

demos/stress/lv_demo_stress.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ static void obj_test_task_cb(lv_timer_t * tmr)
281281
break;
282282

283283
case 18:
284-
obj = lv_list_create(main_page);
284+
obj = lv_list_create(main_page);
285285
{
286286
lv_obj_t * b;
287287
b = lv_list_add_btn(obj, LV_SYMBOL_OK, "1. Some very long text to scroll");

demos/widgets/lv_demo_widgets.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -101,36 +101,36 @@ void lv_demo_widgets(void)
101101
if(disp_size == DISP_LARGE) {
102102
tab_h = 70;
103103
#if LV_FONT_MONTSERRAT_24
104-
font_large = &lv_font_montserrat_24;
104+
font_large = &lv_font_montserrat_24;
105105
#else
106106
LV_LOG_WARN("LV_FONT_MONTSERRAT_24 is not enabled for the widgets demo. Using LV_FONT_DEFAULT instead.");
107107
#endif
108108
#if LV_FONT_MONTSERRAT_16
109-
font_normal = &lv_font_montserrat_16;
109+
font_normal = &lv_font_montserrat_16;
110110
#else
111111
LV_LOG_WARN("LV_FONT_MONTSERRAT_16 is not enabled for the widgets demo. Using LV_FONT_DEFAULT instead.");
112112
#endif
113113
} else if(disp_size == DISP_MEDIUM) {
114114
tab_h = 45;
115115
#if LV_FONT_MONTSERRAT_20
116-
font_large = &lv_font_montserrat_20;
116+
font_large = &lv_font_montserrat_20;
117117
#else
118118
LV_LOG_WARN("LV_FONT_MONTSERRAT_20 is not enabled for the widgets demo. Using LV_FONT_DEFAULT instead.");
119119
#endif
120120
#if LV_FONT_MONTSERRAT_14
121-
font_normal = &lv_font_montserrat_14;
121+
font_normal = &lv_font_montserrat_14;
122122
#else
123123
LV_LOG_WARN("LV_FONT_MONTSERRAT_14 is not enabled for the widgets demo. Using LV_FONT_DEFAULT instead.");
124124
#endif
125125
} else { /* disp_size == DISP_SMALL */
126126
tab_h = 45;
127127
#if LV_FONT_MONTSERRAT_18
128-
font_large = &lv_font_montserrat_18;
128+
font_large = &lv_font_montserrat_18;
129129
#else
130130
LV_LOG_WARN("LV_FONT_MONTSERRAT_18 is not enabled for the widgets demo. Using LV_FONT_DEFAULT instead.");
131131
#endif
132132
#if LV_FONT_MONTSERRAT_12
133-
font_normal = &lv_font_montserrat_12;
133+
font_normal = &lv_font_montserrat_12;
134134
#else
135135
LV_LOG_WARN("LV_FONT_MONTSERRAT_12 is not enabled for the widgets demo. Using LV_FONT_DEFAULT instead.");
136136
#endif
@@ -1058,7 +1058,7 @@ static void color_event_cb(lv_event_t * e)
10581058
}
10591059
else if(code == LV_EVENT_CLICKED) {
10601060
lv_palette_t * palette_primary = lv_event_get_user_data(e);
1061-
lv_palette_t palette_secondary = (*palette_primary) + 3; /*Use an other palette as secondary*/
1061+
lv_palette_t palette_secondary = (*palette_primary) + 3; /*Use another palette as secondary*/
10621062
if(palette_secondary >= _LV_PALETTE_LAST) palette_secondary = 0;
10631063

10641064
lv_theme_default_init(NULL, lv_palette_main(*palette_primary), lv_palette_main(palette_secondary), LV_THEME_DEFAULT_DARK, font_normal);

demos/widgets/lv_demo_widgets.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ def gauge_anim(a,gauge,val):
9191
def bar_anim(task,bar):
9292
val = bar.get_value()
9393
# print("bar value: ",val)
94-
max_value = bar.get_max_value()
94+
max_value = bar.get_max_value()
9595
val += 1
9696
if val > max_value:
9797
val=0
@@ -148,7 +148,7 @@ def controls_create(parent):
148148
h.set_style_local_value_str(lv.cont.PART.MAIN, lv.STATE.DEFAULT, "Basics")
149149

150150
disp_size = display.get_size_category()
151-
if disp_size <= lv.DISP_SIZE.SMALL:
151+
if disp_size <= lv.DISP_SIZE.SMALL:
152152
grid_w= lv.page.get_width_grid(lv.page.__cast__(parent),1,1)
153153
# print("grid_w: ",grid_w)
154154
else:
@@ -338,7 +338,7 @@ def visuals_create(parent):
338338
if grid_w_meter < meter_h:
339339
meter_size = grid_w_meter
340340
else:
341-
meter_size = meter_h
341+
meter_size = meter_h
342342

343343
lmeter = lv.linemeter(parent, None)
344344
lmeter.set_drag_parent(True)

0 commit comments

Comments
 (0)