Skip to content

Commit 6e15733

Browse files
committed
Merge branch 'upgrade-idf-mpy-develop-pandian' into develop
2 parents ab17d7e + b607e45 commit 6e15733

File tree

150 files changed

+820
-5590
lines changed

Some content is hidden

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

150 files changed

+820
-5590
lines changed

.github/workflows/nightly-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515
- uses: actions/[email protected]
1616
- name: Install packages
17-
run: source tools/ci.sh && ci_esp32_idf44_setup
17+
run: source tools/ci.sh && ci_esp32_idf504_setup
1818
- name: Build
1919
run: source tools/ci.sh && ci_esp32_nightly_build
2020
- name: Deliver AtomS3 firmware

.github/workflows/ports_m5stack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ jobs:
1818
steps:
1919
- uses: actions/[email protected]
2020
- name: Install packages
21-
run: source tools/ci.sh && ci_esp32_idf44_setup
21+
run: source tools/ci.sh && ci_esp32_idf504_setup
2222
- name: Build
2323
run: source tools/ci.sh && ci_esp32_build

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,4 @@ tools/littlefs/prebuilt/
5252

5353
dependencies.lock
5454
m5stack/.workenv
55+
managed_components/

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
```shell
88
mkdir uiflow_workspace && cd uiflow_workspace
99
git clone https://github.com/m5stack/esp-idf.git
10-
git -C esp-idf checkout 014ee65f1f5e291230e398c4913020be9a6278a1
10+
git -C esp-idf checkout 8fbf4ba6058bcf736317d8a7aa75d0578563c38b
1111
git -C esp-idf submodule update --init --recursive
1212
./esp-idf/install.sh
1313
. ./esp-idf/export.sh

docs/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# from the environment for the first two.
66
SPHINXOPTS ?=
77
SPHINXBUILD ?= sphinx-build
8-
SOURCEDIR = zh_CN
8+
SOURCEDIR = en
99
BUILDDIR = build/$(SOURCEDIR)
1010

1111
# Put it first so that "make" without argument is like "make help".

docs/en/COPYRIGHT.rst

Lines changed: 0 additions & 2 deletions
This file was deleted.

docs/en/conf.py

Lines changed: 0 additions & 79 deletions
This file was deleted.

docs/en/controllers/atoms3-lite.rst

Lines changed: 0 additions & 2 deletions
This file was deleted.

docs/en/controllers/atoms3.rst

Lines changed: 0 additions & 2 deletions
This file was deleted.

docs/en/controllers/atoms3u.rst

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)