Skip to content

Commit 2e0dbf4

Browse files
finger563finger563
committed
update to latest
1 parent 11974b5 commit 2e0dbf4

File tree

6 files changed

+91
-64
lines changed

6 files changed

+91
-64
lines changed

‎.github/workflows/build.yml‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,17 @@ jobs:
77

88
runs-on: ubuntu-latest
99

10+
strategy:
11+
matrix:
12+
build:
13+
- path: '.'
14+
target: esp32s3
15+
command: |
16+
idf.py -DSDKCONFIG_DEFAULTS="sdkconfig.defaults;sdkconfig.test_stand" build
17+
- path: '.'
18+
target: esp32s3
19+
command: |
20+
idf.py -DSDKCONFIG_DEFAULTS="sdkconfig.defaults;sdkconfig.motorgo" build
1021
steps:
1122
- name: Checkout repo
1223
uses: actions/checkout@v4
@@ -15,5 +26,6 @@ jobs:
1526
uses: espressif/esp-idf-ci-action@v1
1627
with:
1728
esp_idf_version: release-v5.4
18-
target: esp32s3
19-
path: '.'
29+
target: ${{ matrix.build.target }}
30+
path: ${{ matrix.build.path }}
31+
command: ${{ matrix.build.command }}

‎.github/workflows/package_main.yml‎

Lines changed: 29 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,19 @@ jobs:
1313
runs-on: ubuntu-latest
1414
continue-on-error: false
1515

16-
outputs:
17-
zipfile-id: ${{ steps.zip_step.outputs.artifact-id }}
16+
strategy:
17+
matrix:
18+
build:
19+
- name: 'tinys3_test_stand'
20+
path: '.'
21+
target: esp32s3
22+
command: |
23+
idf.py -DSDKCONFIG_DEFAULTS="sdkconfig.defaults;sdkconfig.test_stand" build
24+
- name: 'motorgo'
25+
path: '.'
26+
target: esp32s3
27+
command: |
28+
idf.py -DSDKCONFIG_DEFAULTS="sdkconfig.defaults;sdkconfig.motorgo" build
1829
1930
steps:
2031
- name: Checkout repo
@@ -24,15 +35,14 @@ jobs:
2435
uses: espressif/esp-idf-ci-action@v1
2536
with:
2637
esp_idf_version: release-v5.4
27-
target: esp32s3
28-
path: '.'
29-
command: 'idf.py build'
38+
target: ${{ matrix.build.target }}
39+
path: ${{ matrix.build.path }}
40+
command: ${{ matrix.build.command }}
3041

3142
- name: Upload Build Outputs
3243
uses: actions/upload-artifact@v4
33-
id: zip_step
3444
with:
35-
name: build-artifacts
45+
name: ${{ matrix.build.name }}-build-artifacts
3646
path: |
3747
build/*.bin
3848
build/*.elf
@@ -41,27 +51,30 @@ jobs:
4151
build/flasher_args.json
4252
build/flash_args
4353
54+
- name: Zip up files for upload to release
55+
if: ${{ github.event.release && github.event.action == 'published' }}
56+
shell: bash
57+
run: |
58+
cd build
59+
zip -r ../${{ matrix.build.name }}.zip *.bin *.elf bootloader/bootloader.bin partition_table/partition-table.bin flasher_args.json flash_args
60+
cd ..
61+
4462
- name: Attach files to release
4563
uses: softprops/action-gh-release@v2
4664
if: ${{ github.event.release && github.event.action == 'published' }}
4765
with:
48-
files: |
49-
build/*.bin
50-
build/*.elf
51-
build/bootloader/bootloader.bin
52-
build/partition_table/partition-table.bin
53-
build/flasher_args.json
54-
build/flash_args
66+
files: ${{ matrix.build.name }}.zip
5567

5668
package:
5769
name: Package the binaries into an executables for Windows, MacOS, and Linux (Ubuntu)
5870
needs: build
5971
strategy:
6072
matrix:
6173
os: [windows-latest, macos-latest, ubuntu-latest]
74+
build: ['tinys3_test_stand', 'motorgo']
6275
runs-on: ${{ matrix.os }}
6376
steps:
6477
- uses: esp-cpp/esp-packaged-programmer-action@v1.0.5
6578
with:
66-
zipfile-id: ${{ needs.build.outputs.zipfile-id }}
67-
programmer-name: 'software-defined-haptics_programmer'
79+
zipfile-name: ${{ matrix.build }}-build-artifacts
80+
programmer-name: 'software-defined-haptics-${{ matrix.build }}_programmer'

‎dependencies.lock‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies:
22
espp/adc:
3-
component_hash: 9ecf3ca01f12761cb8e0df9d26b97eadd49d5dec9ccf73913ee73c531b4b544d
3+
component_hash: ddc044e9e275a773438d04a268e83e2d2c3ad13610b46815ff8dffec9128db99
44
dependencies:
55
- name: espp/base_component
66
registry_url: https://components.espressif.com
@@ -16,9 +16,9 @@ dependencies:
1616
source:
1717
registry_url: https://components.espressif.com
1818
type: service
19-
version: 1.0.3
19+
version: 1.0.4
2020
espp/base_component:
21-
component_hash: 141149e8a257c6e31ccf0e150634102761134766d13c8d88c163d570b98f0986
21+
component_hash: a9d22731af1f5ba1a4e964580adf80aa4df396ab1aba84fe86f42e78e09382d0
2222
dependencies:
2323
- name: espp/logger
2424
registry_url: https://components.espressif.com
@@ -30,9 +30,9 @@ dependencies:
3030
source:
3131
registry_url: https://components.espressif.com
3232
type: service
33-
version: 1.0.3
33+
version: 1.0.4
3434
espp/base_peripheral:
35-
component_hash: e5825b34b7eb62338c4055e564bd9c09d52ad1d952499200a79f5446c7969e6c
35+
component_hash: 176d533324b5b6751f9d61b395ea15514afa155d0621e97c6ff12841dd5dab16
3636
dependencies:
3737
- name: espp/base_component
3838
registry_url: https://components.espressif.com
@@ -44,9 +44,9 @@ dependencies:
4444
source:
4545
registry_url: https://components.espressif.com
4646
type: service
47-
version: 1.0.3
47+
version: 1.0.4
4848
espp/bldc_driver:
49-
component_hash: 17cf765d3d1178d04e0111ad87d907b121ba8702eb11a98a7049b27dbbaa2ca0
49+
component_hash: f8463ed4ddb86943bbfdfd23435220a10e1aae23566c6a667208eb38e8506348
5050
dependencies:
5151
- name: espp/base_component
5252
registry_url: https://components.espressif.com
@@ -58,9 +58,9 @@ dependencies:
5858
source:
5959
registry_url: https://components.espressif.com/
6060
type: service
61-
version: 1.0.3
61+
version: 1.0.4
6262
espp/bldc_haptics:
63-
component_hash: fcb7cd21473ee453d36f33c13089a11ca94b4dbec69f2107653ea0fea6433560
63+
component_hash: ef524abc695252b2a788aaf9cbc89418e8c32d5caf1e4b3e207e0677b09c088b
6464
dependencies:
6565
- name: espp/base_component
6666
registry_url: https://components.espressif.com
@@ -88,10 +88,13 @@ dependencies:
8888
source:
8989
registry_url: https://components.espressif.com/
9090
type: service
91-
version: 1.0.3
91+
version: 1.0.4
9292
espp/bldc_motor:
93-
component_hash: ee0abfb7524d26a6115fe9f056d5270e80e2d843103e0812ef70be00c74151fa
93+
component_hash: 6e393066b9eb8b5d3698c570a5db57bf3e80cb64fff129fe677f2d20c726482d
9494
dependencies:
95+
- name: idf
96+
require: private
97+
version: '>=5.0'
9598
- name: espp/base_component
9699
registry_url: https://components.espressif.com
97100
require: private
@@ -108,15 +111,12 @@ dependencies:
108111
registry_url: https://components.espressif.com
109112
require: private
110113
version: '>=1.0'
111-
- name: idf
112-
require: private
113-
version: '>=5.0'
114114
source:
115115
registry_url: https://components.espressif.com/
116116
type: service
117-
version: 1.0.3
117+
version: 1.0.4
118118
espp/cli:
119-
component_hash: 892c256965ddfc6b915211ae27de02dc22819214b97c0f8022e45e81859cf097
119+
component_hash: b8f300efa46d6a8c2ff9332f94f2fa283605c34f4f7f4da9c5c8dd2b5f669ef5
120120
dependencies:
121121
- name: espp/logger
122122
registry_url: https://components.espressif.com
@@ -128,9 +128,9 @@ dependencies:
128128
source:
129129
registry_url: https://components.espressif.com/
130130
type: service
131-
version: 1.0.3
131+
version: 1.0.4
132132
espp/filters:
133-
component_hash: 69b767f200f6cb491ec47c2e5f65ea46614f2fdaedf5dbae25ef52d702915219
133+
component_hash: 27b6e084aae69247090ce9e904ea218a2f15afefe186ef0eae60c25dd1950e12
134134
dependencies:
135135
- name: espp/format
136136
registry_url: https://components.espressif.com
@@ -150,19 +150,19 @@ dependencies:
150150
source:
151151
registry_url: https://components.espressif.com/
152152
type: service
153-
version: 1.0.3
153+
version: 1.0.4
154154
espp/format:
155-
component_hash: 14d8a6baef3b4cf6b42542c8ccfd74353d31318e0e806ad0ccc6fb5f4cae3edd
155+
component_hash: 3581dbbae616c2641a45037f2f844c31e7d05352339783ac06cadcb0b53d1403
156156
dependencies:
157157
- name: idf
158158
require: private
159159
version: '>=5.0'
160160
source:
161161
registry_url: https://components.espressif.com
162162
type: service
163-
version: 1.0.3
163+
version: 1.0.4
164164
espp/i2c:
165-
component_hash: 46130714e24081995710184c6090fe2b92c2343c9cc458248f72d77c525ba92f
165+
component_hash: 235600292e09c9f4a1d313d7e0ae4304d9d6ca2753bac001bb5ff26936609b72
166166
dependencies:
167167
- name: espp/base_component
168168
registry_url: https://components.espressif.com
@@ -182,27 +182,27 @@ dependencies:
182182
source:
183183
registry_url: https://components.espressif.com/
184184
type: service
185-
version: 1.0.3
185+
version: 1.0.4
186186
espp/interrupt:
187-
component_hash: 611f0e317489b16c0ea03517a307237377e1b2f682eb89244fbe1b7b739bbb71
187+
component_hash: 1ef551d0f7de1b6196e6277ca7a3fd8eaf5e513608e7a76cb50acaed5aac02f1
188188
dependencies:
189-
- name: espp/base_component
190-
registry_url: https://components.espressif.com
191-
require: private
192-
version: '>=1.0'
193189
- name: espp/task
194190
registry_url: https://components.espressif.com
195191
require: private
196192
version: '>=1.0'
197193
- name: idf
198194
require: private
199195
version: '>=5.0'
196+
- name: espp/base_component
197+
registry_url: https://components.espressif.com
198+
require: private
199+
version: '>=1.0'
200200
source:
201201
registry_url: https://components.espressif.com
202202
type: service
203-
version: 1.0.3
203+
version: 1.0.4
204204
espp/led:
205-
component_hash: e4840c8c0609d256f7ca8a3c79c9b12f0b7b5e9fa92333ce56ca78bb7ad867de
205+
component_hash: b8856570ddf1cc93f7b96904a0e30169478e9ce9d9cdf6705e85ecd46dba2b96
206206
dependencies:
207207
- name: espp/base_component
208208
registry_url: https://components.espressif.com
@@ -218,9 +218,9 @@ dependencies:
218218
source:
219219
registry_url: https://components.espressif.com
220220
type: service
221-
version: 1.0.3
221+
version: 1.0.4
222222
espp/logger:
223-
component_hash: fdd66656ae46ca690bf3750626d26221fc2b63f1b1ed768ce1ba9fb3be712821
223+
component_hash: 493f2c761f562e2cb2b601263871dc3b67a492758f085444dbf2736d6ebc1c7f
224224
dependencies:
225225
- name: espp/format
226226
registry_url: https://components.espressif.com
@@ -232,9 +232,9 @@ dependencies:
232232
source:
233233
registry_url: https://components.espressif.com
234234
type: service
235-
version: 1.0.3
235+
version: 1.0.4
236236
espp/math:
237-
component_hash: 389ddc4444dbe4604fb80a8635c289d925b28b722da3112c7bfad84dc5dbd053
237+
component_hash: b4e997b1d080c696bbb83e4c984aca2a0f8e9d3bf63d9577baf60e528ff8686d
238238
dependencies:
239239
- name: espp/format
240240
registry_url: https://components.espressif.com
@@ -246,9 +246,9 @@ dependencies:
246246
source:
247247
registry_url: https://components.espressif.com/
248248
type: service
249-
version: 1.0.3
249+
version: 1.0.4
250250
espp/motorgo-mini:
251-
component_hash: 879078898b5d415bcb4e8d6c05223abf0ed45474f61af639b2dfbb8f3ae64f67
251+
component_hash: 70af02ad21b93e8160d759cbd824efdf9022790406f22ae3f2e03bca1772962c
252252
dependencies:
253253
- name: espp/adc
254254
registry_url: https://components.espressif.com
@@ -304,9 +304,9 @@ dependencies:
304304
source:
305305
registry_url: https://components.espressif.com/
306306
type: service
307-
version: 1.0.3
307+
version: 1.0.4
308308
espp/mt6701:
309-
component_hash: e36f9fd2f10fc02c8f0502c155b34537e240c11f35c888df83ad19f8f47b968f
309+
component_hash: 62a3cda844e08f7d62e92d5db380b4980182965b6a4f6e3e72a515d5230f1141
310310
dependencies:
311311
- name: espp/base_peripheral
312312
registry_url: https://components.espressif.com
@@ -322,9 +322,9 @@ dependencies:
322322
source:
323323
registry_url: https://components.espressif.com/
324324
type: service
325-
version: 1.0.3
325+
version: 1.0.4
326326
espp/pid:
327-
component_hash: 8d7915a9c1fb36fe9ad69e72acfc7741f6124caf89c9646b2f6202eef4e1887a
327+
component_hash: 6b2f5e3a5f424499ed85b65ea235d544e6963d20dcf3581096e4a9c0ed90cc52
328328
dependencies:
329329
- name: espp/base_component
330330
registry_url: https://components.espressif.com
@@ -336,9 +336,9 @@ dependencies:
336336
source:
337337
registry_url: https://components.espressif.com/
338338
type: service
339-
version: 1.0.3
339+
version: 1.0.4
340340
espp/task:
341-
component_hash: ccc71fb2b265a9f0ca719fd562e6a6380473db2e5fed531d9ab46daa82434b52
341+
component_hash: 87ee9724c85f353cdfdc8420c63b3c7d03852084adf2bd842f45308ab805e932
342342
dependencies:
343343
- name: espp/base_component
344344
registry_url: https://components.espressif.com
@@ -350,9 +350,9 @@ dependencies:
350350
source:
351351
registry_url: https://components.espressif.com
352352
type: service
353-
version: 1.0.3
353+
version: 1.0.4
354354
espp/timer:
355-
component_hash: e8e55d3e2ed5f7d3a8cb0582323700316be8b2cbe50eec863da9f1b5ed655c5b
355+
component_hash: 655bf9f6ec6209c5a62f293246b5e17d9db89787f78e33468a30f3ba941a8cf7
356356
dependencies:
357357
- name: espp/task
358358
registry_url: https://components.espressif.com
@@ -364,7 +364,7 @@ dependencies:
364364
source:
365365
registry_url: https://components.espressif.com
366366
type: service
367-
version: 1.0.3
367+
version: 1.0.4
368368
espressif/esp-dsp:
369369
component_hash: ccfd6c9a7799cf66ee044d0239a0e9304431564495d80b3230083c58291a2a23
370370
dependencies:

‎main/main.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ extern "C" void app_main(void) {
3333
#error "No hardware configuration selected"
3434
#endif
3535

36-
auto haptic_motor = BldcHaptics(BldcHaptics::Config{.motor = *motor,
36+
auto haptic_motor = BldcHaptics(BldcHaptics::Config{.motor = motor,
3737
.kp_factor = 2,
3838
.kd_factor_min = 0.01,
3939
.kd_factor_max = 0.04,

‎sdkconfig.motorgo‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
CONFIG_EXAMPLE_HARDWARE_MOTORGO_MINI=y

‎sdkconfig.test_stand‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
CONFIG_EXAMPLE_HARDWARE_TEST_STAND=y

0 commit comments

Comments
 (0)