Skip to content

Commit 311e751

Browse files
authored
Merge pull request #213 from lvgl-micropython/test_updating_lvgl
updating lvgl
2 parents 80d88cc + a4ee6df commit 311e751

File tree

6 files changed

+15
-5
lines changed

6 files changed

+15
-5
lines changed

.github/workflows/macOS.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ jobs:
2222
run: |
2323
brew install --force ninja
2424
brew install --force sdl2
25+
brew install --force doxygen
2526
git submodule update --init -- lib/pycparser
2627
git submodule update --init --jobs 4 -- lib/micropython
2728
git submodule update --init --jobs 4 -- lib/lvgl

.github/workflows/unix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
- name: Install Deps
2626
run: |
27-
sudo apt-get update && sudo apt-get install --assume-yes --allow-downgrades --allow-remove-essential --allow-change-held-packages build-essential pkg-config cmake ninja-build libffi-dev gnome-desktop-testing libasound2-dev libpulse-dev libaudio-dev libjack-dev libsndio-dev libx11-dev libxext-dev libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev libxss-dev libxkbcommon-dev libdrm-dev libgbm-dev libgl1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev fcitx-libs-dev libpipewire-0.3-dev libwayland-dev libdecor-0-dev ccache
27+
sudo apt-get update && sudo apt-get install --assume-yes --allow-downgrades --allow-remove-essential --allow-change-held-packages build-essential pkg-config cmake ninja-build libffi-dev gnome-desktop-testing libasound2-dev libpulse-dev libaudio-dev libjack-dev libsndio-dev libx11-dev libxext-dev libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev libxss-dev libxkbcommon-dev libdrm-dev libgbm-dev libgl1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev fcitx-libs-dev libpipewire-0.3-dev libwayland-dev libdecor-0-dev doxygen ccache
2828
git submodule update --init -- lib/pycparser
2929
git submodule update --init --jobs 4 -- lib/micropython
3030
git submodule update --init --jobs 4 -- lib/lvgl

.gitmodules

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
[submodule "lib/micropython"]
88
path = lib/micropython
99
url = https://github.com/micropython/micropython
10-
[submodule "lib/lvgl"]
11-
path = lib/lvgl
12-
url = https://github.com/lvgl/lvgl
1310
[submodule "lib/esp-idf"]
1411
path = lib/esp-idf
1512
url = https://github.com/espressif/esp-idf
13+
[submodule "lib/lvgl"]
14+
path = lib/lvgl
15+
url = https://github.com/lvgl/lvgl

README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,12 +164,14 @@ To compile you will need Python >= 3.10 for for all build types.
164164
* ninja-build
165165
* python
166166
* libusb-1.0-0-dev
167+
* doxygen
167168

168169
* macOS
169170
* `xcode-select -–install`
170171
* `brew install cmake`
171172
* `brew install ninja`
172173
* `brew install python`
174+
* `brew install doxygen`
173175

174176

175177
#### Compiling for RP2:
@@ -181,6 +183,7 @@ To compile you will need Python >= 3.10 for for all build types.
181183
* python
182184
* gcc-arm-none-eabi
183185
* libnewlib-arm-none-eabi
186+
* doxygen
184187

185188
* macOS
186189
* `command xcode-select–install`
@@ -189,6 +192,7 @@ To compile you will need Python >= 3.10 for for all build types.
189192
* `brew install ninja`
190193
* `brew install python`
191194
* `brew install armmbed/formulae/arm-none-eabi-gcc`
195+
* `brew install doxygen`
192196

193197
* Windows
194198
* Not yet supported
@@ -202,13 +206,15 @@ To compile you will need Python >= 3.10 for for all build types.
202206
* build-essential
203207
* ninja-build
204208
* python
209+
* doxygen
205210

206211
* macOS
207212
* `command xcode-select–install`
208213
* `brew install make`
209214
* `brew install ninja`
210215
* `brew install python`
211216
* `brew install armmbed/formulae/arm-none-eabi-gcc`
217+
* `brew install doxygen`
212218

213219
* Windows
214220
* Not yet supported
@@ -249,6 +255,7 @@ To compile you will need Python >= 3.10 for for all build types.
249255
* libpipewire-0.3-dev
250256
* libwayland-dev
251257
* libdecor-0-dev
258+
* doxygen
252259

253260

254261
#### Compiling for macOS:
@@ -258,6 +265,7 @@ To compile you will need Python >= 3.10 for for all build types.
258265
* `brew install ninja`
259266
* `brew install make`
260267
* `brew install SDL2`
268+
* `brew install doxygen`
261269

262270

263271
#### Compiling for Windows:

gen/python_api_gen_mpy.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
# - Implement inheritance instead of embed base methods (how? seems it's not supported, see https://github.com/micropython/micropython/issues/1159)
88
# - When converting mp to ptr (and vice versa), verify that types are compatible. Now all pointers are casted to void*.
99

10+
1011
import collections
1112
import copy
1213
import functools

lib/lvgl

Submodule lvgl updated 1946 files

0 commit comments

Comments
 (0)