Skip to content

Commit e850570

Browse files
ladyadaladyada
authored
Merge branch 'espressif:master' into master
2 parents 480b062 + 02e31b4 commit e850570

File tree

6 files changed

+67
-52
lines changed

6 files changed

+67
-52
lines changed

‎.github/ISSUE_TEMPLATE/Issue-report.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ body:
4141
options:
4242
- latest master (checkout manually)
4343
- latest development Release Candidate (RC-X)
44+
- v2.0.13
45+
- v2.0.12
4446
- v2.0.11
4547
- v2.0.10
4648
- v2.0.9

‎boards.txt

Lines changed: 38 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -13763,6 +13763,7 @@ m5stack-cores3.upload.tool.network=esp_ota
1376313763

1376413764
m5stack-cores3.upload.maximum_size=1310720
1376513765
m5stack-cores3.upload.maximum_data_size=327680
13766+
m5stack-cores3.upload.speed=921600
1376613767
m5stack-cores3.upload.flags=
1376713768
m5stack-cores3.upload.extra_flags=
1376813769
m5stack-cores3.upload.use_1200bps_touch=false
@@ -13780,21 +13781,20 @@ m5stack-cores3.build.variant=m5stack_cores3
1378013781
m5stack-cores3.build.board=M5STACK_CORES3
1378113782

1378213783
m5stack-cores3.build.usb_mode=1
13783-
m5stack-cores3.build.cdc_on_boot=0
13784+
m5stack-cores3.build.cdc_on_boot=1
1378413785
m5stack-cores3.build.msc_on_boot=0
1378513786
m5stack-cores3.build.dfu_on_boot=0
1378613787
m5stack-cores3.build.f_cpu=240000000L
13787-
m5stack-cores3.build.flash_size=4MB
13788+
m5stack-cores3.build.flash_size=16MB
1378813789
m5stack-cores3.build.flash_freq=80m
1378913790
m5stack-cores3.build.flash_mode=dio
1379013791
m5stack-cores3.build.boot=qio
13791-
m5stack-cores3.build.boot_freq=80m
13792-
m5stack-cores3.build.partitions=default
13793-
m5stack-cores3.build.defines=
13794-
m5stack-cores3.build.loop_core=
13795-
m5stack-cores3.build.event_core=
13792+
m5stack-cores3.build.partitions=default_16MB
13793+
m5stack-cores3.build.defines=-DBOARD_HAS_PSRAM
1379613794
m5stack-cores3.build.psram_type=qspi
13797-
m5stack-cores3.build.memory_type={build.boot}_{build.psram_type}
13795+
m5stack-cores3.build.memory_type=qio_qspi
13796+
m5stack-cores3.build.loop_core=-DARDUINO_RUNNING_CORE=1
13797+
m5stack-cores3.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
1379813798

1379913799
m5stack-cores3.menu.JTAGAdapter.default=Disabled
1380013800
m5stack-cores3.menu.JTAGAdapter.default.build.copy_jtag_files=0
@@ -13808,46 +13808,14 @@ m5stack-cores3.menu.JTAGAdapter.bridge=ESP USB Bridge
1380813808
m5stack-cores3.menu.JTAGAdapter.bridge.build.openocdscript=esp32s3-bridge.cfg
1380913809
m5stack-cores3.menu.JTAGAdapter.bridge.build.copy_jtag_files=1
1381013810

13811-
m5stack-cores3.menu.PSRAM.disabled=Disabled
13812-
m5stack-cores3.menu.PSRAM.disabled.build.defines=
13813-
m5stack-cores3.menu.PSRAM.disabled.build.psram_type=qspi
13814-
m5stack-cores3.menu.PSRAM.enabled=QSPI PSRAM
13815-
m5stack-cores3.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
13816-
m5stack-cores3.menu.PSRAM.enabled.build.psram_type=qspi
13817-
m5stack-cores3.menu.PSRAM.opi=OPI PSRAM
13818-
m5stack-cores3.menu.PSRAM.opi.build.defines=-DBOARD_HAS_PSRAM
13819-
m5stack-cores3.menu.PSRAM.opi.build.psram_type=opi
13820-
13821-
m5stack-cores3.menu.FlashMode.qio=QIO 80MHz
13822-
m5stack-cores3.menu.FlashMode.qio.build.flash_mode=dio
13823-
m5stack-cores3.menu.FlashMode.qio.build.boot=qio
13824-
m5stack-cores3.menu.FlashMode.qio.build.boot_freq=80m
13825-
m5stack-cores3.menu.FlashMode.qio.build.flash_freq=80m
13826-
m5stack-cores3.menu.FlashMode.qio120=QIO 120MHz
13827-
m5stack-cores3.menu.FlashMode.qio120.build.flash_mode=dio
13828-
m5stack-cores3.menu.FlashMode.qio120.build.boot=qio
13829-
m5stack-cores3.menu.FlashMode.qio120.build.boot_freq=120m
13830-
m5stack-cores3.menu.FlashMode.qio120.build.flash_freq=80m
13831-
m5stack-cores3.menu.FlashMode.dio=DIO 80MHz
13832-
m5stack-cores3.menu.FlashMode.dio.build.flash_mode=dio
13833-
m5stack-cores3.menu.FlashMode.dio.build.boot=dio
13834-
m5stack-cores3.menu.FlashMode.dio.build.boot_freq=80m
13835-
m5stack-cores3.menu.FlashMode.dio.build.flash_freq=80m
13836-
m5stack-cores3.menu.FlashMode.opi=OPI 80MHz
13837-
m5stack-cores3.menu.FlashMode.opi.build.flash_mode=dout
13838-
m5stack-cores3.menu.FlashMode.opi.build.boot=opi
13839-
m5stack-cores3.menu.FlashMode.opi.build.boot_freq=80m
13840-
m5stack-cores3.menu.FlashMode.opi.build.flash_freq=80m
13841-
13811+
m5stack-cores3.menu.FlashSize.16M=16MB (128Mb)
13812+
m5stack-cores3.menu.FlashSize.16M.build.flash_size=16MB
13813+
m5stack-cores3.menu.FlashSize.16M.build.partitions=default_16MB
1384213814
m5stack-cores3.menu.FlashSize.4M=4MB (32Mb)
1384313815
m5stack-cores3.menu.FlashSize.4M.build.flash_size=4MB
1384413816
m5stack-cores3.menu.FlashSize.8M=8MB (64Mb)
1384513817
m5stack-cores3.menu.FlashSize.8M.build.flash_size=8MB
1384613818
m5stack-cores3.menu.FlashSize.8M.build.partitions=default_8MB
13847-
m5stack-cores3.menu.FlashSize.16M=16MB (128Mb)
13848-
m5stack-cores3.menu.FlashSize.16M.build.flash_size=16MB
13849-
#m5stack-cores3.menu.FlashSize.32M=32MB (256Mb)
13850-
#m5stack-cores3.menu.FlashSize.32M.build.flash_size=32MB
1385113819

1385213820
m5stack-cores3.menu.LoopCore.1=Core 1
1385313821
m5stack-cores3.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
@@ -13861,13 +13829,17 @@ m5stack-cores3.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
1386113829

1386213830
m5stack-cores3.menu.USBMode.hwcdc=Hardware CDC and JTAG
1386313831
m5stack-cores3.menu.USBMode.hwcdc.build.usb_mode=1
13864-
m5stack-cores3.menu.USBMode.default=USB-OTG (TinyUSB)
13832+
m5stack-cores3.menu.USBMode.hwcdc.upload.use_1200bps_touch=false
13833+
m5stack-cores3.menu.USBMode.hwcdc.upload.wait_for_upload_port=false
13834+
m5stack-cores3.menu.USBMode.default=USB-OTG
1386513835
m5stack-cores3.menu.USBMode.default.build.usb_mode=0
13836+
m5stack-cores3.menu.USBMode.default.upload.use_1200bps_touch=true
13837+
m5stack-cores3.menu.USBMode.default.upload.wait_for_upload_port=true
1386613838

13867-
m5stack-cores3.menu.CDCOnBoot.default=Disabled
13868-
m5stack-cores3.menu.CDCOnBoot.default.build.cdc_on_boot=0
1386913839
m5stack-cores3.menu.CDCOnBoot.cdc=Enabled
1387013840
m5stack-cores3.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
13841+
m5stack-cores3.menu.CDCOnBoot.default=Disabled
13842+
m5stack-cores3.menu.CDCOnBoot.default.build.cdc_on_boot=0
1387113843

1387213844
m5stack-cores3.menu.MSCOnBoot.default=Disabled
1387313845
m5stack-cores3.menu.MSCOnBoot.default.build.msc_on_boot=0
@@ -13886,13 +13858,27 @@ m5stack-cores3.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
1388613858
m5stack-cores3.menu.UploadMode.cdc.upload.use_1200bps_touch=true
1388713859
m5stack-cores3.menu.UploadMode.cdc.upload.wait_for_upload_port=true
1388813860

13889-
m5stack-cores3.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
13861+
m5stack-cores3.menu.PartitionScheme.default_16MB=Default 16MB with spiffs (2x 6.5 MB APP/3.6MB SPIFFS)
13862+
m5stack-cores3.menu.PartitionScheme.default_16MB.build.partitions=default_16MB
13863+
m5stack-cores3.menu.PartitionScheme.default_16MB.upload.maximum_size=6553600
13864+
m5stack-cores3.menu.PartitionScheme.default=4MB with spiffs (2x 1.2MB APP/1.5MB SPIFFS)
1389013865
m5stack-cores3.menu.PartitionScheme.default.build.partitions=default
13891-
m5stack-cores3.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
13866+
m5stack-cores3.menu.PartitionScheme.defaultffat=4MB with ffat (2x 1.2MB APP/1.5MB FATFS)
1389213867
m5stack-cores3.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
13893-
m5stack-cores3.menu.PartitionScheme.default_8MB=8M with spiffs (3MB APP/1.5MB SPIFFS)
13868+
m5stack-cores3.menu.PartitionScheme.default_8MB=8M with spiffs (2x 3MB APP/1.5MB SPIFFS)
1389413869
m5stack-cores3.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
1389513870
m5stack-cores3.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
13871+
m5stack-cores3.menu.PartitionScheme.large_spiffs=16MB with Large SPIFFS (2x 4MB APP/7MB SPIFFS)
13872+
m5stack-cores3.menu.PartitionScheme.large_spiffs.build.partitions=large_spiffs_16MB
13873+
m5stack-cores3.menu.PartitionScheme.large_spiffs.upload.maximum_size=4685824
13874+
m5stack-cores3.menu.PartitionScheme.factory_4apps=16MB+Factory (4x 3MB APP/2MB SPIFFS)
13875+
m5stack-cores3.menu.PartitionScheme.factory_4apps.build.custom_partitions=partitions_16MB_factory_4_apps
13876+
# m5stack-cores3.menu.PartitionScheme.factory_4apps.upload.extra_flags=0xc10000 "{runtime.platform.path}/variants/{build.variant}/firmware.bin"
13877+
m5stack-cores3.menu.PartitionScheme.factory_4apps.upload.maximum_size=3145728
13878+
m5stack-cores3.menu.PartitionScheme.factory_6apps=16MB+Factory (6x 2MB APP/2MB SPIFFS)
13879+
m5stack-cores3.menu.PartitionScheme.factory_6apps.build.custom_partitions=partitions_16MB_factory_6_apps
13880+
# m5stack-cores3.menu.PartitionScheme.factory_6apps.upload.extra_flags=0xc10000 "{runtime.platform.path}/variants/{build.variant}/firmware.bin"
13881+
m5stack-cores3.menu.PartitionScheme.factory_6apps.upload.maximum_size=2097152
1389613882

1389713883
m5stack-cores3.menu.CPUFreq.240=240MHz (WiFi)
1389813884
m5stack-cores3.menu.CPUFreq.240.build.f_cpu=240000000L
@@ -13921,6 +13907,8 @@ m5stack-cores3.menu.UploadSpeed.460800.macosx=460800
1392113907
m5stack-cores3.menu.UploadSpeed.460800.upload.speed=460800
1392213908
m5stack-cores3.menu.UploadSpeed.512000.windows=512000
1392313909
m5stack-cores3.menu.UploadSpeed.512000.upload.speed=512000
13910+
m5stack-cores3.menu.UploadSpeed.1500000=1500000
13911+
m5stack-cores3.menu.UploadSpeed.1500000.upload.speed=1500000
1392413912

1392513913
m5stack-cores3.menu.DebugLevel.none=None
1392613914
m5stack-cores3.menu.DebugLevel.none.build.code_debug=0
@@ -25797,4 +25785,4 @@ namino_arancio.menu.EraseFlash.all=Enabled
2579725785
namino_arancio.menu.EraseFlash.all.upload.erase_cmd=-e
2579825786

2579925787
##############################################################
25800-
25788+

‎cores/esp32/HardwareSerial.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ void HardwareSerial::end(bool fullyTerminate)
446446
_rxPin = _txPin = _ctsPin = _rtsPin = -1;
447447

448448
}
449-
delay(10);
449+
450450
uartEnd(_uart);
451451
_uart = 0;
452452
_destroyEventTask();

‎variants/lilygo_t_display/pins_arduino.h.txt renamed to ‎variants/lilygo_t_display/pins_arduino.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,4 @@ static const uint8_t VBAT = 34;
6464
static const uint8_t RIGHT_BUTTON = 35;
6565
static const uint8_t LEFT_BUTTON = 0;
6666

67-
#endif /* Pins_Arduino_h */
67+
#endif /* Pins_Arduino_h */

‎variants/m5stack_cores3/partitions_16MB_factory_4_apps.csv

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

‎variants/m5stack_cores3/partitions_16MB_factory_6_apps.csv

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)