Skip to content

Commit 7a9150f

Browse files
committed
update build to use new versions of micropython, lvgl and esp-idf
1 parent 8464258 commit 7a9150f

File tree

3 files changed

+118
-25
lines changed

3 files changed

+118
-25
lines changed

.gitignore

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
# Byte-compiled / optimized / DLL files
2+
__pycache__/
3+
*.py[cod]
4+
*$py.class
5+
6+
# C extensions
7+
*.so
8+
9+
# Distribution / packaging
10+
.Python
11+
build/
12+
develop-eggs/
13+
dist/
14+
downloads/
15+
eggs/
16+
.eggs/
17+
parts/
18+
sdist/
19+
var/
20+
wheels/
21+
share/python-wheels/
22+
*.egg-info/
23+
.installed.cfg
24+
*.egg
25+
MANIFEST
26+
27+
# Installer logs
28+
pip-log.txt
29+
pip-delete-this-directory.txt
30+
31+
# Unit test / coverage reports
32+
htmlcov/
33+
.tox/
34+
.nox/
35+
.coverage
36+
.coverage.*
37+
.cache
38+
nosetests.xml
39+
coverage.xml
40+
*.cover
41+
*.py,cover
42+
.hypothesis/
43+
.pytest_cache/
44+
cover/
45+
46+
# Sphinx documentation
47+
docs/_build/
48+
49+
# pyenv
50+
# For a library or package, you might want to ignore these files since the code is
51+
# intended to run in multiple environments; otherwise, check them in:
52+
# .python-version
53+
54+
# pipenv
55+
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
56+
# However, in case of collaboration, if having platform-specific dependencies or dependencies
57+
# having no cross-platform support, pipenv may install dependencies that don't work, or not
58+
# install all needed dependencies.
59+
#Pipfile.lock
60+
61+
# poetry
62+
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
63+
# This is especially recommended for binary packages to ensure reproducibility, and is more
64+
# commonly ignored for libraries.
65+
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
66+
#poetry.lock
67+
68+
# pdm
69+
# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
70+
#pdm.lock
71+
# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
72+
# in version control.
73+
# https://pdm.fming.dev/latest/usage/project/#working-with-version-control
74+
.pdm.toml
75+
.pdm-python
76+
.pdm-build/
77+
78+
# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
79+
__pypackages__/
80+
81+
# Environments
82+
.env
83+
.venv
84+
env/
85+
venv/
86+
ENV/
87+
env.bak/
88+
venv.bak/
89+
90+
# mypy
91+
.mypy_cache/
92+
.dmypy.json
93+
dmypy.json
94+
95+
# Pyre type checker
96+
.pyre/
97+
98+
# pytype static type analyzer
99+
.pytype/
100+
101+
# Cython debug symbols
102+
cython_debug/
103+
104+
# PyCharm
105+
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
106+
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
107+
# and can be added to the global gitignore or merged into this file. For a more nuclear
108+
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
109+
.idea/

builder/__init__.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,6 @@ def get_lvgl():
203203
if result != 0:
204204
sys.exit(result)
205205

206-
cmd_ = ['cd lib/lvgl && git checkout master']
207-
208-
spawn(cmd_, out_to_screen=False)
209-
210206

211207
def get_micropython():
212208

@@ -223,10 +219,6 @@ def get_micropython():
223219
if result != 0:
224220
sys.exit(result)
225221

226-
cmd_ = ['cd lib/micropython && git checkout v1.23.0']
227-
228-
spawn(cmd_, out_to_screen=False)
229-
230222

231223
def get_pycparser():
232224
cmd_ = [

builder/esp32.py

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ def setup_idf_environ():
431431

432432
idf_ver = get_idf_version()
433433

434-
if idf_ver is None or idf_ver != '5.0.4':
434+
if idf_ver is None or idf_ver != '5.2.1':
435435
idf_path = 'lib/esp-idf'
436436

437437
if os.path.exists(os.path.join(idf_path, 'export.sh')):
@@ -530,12 +530,12 @@ def setup_idf_environ():
530530

531531
args = " ".join(args)
532532

533-
print('ESP-IDF version 5.0.4 is needed to compile')
533+
print('ESP-IDF version 5.2.1 is needed to compile')
534534
print('Please rerun the build using the command below...')
535535
print(f'"{sys.executable} {args}"')
536536
raise RuntimeError
537537

538-
elif idf_ver is not None and idf_ver == '5.0.4':
538+
elif idf_ver is not None and idf_ver == '5.2.1':
539539
env = os.environ
540540

541541
else:
@@ -563,10 +563,10 @@ def submodules():
563563
if not sys.platform.startswith('win'):
564564
idf_ver = get_idf_version()
565565

566-
if idf_ver is None or idf_ver != '5.0.4':
566+
if idf_ver is None or idf_ver != '5.2.1':
567567
idf_path = 'lib/esp-idf'
568568
if not os.path.exists(os.path.join(idf_path, 'export.sh')):
569-
print('collecting ESP-IDF v5.0.4')
569+
print('collecting ESP-IDF v5.2.1')
570570
print('this might take a bit...')
571571
print()
572572
get_espidf()
@@ -575,18 +575,10 @@ def submodules():
575575
cmds = [
576576
[f'export "IDF_PATH={os.path.abspath(idf_path)}"'],
577577
['cd', idf_path],
578-
[
579-
'git', 'submodule', 'update', '--init',
580-
'components/bt/host/nimble/nimble',
581-
'components/esp_wifi',
582-
'components/esptool_py/esptool',
583-
'components/lwip/lwip',
584-
'components/mbedtls/mbedtls',
585-
'components/bt/controller/lib_esp32',
586-
'components/bt/controller/lib_esp32c3_family'
587-
], ['./install.sh', 'all']]
588-
589-
print('setting up ESP-IDF v5.0.4')
578+
['./install.sh', 'all']
579+
]
580+
581+
print('setting up ESP-IDF v5.2.1')
590582
print('this might take a bit...')
591583
print()
592584

0 commit comments

Comments
 (0)