Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 16668c7

Browse files
Merge branch 'master' into release/v2.x
2 parents e3cbd23 + a6a287f commit 16668c7

File tree

3 files changed

+62
-49
lines changed

3 files changed

+62
-49
lines changed

‎boards.txt

Lines changed: 37 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -13579,6 +13579,7 @@ m5stack-cores3.upload.tool.network=esp_ota
1357913579

1358013580
m5stack-cores3.upload.maximum_size=1310720
1358113581
m5stack-cores3.upload.maximum_data_size=327680
13582+
m5stack-cores3.upload.speed=921600
1358213583
m5stack-cores3.upload.flags=
1358313584
m5stack-cores3.upload.extra_flags=
1358413585
m5stack-cores3.upload.use_1200bps_touch=false
@@ -13596,21 +13597,20 @@ m5stack-cores3.build.variant=m5stack_cores3
1359613597
m5stack-cores3.build.board=M5STACK_CORES3
1359713598

1359813599
m5stack-cores3.build.usb_mode=1
13599-
m5stack-cores3.build.cdc_on_boot=0
13600+
m5stack-cores3.build.cdc_on_boot=1
1360013601
m5stack-cores3.build.msc_on_boot=0
1360113602
m5stack-cores3.build.dfu_on_boot=0
1360213603
m5stack-cores3.build.f_cpu=240000000L
13603-
m5stack-cores3.build.flash_size=4MB
13604+
m5stack-cores3.build.flash_size=16MB
1360413605
m5stack-cores3.build.flash_freq=80m
1360513606
m5stack-cores3.build.flash_mode=dio
1360613607
m5stack-cores3.build.boot=qio
13607-
m5stack-cores3.build.boot_freq=80m
13608-
m5stack-cores3.build.partitions=default
13609-
m5stack-cores3.build.defines=
13610-
m5stack-cores3.build.loop_core=
13611-
m5stack-cores3.build.event_core=
13608+
m5stack-cores3.build.partitions=default_16MB
13609+
m5stack-cores3.build.defines=-DBOARD_HAS_PSRAM
1361213610
m5stack-cores3.build.psram_type=qspi
13613-
m5stack-cores3.build.memory_type={build.boot}_{build.psram_type}
13611+
m5stack-cores3.build.memory_type=qio_qspi
13612+
m5stack-cores3.build.loop_core=-DARDUINO_RUNNING_CORE=1
13613+
m5stack-cores3.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
1361413614

1361513615
m5stack-cores3.menu.JTAGAdapter.default=Disabled
1361613616
m5stack-cores3.menu.JTAGAdapter.default.build.copy_jtag_files=0
@@ -13624,46 +13624,14 @@ m5stack-cores3.menu.JTAGAdapter.bridge=ESP USB Bridge
1362413624
m5stack-cores3.menu.JTAGAdapter.bridge.build.openocdscript=esp32s3-bridge.cfg
1362513625
m5stack-cores3.menu.JTAGAdapter.bridge.build.copy_jtag_files=1
1362613626

13627-
m5stack-cores3.menu.PSRAM.disabled=Disabled
13628-
m5stack-cores3.menu.PSRAM.disabled.build.defines=
13629-
m5stack-cores3.menu.PSRAM.disabled.build.psram_type=qspi
13630-
m5stack-cores3.menu.PSRAM.enabled=QSPI PSRAM
13631-
m5stack-cores3.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
13632-
m5stack-cores3.menu.PSRAM.enabled.build.psram_type=qspi
13633-
m5stack-cores3.menu.PSRAM.opi=OPI PSRAM
13634-
m5stack-cores3.menu.PSRAM.opi.build.defines=-DBOARD_HAS_PSRAM
13635-
m5stack-cores3.menu.PSRAM.opi.build.psram_type=opi
13636-
13637-
m5stack-cores3.menu.FlashMode.qio=QIO 80MHz
13638-
m5stack-cores3.menu.FlashMode.qio.build.flash_mode=dio
13639-
m5stack-cores3.menu.FlashMode.qio.build.boot=qio
13640-
m5stack-cores3.menu.FlashMode.qio.build.boot_freq=80m
13641-
m5stack-cores3.menu.FlashMode.qio.build.flash_freq=80m
13642-
m5stack-cores3.menu.FlashMode.qio120=QIO 120MHz
13643-
m5stack-cores3.menu.FlashMode.qio120.build.flash_mode=dio
13644-
m5stack-cores3.menu.FlashMode.qio120.build.boot=qio
13645-
m5stack-cores3.menu.FlashMode.qio120.build.boot_freq=120m
13646-
m5stack-cores3.menu.FlashMode.qio120.build.flash_freq=80m
13647-
m5stack-cores3.menu.FlashMode.dio=DIO 80MHz
13648-
m5stack-cores3.menu.FlashMode.dio.build.flash_mode=dio
13649-
m5stack-cores3.menu.FlashMode.dio.build.boot=dio
13650-
m5stack-cores3.menu.FlashMode.dio.build.boot_freq=80m
13651-
m5stack-cores3.menu.FlashMode.dio.build.flash_freq=80m
13652-
m5stack-cores3.menu.FlashMode.opi=OPI 80MHz
13653-
m5stack-cores3.menu.FlashMode.opi.build.flash_mode=dout
13654-
m5stack-cores3.menu.FlashMode.opi.build.boot=opi
13655-
m5stack-cores3.menu.FlashMode.opi.build.boot_freq=80m
13656-
m5stack-cores3.menu.FlashMode.opi.build.flash_freq=80m
13657-
13627+
m5stack-cores3.menu.FlashSize.16M=16MB (128Mb)
13628+
m5stack-cores3.menu.FlashSize.16M.build.flash_size=16MB
13629+
m5stack-cores3.menu.FlashSize.16M.build.partitions=default_16MB
1365813630
m5stack-cores3.menu.FlashSize.4M=4MB (32Mb)
1365913631
m5stack-cores3.menu.FlashSize.4M.build.flash_size=4MB
1366013632
m5stack-cores3.menu.FlashSize.8M=8MB (64Mb)
1366113633
m5stack-cores3.menu.FlashSize.8M.build.flash_size=8MB
1366213634
m5stack-cores3.menu.FlashSize.8M.build.partitions=default_8MB
13663-
m5stack-cores3.menu.FlashSize.16M=16MB (128Mb)
13664-
m5stack-cores3.menu.FlashSize.16M.build.flash_size=16MB
13665-
#m5stack-cores3.menu.FlashSize.32M=32MB (256Mb)
13666-
#m5stack-cores3.menu.FlashSize.32M.build.flash_size=32MB
1366713635

1366813636
m5stack-cores3.menu.LoopCore.1=Core 1
1366913637
m5stack-cores3.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
@@ -13677,13 +13645,17 @@ m5stack-cores3.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
1367713645

1367813646
m5stack-cores3.menu.USBMode.hwcdc=Hardware CDC and JTAG
1367913647
m5stack-cores3.menu.USBMode.hwcdc.build.usb_mode=1
13680-
m5stack-cores3.menu.USBMode.default=USB-OTG (TinyUSB)
13648+
m5stack-cores3.menu.USBMode.hwcdc.upload.use_1200bps_touch=false
13649+
m5stack-cores3.menu.USBMode.hwcdc.upload.wait_for_upload_port=false
13650+
m5stack-cores3.menu.USBMode.default=USB-OTG
1368113651
m5stack-cores3.menu.USBMode.default.build.usb_mode=0
13652+
m5stack-cores3.menu.USBMode.default.upload.use_1200bps_touch=true
13653+
m5stack-cores3.menu.USBMode.default.upload.wait_for_upload_port=true
1368213654

13683-
m5stack-cores3.menu.CDCOnBoot.default=Disabled
13684-
m5stack-cores3.menu.CDCOnBoot.default.build.cdc_on_boot=0
1368513655
m5stack-cores3.menu.CDCOnBoot.cdc=Enabled
1368613656
m5stack-cores3.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
13657+
m5stack-cores3.menu.CDCOnBoot.default=Disabled
13658+
m5stack-cores3.menu.CDCOnBoot.default.build.cdc_on_boot=0
1368713659

1368813660
m5stack-cores3.menu.MSCOnBoot.default=Disabled
1368913661
m5stack-cores3.menu.MSCOnBoot.default.build.msc_on_boot=0
@@ -13702,13 +13674,27 @@ m5stack-cores3.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
1370213674
m5stack-cores3.menu.UploadMode.cdc.upload.use_1200bps_touch=true
1370313675
m5stack-cores3.menu.UploadMode.cdc.upload.wait_for_upload_port=true
1370413676

13705-
m5stack-cores3.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
13677+
m5stack-cores3.menu.PartitionScheme.default_16MB=Default 16MB with spiffs (2x 6.5 MB APP/3.6MB SPIFFS)
13678+
m5stack-cores3.menu.PartitionScheme.default_16MB.build.partitions=default_16MB
13679+
m5stack-cores3.menu.PartitionScheme.default_16MB.upload.maximum_size=6553600
13680+
m5stack-cores3.menu.PartitionScheme.default=4MB with spiffs (2x 1.2MB APP/1.5MB SPIFFS)
1370613681
m5stack-cores3.menu.PartitionScheme.default.build.partitions=default
13707-
m5stack-cores3.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
13682+
m5stack-cores3.menu.PartitionScheme.defaultffat=4MB with ffat (2x 1.2MB APP/1.5MB FATFS)
1370813683
m5stack-cores3.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
13709-
m5stack-cores3.menu.PartitionScheme.default_8MB=8M with spiffs (3MB APP/1.5MB SPIFFS)
13684+
m5stack-cores3.menu.PartitionScheme.default_8MB=8M with spiffs (2x 3MB APP/1.5MB SPIFFS)
1371013685
m5stack-cores3.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
1371113686
m5stack-cores3.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
13687+
m5stack-cores3.menu.PartitionScheme.large_spiffs=16MB with Large SPIFFS (2x 4MB APP/7MB SPIFFS)
13688+
m5stack-cores3.menu.PartitionScheme.large_spiffs.build.partitions=large_spiffs_16MB
13689+
m5stack-cores3.menu.PartitionScheme.large_spiffs.upload.maximum_size=4685824
13690+
m5stack-cores3.menu.PartitionScheme.factory_4apps=16MB+Factory (4x 3MB APP/2MB SPIFFS)
13691+
m5stack-cores3.menu.PartitionScheme.factory_4apps.build.custom_partitions=partitions_16MB_factory_4_apps
13692+
# m5stack-cores3.menu.PartitionScheme.factory_4apps.upload.extra_flags=0xc10000 "{runtime.platform.path}/variants/{build.variant}/firmware.bin"
13693+
m5stack-cores3.menu.PartitionScheme.factory_4apps.upload.maximum_size=3145728
13694+
m5stack-cores3.menu.PartitionScheme.factory_6apps=16MB+Factory (6x 2MB APP/2MB SPIFFS)
13695+
m5stack-cores3.menu.PartitionScheme.factory_6apps.build.custom_partitions=partitions_16MB_factory_6_apps
13696+
# m5stack-cores3.menu.PartitionScheme.factory_6apps.upload.extra_flags=0xc10000 "{runtime.platform.path}/variants/{build.variant}/firmware.bin"
13697+
m5stack-cores3.menu.PartitionScheme.factory_6apps.upload.maximum_size=2097152
1371213698

1371313699
m5stack-cores3.menu.CPUFreq.240=240MHz (WiFi)
1371413700
m5stack-cores3.menu.CPUFreq.240.build.f_cpu=240000000L
@@ -13737,6 +13723,8 @@ m5stack-cores3.menu.UploadSpeed.460800.macosx=460800
1373713723
m5stack-cores3.menu.UploadSpeed.460800.upload.speed=460800
1373813724
m5stack-cores3.menu.UploadSpeed.512000.windows=512000
1373913725
m5stack-cores3.menu.UploadSpeed.512000.upload.speed=512000
13726+
m5stack-cores3.menu.UploadSpeed.1500000=1500000
13727+
m5stack-cores3.menu.UploadSpeed.1500000.upload.speed=1500000
1374013728

1374113729
m5stack-cores3.menu.DebugLevel.none=None
1374213730
m5stack-cores3.menu.DebugLevel.none.build.code_debug=0
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
## 4 Apps + Factory
2+
## Name, Type, SubType, Offset, Size
3+
nvs, data, nvs, 0x9000, 0x5000
4+
otadata, data, ota, 0xe000, 0x2000
5+
ota_0, 0, ota_0, 0x10000, 0x300000
6+
ota_1, 0, ota_1, 0x310000, 0x300000
7+
ota_2, 0, ota_2, 0x610000, 0x300000
8+
ota_3, 0, ota_3, 0x910000, 0x300000
9+
firmware, app, factory, 0xC10000, 0x0F0000
10+
spiffs, data, spiffs, 0xD00000, 0x2F0000
11+
coredump, data, coredump, 0xFF0000, 0x10000
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# 6 Apps + Factory
2+
# Name, Type, SubType, Offset, Size
3+
nvs, data, nvs, 0x9000, 0x5000
4+
otadata, data, ota, 0xe000, 0x2000
5+
ota_0, 0, ota_0, 0x10000, 0x200000
6+
ota_1, 0, ota_1, 0x210000, 0x200000
7+
ota_2, 0, ota_2, 0x410000, 0x200000
8+
ota_3, 0, ota_3, 0x610000, 0x200000
9+
ota_4, 0, ota_4, 0x810000, 0x200000
10+
ota_5, 0, ota_5, 0xA10000, 0x200000
11+
firmware, app, factory, 0xC10000, 0x0F0000
12+
spiffs, data, spiffs, 0xD00000, 0x2F0000
13+
coredump, data, coredump, 0xFF0000, 0x10000
14+

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /