Skip to content

Commit a60101a

Browse files
authored
chore: Update ESPP to 1.0 and LVGL to 9.2.2. Remove submodules (#8)
* feat: Update ESPP / LVGL * remove unused variable * add dep lock * update workflows * update readme * fix sa * use release-v5.4 instead of v5.4
1 parent caa35a7 commit a60101a

21 files changed

+691
-106
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,10 @@ jobs:
1010
steps:
1111
- name: Checkout repo
1212
uses: actions/checkout@v4
13-
with:
14-
submodules: 'recursive'
1513

1614
- name: Build Examples
1715
uses: espressif/esp-idf-ci-action@v1
1816
with:
19-
esp_idf_version: v5.2.2
17+
esp_idf_version: release-v5.4
2018
target: esp32s3
2119
path: '.'

.github/workflows/package_main.yml

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,35 +5,40 @@ on:
55
branches: [main]
66
release:
77
types: [published]
8+
workflow_dispatch:
89

910
jobs:
1011
build:
1112

1213
runs-on: ubuntu-latest
1314
continue-on-error: false
1415

16+
outputs:
17+
zipfile-id: ${{ steps.zip_step.outputs.artifact-id }}
18+
1519
steps:
1620
- name: Checkout repo
17-
uses: actions/checkout@v2
18-
with:
19-
submodules: 'recursive'
21+
uses: actions/checkout@v4
2022

2123
- name: Build Main Code
2224
uses: espressif/esp-idf-ci-action@v1
2325
with:
24-
esp_idf_version: v5.2.2
26+
esp_idf_version: release-v5.4
2527
target: esp32s3
2628
path: '.'
2729
command: 'idf.py build'
2830

2931
- name: Upload Build Outputs
3032
uses: actions/upload-artifact@v4
33+
id: zip_step
3134
with:
3235
name: build-artifacts
3336
path: |
37+
build/*.bin
38+
build/*.elf
3439
build/bootloader/bootloader.bin
3540
build/partition_table/partition-table.bin
36-
build/*.bin
41+
build/flasher_args.json
3742
build/flash_args
3843
3944
- name: Attach files to release
@@ -42,7 +47,21 @@ jobs:
4247
with:
4348
files: |
4449
build/*.bin
50+
build/*.elf
4551
build/bootloader/bootloader.bin
4652
build/partition_table/partition-table.bin
53+
build/flasher_args.json
4754
build/flash_args
4855
56+
package:
57+
name: Package the binaries into an executables for Windows, MacOS, and Linux (Ubuntu)
58+
needs: build
59+
strategy:
60+
matrix:
61+
os: [windows-latest, macos-latest, ubuntu-latest]
62+
runs-on: ${{ matrix.os }}
63+
steps:
64+
- uses: esp-cpp/[email protected]
65+
with:
66+
zipfile-id: ${{ needs.build.outputs.zipfile-id }}
67+
programmer-name: 'wireless-debug-display_programmer'

.github/workflows/static_analysis.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ jobs:
99
steps:
1010
- name: Checkout repo
1111
uses: actions/checkout@v4
12-
with:
13-
submodules: 'recursive'
1412

1513
- name: Run static analysis
1614
uses: esp-cpp/StaticAnalysis@master
@@ -19,7 +17,7 @@ jobs:
1917
use_cmake: false
2018

2119
# Use the 5.2 release version since it's what we build with
22-
esp_idf_version: release/v5.2
20+
esp_idf_version: release/v5.4
2321

2422
# (Optional) cppcheck args
25-
cppcheck_args: -i$GITHUB_WORKSPACE/components/espp -i$GITHUB_WORKSPACE/components/esp-protocols --force --enable=all --inline-suppr --inconclusive --platform=mips32 --std=c++17 --suppressions-list=$GITHUB_WORKSPACE/suppressions.txt
23+
cppcheck_args: --check-level=exhaustive --force --enable=all --inline-suppr --inconclusive --platform=mips32 --std=c++17 --suppressions-list=$GITHUB_WORKSPACE/suppressions.txt

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,4 @@
3333
build/
3434
sdkconfig
3535
sdkconfig.old
36+
managed_components/

.gitmodules

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +0,0 @@
1-
[submodule "components/espp"]
2-
path = components/espp
3-
url = [email protected]:esp-cpp/espp
4-
[submodule "components/esp-protocols"]
5-
path = components/esp-protocols
6-
url = [email protected]:espressif/esp-protocols

CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
# The following lines of boilerplate have to be in your project's CMakeLists
22
# in this exact order for cmake to work correctly
3-
cmake_minimum_required(VERSION 3.5)
3+
cmake_minimum_required(VERSION 3.20)
44

55
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
66

77
# add the component directories that we want to use
88
set(EXTRA_COMPONENT_DIRS
99
"components/"
10-
"components/espp/components/"
11-
"components/esp-protocols/components"
1210
)
1311

1412
# set the hal component to use based on the target

README.md

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -97,22 +97,6 @@ All other text is treated as a log and written out to the log
9797
window. Note, we do not wrap lines, so any text that would go off the
9898
edge of the screen is simply not rendered.
9999

100-
## Cloning
101-
102-
Since this repo contains a submodule, you need to make sure you clone it
103-
recursively, e.g. with:
104-
105-
``` sh
106-
git clone --recurse-submodules <your repo name>
107-
```
108-
109-
Alternatively, you can always ensure the submodules are up to date after cloning
110-
(or if you forgot to clone recursively) by running:
111-
112-
``` sh
113-
git submodule update --init --recursive
114-
```
115-
116100
## Build and Flash
117101

118102
Build the project and flash it to the board, then run monitor tool to view serial output:

components/esp-protocols

Lines changed: 0 additions & 1 deletion
This file was deleted.

components/espp

Lines changed: 0 additions & 1 deletion
This file was deleted.

components/gui/idf_component.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
## IDF Component Manager Manifest File
2+
dependencies:
3+
## Required IDF version
4+
idf:
5+
version: '>=4.1.0'
6+
# # Put list of dependencies here
7+
# # For components maintained by Espressif:
8+
# component: "~1.0.0"
9+
# # For 3rd party components:
10+
# username/component: ">=1.0.0,<2.0.0"
11+
# username2/component2:
12+
# version: "~1.0.0"
13+
# # For transient dependencies `public` flag can be set.
14+
# # `public` flag doesn't have an effect dependencies of the `main` component.
15+
# # All dependencies of `main` are public by default.
16+
# public: true
17+
espp/task: '>=1.0'
18+
espp/display: '>=1.0'

0 commit comments

Comments
 (0)