Skip to content

Commit 56fb6e3

Browse files
xcguangxcguang
committed
Merge branch 'feat/add_esp32c61_support' into 'master'
feat(ESPAT-2418): Added esp32c61 support See merge request application/esp-at!1912
2 parents fe0f3fe + dc657c8 commit 56fb6e3

File tree

24 files changed

+546
-7
lines changed

24 files changed

+546
-7
lines changed

‎.github/workflows/build_template_esp32c61.yml‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
name: Reusable esp32c61-at workflow template
2+
3+
on:
4+
workflow_call:
5+
# parameters from upstream workflow
6+
inputs:
7+
module_name:
8+
required: true
9+
type: string
10+
artifacts_name:
11+
required: true
12+
type: string
13+
enable_at_debug:
14+
required: false
15+
type: boolean
16+
# parameters from upstream inherit
17+
secrets:
18+
ESP32C61_4MB_TOKEN:
19+
required: false
20+
21+
jobs:
22+
build-template-esp32c61:
23+
runs-on: ubuntu-latest
24+
env:
25+
PLATFORM: PLATFORM_ESP32C61
26+
MODULE_NAME: ${{ inputs.module_name }}
27+
SILENCE: 0
28+
steps:
29+
- uses: actions/[email protected]
30+
- uses: actions/[email protected]
31+
with:
32+
python-version: '3.10'
33+
- name: Set up environment variables
34+
run: |
35+
source .github/workflows/utils.sh && setup_env_variables
36+
- name: Enable AT debug log
37+
if: ${{ inputs.enable_at_debug == true }}
38+
run: |
39+
source .github/workflows/utils.sh && enable_at_debug
40+
- name: Enlarge app partition size
41+
if: ${{ inputs.enable_at_debug == true }}
42+
run: |
43+
source .github/workflows/utils.sh && enlarge_app_partition
44+
- name: Set up OTA tokens
45+
run: |
46+
cd components/at/private_include
47+
rm -f at_ota_token.h
48+
echo -e "#pragma once" >> at_ota_token.h
49+
echo -e "#define CONFIG_ESP_AT_OTA_TOKEN_ESP32C61_4MB \"${{ secrets.ESP32C61_4MB_TOKEN }}\"" >> at_ota_token.h
50+
echo -e "#define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32C61_4MB \"${{ secrets.ESP32C61_4MB_TOKEN }}\"" >> at_ota_token.h
51+
cd -
52+
- name: Install compilation environment
53+
run: |
54+
./build.py install
55+
- name: Compile
56+
run: |
57+
./build.py build
58+
- name: Upload artifacts
59+
uses: actions/[email protected]
60+
with:
61+
name: ${{ inputs.artifacts_name }}
62+
path: |
63+
sdkconfig
64+
build/*.bin
65+
build/*.elf
66+
build/*.map
67+
build/bootloader/*.bin
68+
build/partition_table/*.bin
69+
build/customized_partitions/*
70+
build/flasher_args.json
71+
build/project_description.json
72+
build/download.config
73+
build/factory/*

‎.github/workflows/main.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,21 @@ jobs:
215215
enable_at_debug: true
216216
secrets: inherit
217217

218+
build-esp32c61-4mb-at:
219+
uses: ./.github/workflows/build_template_esp32c61.yml
220+
with:
221+
module_name: ESP32C61-4MB
222+
artifacts_name: esp32c61-4MB-at
223+
secrets: inherit
224+
225+
build-esp32c61-4mb-debug-at:
226+
uses: ./.github/workflows/build_template_esp32c61.yml
227+
with:
228+
module_name: ESP32C61-4MB
229+
artifacts_name: esp32c61-4MB-debug-at
230+
enable_at_debug: true
231+
secrets: inherit
232+
218233
build-esp32s2-mini-at:
219234
uses: ./.github/workflows/build_template_esp32s2.yml
220235
with:

‎.gitlab-ci.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ include:
4242
- '.gitlab/ci/build_esp32c3.yml'
4343
- '.gitlab/ci/build_esp32c5.yml'
4444
- '.gitlab/ci/build_esp32c6.yml'
45+
- '.gitlab/ci/build_esp32c61.yml'
4546
- '.gitlab/ci/build_esp32s2.yml'
4647
- '.gitlab/ci/deploy.yml'
4748
- '.gitlab/ci/post_deploy.yml'

‎.gitlab/ci/build_esp32c61.yml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Build ESP32-C61 AT Firmwares
2+
3+
esp32c61_4mb_at:
4+
extends:
5+
- .build_template_esp32c61
6+
- .rules:build:build_project
7+
variables:
8+
MODULE_NAME: "ESP32C61-4MB"
9+
10+
esp32c61_4mb_at_tat_debug:
11+
extends:
12+
- .build_template_esp32c61
13+
- .before_script_enable_at_debugs
14+
- .rules:build:build_project_on_protected
15+
variables:
16+
MODULE_NAME: "ESP32C61-4MB"
17+
18+
esp32c61_at_wifi_function_test:
19+
extends:
20+
- .build_template_esp32c61
21+
- .before_script_enable_all_wifi_cmds
22+
- .rules:build:build_project_on_protected
23+
variables:
24+
MODULE_NAME: "ESP32C61-4MB"

‎.gitlab/ci/build_template.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,13 @@
112112
- echo -e "#define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32C6_4MB \"$AT_OTA_TOKEN_ESP32C6_4MB\"" >> at_ota_token.h
113113
- cd -
114114

115+
.setup_tokens_esp32c61: &setup_tokens_esp32c61
116+
- cd components/at/private_include
117+
- rm -f at_ota_token.h
118+
- echo -e "#define CONFIG_ESP_AT_OTA_TOKEN_ESP32C61_4MB \"$AT_OTA_TOKEN_ESP32C61_4MB\"" >> at_ota_token.h
119+
- echo -e "#define CONFIG_ESP_AT_OTA_SSL_TOKEN_ESP32C61_4MB \"$AT_OTA_TOKEN_ESP32C61_4MB\"" >> at_ota_token.h
120+
- cd -
121+
115122
.setup_tokens_esp32s2: &setup_tokens_esp32s2
116123
- cd components/at/private_include
117124
- rm -f at_ota_token.h
@@ -233,6 +240,12 @@
233240
- add_gitlab_ssh_keys
234241
- *setup_tokens_esp32c6
235242

243+
.before_script_esp32c61:
244+
before_script:
245+
- source ${CI_PROJECT_DIR}/.gitlab/ci/utils.sh
246+
- add_gitlab_ssh_keys
247+
- *setup_tokens_esp32c61
248+
236249
.before_script_esp32s2:
237250
before_script:
238251
- source ${CI_PROJECT_DIR}/.gitlab/ci/utils.sh
@@ -367,6 +380,15 @@
367380
PLATFORM: "PLATFORM_ESP32C6"
368381
SILENCE: "0"
369382

383+
.build_template_esp32c61:
384+
extends:
385+
- .build_template
386+
- .before_script_esp32c61
387+
image: $CI_DOCKER_REGISTRY/esp-env-v5.5:2
388+
variables:
389+
PLATFORM: "PLATFORM_ESP32C61"
390+
SILENCE: "0"
391+
370392
.build_template_esp32s2:
371393
extends:
372394
- .build_template

‎bootloader_components/main/idf_component.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ dependencies:
22
espressif/bootloader_support_plus:
33
version: "~0.4.0"
44
rules:
5-
- if: "target in [esp32c2, esp32c3, esp32c5]"
5+
- if: "target in [esp32c2, esp32c3, esp32c5, esp32c61]"

‎build.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
sys_cmd = 'export'
2121
sys_delimiter = ':'
2222

23-
at_targets = ['esp32', 'esp32c2', 'esp32c3', 'esp32c5', 'esp32c6', 'esp32s2']
23+
at_targets = ['esp32', 'esp32c2', 'esp32c3', 'esp32c5', 'esp32c6', 'esp32c61', 'esp32s2']
2424
at_macro_pairs = []
2525

2626
def ESP_LOGI(x):

‎components/at/idf_component.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ dependencies:
77
espressif/bootloader_support_plus:
88
version: "~0.4.0"
99
rules:
10-
- if: "target in [esp32c2, esp32c3, esp32c5]"
10+
- if: "target in [esp32c2, esp32c3, esp32c5, esp32c61]"

‎components/at/lib/VERSION‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ ESP32C3: 8921ed0
33
ESP32C2: 8921ed0
44
ESP32C5: 8921ed0
55
ESP32C6: 8921ed0
6+
ESP32C61:8921ed0
67
ESP32S2: 8921ed0

‎components/at/lib/libesp32c61_at_core.a‎

964 KB
Binary file not shown.

0 commit comments

Comments
 (0)