Skip to content

Commit 8fc5745

Browse files
authored
Merge pull request #2473 from BruceDevices/dev
1.15
2 parents ebb6919 + 65030e5 commit 8fc5745

131 files changed

Lines changed: 8393 additions & 2185 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.codex_tmp/LilyGoLib

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit a64fc6ca94757baa5401ad71b39fb7f92cd1a7e9

.codex_tmp/NFC-RFAL-fork

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit 7bde4587ea44c36c178a43d083d7a7345c1e4cfe

.codex_tmp/ST25R3916-fork

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit 0c8e00f49d12881d1cff6d6f0879b90ce7ed4033

.github/workflows/buil_parallel.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
board:
20+
- { env: "arduino-nesso-n1", family: "ESP32-C6",}
2021
- { env: "m5stack-cardputer", family: "ESP32-S3",}
2122
- { env: "m5stack-sticks3", family: "ESP32-S3",}
2223
- { env: "m5stack-cplus2", family: "ESP32",}
@@ -26,9 +27,11 @@ jobs:
2627
- { env: "m5stack-core16mb", family: "ESP32",}
2728
- { env: "m5stack-core4mb", family: "ESP32",}
2829
- { env: "m5stack-cores3", family: "ESP32-S3",}
30+
- { env: "m5stack-dinmeter", family: "ESP32-S3",}
2931
- { env: "esp32-s3-devkitc-1", family: "ESP32-S3",}
3032
- { env: "esp32-c5", family: "ESP32-C5",}
3133
- { env: "esp32-c5-tft", family: "ESP32-C5",}
34+
- { env: "nm-cyd-c5", family: "ESP32-C5",}
3235
- { env: "CYD-2432S028", family: "ESP32",}
3336
- { env: "CYD-2USB", family: "ESP32",}
3437
- { env: "CYD-2432W328C", family: "ESP32",}
@@ -41,7 +44,7 @@ jobs:
4144
- { env: "LAUNCHER_CYD-2USB", family: "ESP32",}
4245
- { env: "LAUNCHER_CYD-2432W328C", family: "ESP32",}
4346
- { env: "LAUNCHER_CYD-3248S035R", family: "ESP32",}
44-
# - { env: "LAUNCHER_CYD-3248S035C", family: "ESP32",}
47+
- { env: "LAUNCHER_CYD-3248S035C", family: "ESP32",}
4548
- { env: "lilygo-t-embed-cc1101", family: "ESP32-S3",}
4649
- { env: "lilygo-t-embed", family: "ESP32-S3",}
4750
- { env: "lilygo-t-deck", family: "ESP32-S3",}
@@ -55,6 +58,8 @@ jobs:
5558
- { env: "lilygo-t-display-ttgo", family: "ESP32",}
5659
- { env: "lilygo-t-hmi", family: "ESP32-S3",}
5760
- { env: "lilygo-t-lora-pager", family: "ESP32-S3",}
61+
- { env: "elecrow-24B", family: "ESP32",}
62+
- { env: "elecrow-28B", family: "ESP32",}
5863
- { env: "smoochiee-board", family: "ESP32-S3",}
5964
- { env: "reaper", family: "ESP32-S3",}
6065
- { env: "Phantom_S024R", family: "ESP32",}

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,5 @@ docker-logs
1919
lib/mquickjs_headers/mqjs_stdlib_generator
2020
lib/mquickjs_headers/mqjs_stdlib_generator.exe
2121
.github/agents/Bruce-AI.agent.md
22+
.idea
23+
.ai

README.md

Lines changed: 108 additions & 109 deletions
Large diffs are not rendered by default.
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
2+
"build": {
3+
"core": "esp32",
4+
"f_cpu": "160000000L",
5+
"f_flash": "80000000L",
6+
"flash_mode": "qio",
7+
"mcu": "esp32c6",
8+
"variant": "pinouts",
9+
"extra_flags": [
10+
"-DARDUINO_NESSO_N1"
11+
]
12+
},
13+
"connectivity": [
14+
"bluetooth",
15+
"wifi"
16+
],
17+
"debug": {
18+
"openocd_target": "esp32c6.cfg"
19+
},
20+
"frameworks": [
21+
"arduino",
22+
"espidf"
23+
],
24+
"name": "Arduino Nesso-N1",
25+
"upload": {
26+
"flash_size": "16MB",
27+
"maximum_ram_size": 327680,
28+
"maximum_size": 16777216,
29+
"require_upload_port": true,
30+
"speed": 460800
31+
},
32+
"url": "https://store.arduino.cc/products/nesso-n1",
33+
"vendor": "Arduino"
34+
}
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
{
2+
"build": {
3+
"arduino":{
4+
"ldscript": "esp32_out.ld"
5+
},
6+
"core": "esp32",
7+
"extra_flags": [
8+
"-DELECROW_WROOM32",
9+
"-DBOARD_HAS_PSRAM",
10+
"-mfix-esp32-psram-cache-issue",
11+
"-mfix-esp32-psram-cache-strategy=memw"
12+
],
13+
"f_cpu": "240000000L",
14+
"f_flash": "80000000L",
15+
"flash_mode": "dio",
16+
"mcu": "esp32",
17+
"variant": "pinouts"
18+
},
19+
"connectivity": [
20+
"wifi",
21+
"bluetooth",
22+
"ethernet",
23+
"can"
24+
],
25+
"frameworks": [
26+
"arduino",
27+
"espidf"
28+
],
29+
"name": "ELECROW 2.4R",
30+
"upload": {
31+
"flash_size": "4MB",
32+
"maximum_ram_size": 327680,
33+
"maximum_size": 4194304,
34+
"require_upload_port": true,
35+
"speed": 460800
36+
},
37+
"url": "https://en.wikipedia.org/wiki/ESP32",
38+
"vendor": "ELECROW"
39+
}
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
{
2+
"build": {
3+
"arduino": {
4+
"ldscript": "esp32s3_out.ld",
5+
"partitions": "default_8MB.csv"
6+
},
7+
"core": "esp32",
8+
"extra_flags": [
9+
"-DARDUINO_M5STACK_DINMETER",
10+
"-DARDUINO_USB_CDC_ON_BOOT",
11+
"-DM5STACK",
12+
"-DARDUINO_USB_MODE=1",
13+
"-DARDUINO_RUNNING_CORE=1",
14+
"-DARDUINO_EVENT_RUNNING_CORE=1"
15+
],
16+
"f_cpu": "240000000L",
17+
"f_flash": "80000000L",
18+
"flash_mode": "qio",
19+
"hwids": [
20+
[
21+
"0x303A",
22+
"0x1001"
23+
]
24+
],
25+
"mcu": "esp32s3",
26+
"variant": "pinouts"
27+
},
28+
"connectivity": [
29+
"bluetooth",
30+
"wifi"
31+
],
32+
"debug": {
33+
"openocd_target": "esp32s3.cfg"
34+
},
35+
"frameworks": [
36+
"arduino",
37+
"espidf"
38+
],
39+
"name": "M5Stack StickS3",
40+
"upload": {
41+
"flash_size": "8MB",
42+
"maximum_ram_size": 327680,
43+
"maximum_size": 8388608,
44+
"require_upload_port": true,
45+
"speed": 460800
46+
},
47+
"url": "https://docs.m5stack.com/en/core/StampS3",
48+
"vendor": "M5Stack"
49+
}

boards/_boards_json/m5stack-sticks3.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"build": {
33
"arduino": {
44
"ldscript": "esp32s3_out.ld",
5-
"partitions": "default_8MB.csv"
5+
"partitions": "default_8MB.csv",
6+
"memory_type": "qio_opi"
67
},
78
"core": "esp32",
89
"extra_flags": [

0 commit comments

Comments
 (0)