Skip to content

Commit

Permalink
Define and use ESP32-S3 boards in a consistent way
Browse files Browse the repository at this point in the history
  • Loading branch information
oliverschmidt committed Apr 13, 2023
1 parent 4aa229a commit 610ea44
Show file tree
Hide file tree
Showing 6 changed files with 123 additions and 9 deletions.
33 changes: 33 additions & 0 deletions boards/fujinet-esp32s3-4mb.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"build": {
"arduino":{
"ldscript": "esp32s3_out.ld"
},
"core": "esp32",
"f_cpu": "240000000L",
"f_flash": "80000000L",
"flash_mode": "dio",
"mcu": "esp32s3",
"variant": "esp32s3",
"partitions": "fujinet_partitions_4MB.csv"
},
"connectivity": [
"wifi"
],
"debug": {
"openocd_target": "esp32s3.cfg"
},
"frameworks": [
"espidf"
],
"name": "FujiNet esp32-s3 4MB",
"upload": {
"flash_size": "4MB",
"maximum_ram_size": 524288,
"maximum_size": 4194304,
"require_upload_port": true,
"speed": 460800
},
"url": "https://github.com/FujiNetWIFI/fujinet-platformio",
"vendor": "FujiNet Project"
}
33 changes: 33 additions & 0 deletions boards/fujinet-esp32s3-8mb.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"build": {
"arduino":{
"ldscript": "esp32s3_out.ld"
},
"core": "esp32",
"f_cpu": "240000000L",
"f_flash": "80000000L",
"flash_mode": "dio",
"mcu": "esp32s3",
"variant": "esp32s3",
"partitions": "fujinet_partitions_8MB.csv"
},
"connectivity": [
"wifi"
],
"debug": {
"openocd_target": "esp32s3.cfg"
},
"frameworks": [
"espidf"
],
"name": "FujiNet esp32-s3 8MB",
"upload": {
"flash_size": "8MB",
"maximum_ram_size": 524288,
"maximum_size": 8388608,
"require_upload_port": true,
"speed": 460800
},
"url": "https://github.com/FujiNetWIFI/fujinet-platformio",
"vendor": "FujiNet Project"
}
8 changes: 4 additions & 4 deletions boards/fujinet-esp32s3.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"flash_mode": "dio",
"mcu": "esp32s3",
"variant": "esp32s3",
"partitions": "fujinet_partitions_8MB.csv"
"partitions": "fujinet_partitions_16MB.csv"
},
"connectivity": [
"wifi"
Expand All @@ -22,12 +22,12 @@
],
"name": "FujiNet esp32-s3",
"upload": {
"flash_size": "8MB",
"flash_size": "16MB",
"maximum_ram_size": 524288,
"maximum_size": 8388608,
"maximum_size": 16777216,
"require_upload_port": true,
"speed": 460800
},
"url": "https://github.com/fujinetwifi",
"url": "https://github.com/FujiNetWIFI/fujinet-platformio",
"vendor": "FujiNet Project"
}
17 changes: 17 additions & 0 deletions data/webui/config/esp32s3-4mb.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
paths:
font_path: /file?
css_path: /file?css
js_path: /file?js
components:
network: true
hardware: true
hosts_list: true
mount_list: true
printer_settings: true
modem_settings: true
hsio_settings: true
timezone: true
udp_stream: true
program_recorder: true
disk_swap: true
boot_settings: true
17 changes: 17 additions & 0 deletions data/webui/config/esp32s3-8mb.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
paths:
font_path: /file?
css_path: /file?css
js_path: /file?js
components:
network: true
hardware: true
hosts_list: true
mount_list: true
printer_settings: true
modem_settings: true
hsio_settings: true
timezone: true
udp_stream: true
program_recorder: true
disk_swap: true
boot_settings: true
24 changes: 19 additions & 5 deletions platformio-sample.ini
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ esp32_platform_version = 3.4.0
;esp32_platform_version = 3.2.0 ; For Bluetooth support
;esp32_platform_version = 6.1.0 ; Experimental, builds for fujiapple-rev0

esp32s3_platform_version = 6.1.0

; Uncomment the platform, bus and board type you are building for below
;build_platform = BUILD_ATARI
;build_bus = SIO
Expand Down Expand Up @@ -225,17 +227,29 @@ build_flags =
-D PINMAP_ATARIV1

[env:esp32s3]
platform = https://github.com/jonathandreyer/platform-espressif32.git#espidf-440
platform_packages =
toolchain-esp32s2ulp
tool-esptoolpy @ https://github.com/jonathandreyer/esptool#release/v3.2
framework-espidf @ https://github.com/jonathandreyer/framework-espidf.git#espidf-440
platform = espressif32@${fujinet.esp32s3_platform_version}
board = fujinet-esp32s3
build_type = debug
build_flags =
${env.build_flags}
-D PINMAP_ESP32S3

[env:esp32s3-8mb]
platform = espressif32@${fujinet.esp32s3_platform_version}
board = fujinet-esp32s3-8mb
build_type = debug
build_flags =
${env.build_flags}
-D PINMAP_ESP32S3

[env:esp32s3-4mb]
platform = espressif32@${fujinet.esp32s3_platform_version}
board = fujinet-esp32s3-4mb
build_type = debug
build_flags =
${env.build_flags}
-D PINMAP_ESP32S3

; Commander CX16 board
[env:fujinet-cx16]
platform = espressif32@${fujinet.esp32_platform_version}
Expand Down

0 comments on commit 610ea44

Please sign in to comment.