Skip to content

Commit 6ef3374

Browse files
Implement support for C6 and P4 SOCs
Based on #394
1 parent fec8033 commit 6ef3374

33 files changed

Lines changed: 267 additions & 65 deletions

File tree

.github/workflows/build-sdk.yml

Lines changed: 0 additions & 26 deletions
This file was deleted.
Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,24 @@ on:
1111
permissions: read-all
1212

1313
jobs:
14-
Build:
14+
BuildSdk:
15+
strategy:
16+
matrix:
17+
board: [
18+
{ id: generic-esp32, arch: esp32 },
19+
{ id: generic-esp32c6, arch: esp32c6 },
20+
{ id: generic-esp32p4, arch: esp32p4 },
21+
{ id: generic-esp32s3, arch: esp32s3 },
22+
]
23+
runs-on: ubuntu-latest
24+
steps:
25+
- uses: actions/checkout@v4
26+
- name: "Build SDK"
27+
uses: ./.github/actions/build-sdk
28+
with:
29+
board_id: ${{ matrix.board.id }}
30+
arch: ${{ matrix.board.arch }}
31+
BuildFirmware:
1532
strategy:
1633
matrix:
1734
board: [
@@ -52,44 +69,45 @@ jobs:
5269
{ id: waveshare-s3-touch-lcd-43, arch: esp32s3 }
5370
]
5471
runs-on: ubuntu-latest
72+
needs: [ BuildSdk ]
5573
steps:
5674
- uses: actions/checkout@v4
57-
- name: "Build"
75+
- name: "Build Firmware"
5876
uses: ./.github/actions/build-firmware
5977
with:
6078
board_id: ${{ matrix.board.id }}
6179
arch: ${{ matrix.board.arch }}
62-
Bundle:
80+
BundleFirmware:
6381
runs-on: ubuntu-latest
64-
needs: [ Build ]
82+
needs: [ BuildFirmware ]
6583
if: |
6684
(github.event_name == 'push' && github.ref == 'refs/heads/main') ||
6785
(github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v'))
6886
steps:
6987
- uses: actions/checkout@v4
70-
- name: "Bundle"
88+
- name: "Bundle Firmware"
7189
uses: ./.github/actions/bundle-firmware
72-
PublishSnapshot:
90+
PublishFirmwareSnapshot:
7391
runs-on: ubuntu-latest
74-
needs: [ Bundle ]
92+
needs: [ BundleFirmware ]
7593
if: (github.event_name == 'push' && github.ref == 'refs/heads/main')
7694
steps:
7795
- uses: actions/checkout@v4
78-
- name: "Publish Snapshot"
96+
- name: "Publish Firmware Snapshot"
7997
env:
8098
CDN_ID: ${{ secrets.CDN_ID }}
8199
CDN_TOKEN_NAME: ${{ secrets.CDN_TOKEN_NAME }}
82100
CDN_TOKEN_VALUE: ${{ secrets.CDN_TOKEN_VALUE }}
83101
uses: ./.github/actions/publish-firmware
84102
with:
85103
cdn_version: snapshot
86-
PublishRelease:
104+
PublishFirmwareStable:
87105
runs-on: ubuntu-latest
88-
needs: [ Bundle ]
106+
needs: [ BundleFirmware ]
89107
if: (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v'))
90108
steps:
91109
- uses: actions/checkout@v4
92-
- name: "Publish Stable"
110+
- name: "Publish Firmware Stable"
93111
env:
94112
CDN_ID: ${{ secrets.CDN_ID }}
95113
CDN_TOKEN_NAME: ${{ secrets.CDN_TOKEN_NAME }}

CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,11 @@ if (DEFINED ENV{ESP_IDF_VERSION})
4848

4949
set(EXCLUDE_COMPONENTS "Simulator")
5050

51-
idf_build_set_property(LINK_OPTIONS "-Wl,--wrap=esp_panic_handler" APPEND)
51+
# Panic handler wrapping is only available on Xtensa architecture
52+
if (CONFIG_IDF_TARGET_ARCH_XTENSA)
53+
idf_build_set_property(LINK_OPTIONS "-Wl,--wrap=esp_panic_handler" APPEND)
54+
endif ()
55+
5256
idf_build_set_property(LINK_OPTIONS "-Wl,--wrap=lv_button_create" APPEND)
5357
idf_build_set_property(LINK_OPTIONS "-Wl,--wrap=lv_dropdown_create" APPEND)
5458
idf_build_set_property(LINK_OPTIONS "-Wl,--wrap=lv_list_create" APPEND)
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
file(GLOB_RECURSE SOURCE_FILES Source/*.c*)
2+
3+
idf_component_register(
4+
SRCS ${SOURCE_FILES}
5+
INCLUDE_DIRS "Source"
6+
REQUIRES Tactility
7+
)
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#include <Tactility/hal/Configuration.h>
2+
3+
extern const tt::hal::Configuration hardwareConfiguration = {};
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[general]
2+
vendor=Generic
3+
name=ESP32
4+
5+
[hardware]
6+
target=ESP32
7+
flashSize=4MB
8+
spiRam=false
9+
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
file(GLOB_RECURSE SOURCE_FILES Source/*.c*)
2+
3+
idf_component_register(
4+
SRCS ${SOURCE_FILES}
5+
INCLUDE_DIRS "Source"
6+
REQUIRES Tactility
7+
)
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#include <Tactility/hal/Configuration.h>
2+
3+
extern const tt::hal::Configuration hardwareConfiguration = {};
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[general]
2+
vendor=Generic
3+
name=ESP32-C6
4+
5+
[hardware]
6+
target=ESP32C6
7+
flashSize=4MB
8+
spiRam=false
9+
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
file(GLOB_RECURSE SOURCE_FILES Source/*.c*)
2+
3+
idf_component_register(
4+
SRCS ${SOURCE_FILES}
5+
INCLUDE_DIRS "Source"
6+
REQUIRES Tactility
7+
)

0 commit comments

Comments
 (0)