Skip to content

Commit 76fd15b

Browse files
committed
chore: Update to latest espp, use idf-component-manager
1 parent 4defd06 commit 76fd15b

File tree

14 files changed

+656
-113
lines changed

14 files changed

+656
-113
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: release-v5.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,44 +5,63 @@ 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
1721
uses: actions/checkout@v4
18-
with:
19-
submodules: 'recursive'
2022

2123
- name: Build Main Code
2224
uses: espressif/esp-idf-ci-action@v1
2325
with:
24-
esp_idf_version: release-v5.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/bldc_test_stand.bin
41+
build/flasher_args.json
3742
build/flash_args
3843
3944
- name: Attach files to release
4045
uses: softprops/action-gh-release@v2
4146
if: ${{ github.event.release && github.event.action == 'published' }}
4247
with:
4348
files: |
44-
build/bldc_test_stand.bin
49+
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/esp-packaged-programmer-action@v1.0.5
65+
with:
66+
zipfile-id: ${{ needs.build.outputs.zipfile-id }}
67+
programmer-name: 'software-defined-haptics_programmer'

.github/workflows/static_analysis.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,15 @@ 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
1715
with:
1816
# Do not build the project and do not use cmake to generate compile_commands.json
1917
use_cmake: false
2018

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

2422
# (Optional) cppcheck args
25-
cppcheck_args: -i$GITHUB_WORKSPACE/components/espp --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 & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +0,0 @@
1-
[submodule "components/espp"]
2-
path = components/espp
3-
url = git@github.com:esp-cpp/espp

CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +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/"
1110
)
1211

1312
set(

components/espp

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
idf_component_register(
22
INCLUDE_DIRS "include"
3+
SRC_DIRS "src"
34
REQUIRES base_component filters math mt6701 pid bldc_driver bldc_motor i2c
45
)
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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/filters: '>=1.0'
18+
espp/math: '>=1.0'
19+
espp/mt6701: '>=1.0'
20+
espp/pid: '>=1.0'
21+
espp/bldc_driver: '>=1.0'
22+
espp/bldc_motor: '>=1.0'
23+
espp/i2c: '>=1.0'

0 commit comments

Comments
 (0)