Skip to content

Commit 6ff35cb

Browse files
shahpiyushvshahpiyushv
authored
Merge branch 'master' into task/rmaker_minor_changes
2 parents 43d6955 + cdd48e4 commit 6ff35cb

File tree

2 files changed

+114
-129
lines changed

2 files changed

+114
-129
lines changed

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
### Need help or have a question? Join the chat at [![https://gitter.im/espressif/arduino-esp32](https://badges.gitter.im/espressif/arduino-esp32.svg)](https://gitter.im/espressif/arduino-esp32?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
55

66
## Contents
7-
- [EP32S2 and ESP32C3 Support](#esp32s2-and-esp32c3-support)
7+
- [ESP32-S2 and ESP32-C3 Support](#esp32-s2-and-esp32-c3-support)
88
- [Development Status](#development-status)
99
- [Installation Instructions](#installation-instructions)
1010
- [Decoding Exceptions](#decoding-exceptions)
1111
- [Issue/Bug report template](#issuebug-report-template)
1212
- [ESP32Dev Board PINMAP](#esp32dev-board-pinmap)
1313

14-
### EP32S2 and ESP32C3 Support
15-
If you want to test ESP32S2 and/or ESP32C3 through the board manager, please use the development release link: `https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_dev_index.json` and install the latest 2.0.0 version.
14+
### ESP32-S2 and ESP32-C3 Support
15+
If you want to test ESP32-S2 and/or ESP32-C3 through the board manager, please use the development release link: `https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_dev_index.json` and install the latest 2.0.0 version.
1616

1717
### Development Status
1818

‎boards.txt

+111-126
Original file line numberDiff line numberDiff line change
@@ -962,132 +962,117 @@ feathers2.menu.DebugLevel.verbose.build.code_debug=5
962962

963963
##############################################################
964964

965-
pros2.name=UM ProS2
966-
pros2.vid.0=0x239A
967-
pros2.pid.0=0x80A9
968-
969-
pros2.upload.tool=esptool_py
970-
pros2.upload.maximum_size=1310720
971-
pros2.upload.maximum_data_size=327680
972-
pros2.upload.flags=
973-
pros2.upload.extra_flags=
974-
pros2.upload.use_1200bps_touch=true
975-
pros2.upload.wait_for_upload_port=true
976-
977-
pros2.serial.disableDTR=false
978-
pros2.serial.disableRTS=false
979-
980-
pros2.build.tarch=xtensa
981-
pros2.build.bootloader_addr=0x1000
982-
pros2.build.target=esp32s2
983-
pros2.build.mcu=esp32s2
984-
pros2.build.core=esp32
985-
pros2.build.variant=um_pros2
986-
pros2.build.board=PROS2
987-
988-
pros2.build.serial=1
989-
pros2.build.f_cpu=240000000L
990-
pros2.build.flash_size=16MB
991-
pros2.build.flash_freq=80m
992-
pros2.build.flash_mode=dio
993-
pros2.build.boot=qio
994-
pros2.build.partitions=fatflash
995-
pros2.build.defines=
996-
997-
pros2.menu.SerialMode.cdc=USB CDC
998-
pros2.menu.SerialMode.cdc.build.serial=1
999-
pros2.menu.SerialMode.default=UART0
1000-
pros2.menu.SerialMode.default.build.serial=0
1001-
1002-
pros2.menu.PSRAM.enabled=Enabled
1003-
pros2.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
1004-
pros2.menu.PSRAM.disabled=Disabled
1005-
pros2.menu.PSRAM.disabled.build.defines=
1006-
1007-
pros2.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FAT)
1008-
pros2.menu.PartitionScheme.fatflash.build.partitions=ffat
1009-
pros2.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
1010-
pros2.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9MB FATFS)
1011-
pros2.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
1012-
pros2.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
1013-
pros2.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
1014-
pros2.menu.PartitionScheme.default.build.partitions=default
1015-
pros2.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
1016-
pros2.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
1017-
pros2.menu.PartitionScheme.default_8MB=8M Flash (3MB APP/1.5MB FAT)
1018-
pros2.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
1019-
pros2.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
1020-
pros2.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
1021-
pros2.menu.PartitionScheme.minimal.build.partitions=minimal
1022-
pros2.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
1023-
pros2.menu.PartitionScheme.no_ota.build.partitions=no_ota
1024-
pros2.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
1025-
pros2.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
1026-
pros2.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
1027-
pros2.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
1028-
pros2.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
1029-
pros2.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
1030-
pros2.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
1031-
pros2.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
1032-
pros2.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
1033-
pros2.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
1034-
pros2.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
1035-
pros2.menu.PartitionScheme.huge_app.build.partitions=huge_app
1036-
pros2.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
1037-
pros2.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
1038-
pros2.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
1039-
pros2.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
1040-
1041-
pros2.menu.CPUFreq.240=240MHz (WiFi)
1042-
pros2.menu.CPUFreq.240.build.f_cpu=240000000L
1043-
pros2.menu.CPUFreq.160=160MHz (WiFi)
1044-
pros2.menu.CPUFreq.160.build.f_cpu=160000000L
1045-
pros2.menu.CPUFreq.80=80MHz (WiFi)
1046-
pros2.menu.CPUFreq.80.build.f_cpu=80000000L
1047-
pros2.menu.CPUFreq.40=40MHz
1048-
pros2.menu.CPUFreq.40.build.f_cpu=40000000L
1049-
pros2.menu.CPUFreq.20=20MHz
1050-
pros2.menu.CPUFreq.20.build.f_cpu=20000000L
1051-
pros2.menu.CPUFreq.10=10MHz
1052-
pros2.menu.CPUFreq.10.build.f_cpu=10000000L
1053-
1054-
pros2.menu.FlashSize.16M=16MB (128Mb)
1055-
pros2.menu.FlashSize.16M.build.flash_size=16MB
1056-
pros2.menu.FlashSize.4M=4MB (32Mb)
1057-
pros2.menu.FlashSize.4M.build.flash_size=4MB
1058-
pros2.menu.FlashSize.8M=8MB (64Mb)
1059-
pros2.menu.FlashSize.8M.build.flash_size=8MB
1060-
pros2.menu.FlashSize.8M.build.partitions=default_8MB
1061-
pros2.menu.FlashSize.2M=2MB (16Mb)
1062-
pros2.menu.FlashSize.2M.build.flash_size=2MB
1063-
pros2.menu.FlashSize.2M.build.partitions=minimal
1064-
1065-
pros2.menu.UploadSpeed.921600=921600
1066-
pros2.menu.UploadSpeed.921600.upload.speed=921600
1067-
pros2.menu.UploadSpeed.115200=115200
1068-
pros2.menu.UploadSpeed.115200.upload.speed=115200
1069-
pros2.menu.UploadSpeed.256000.windows=256000
1070-
pros2.menu.UploadSpeed.256000.upload.speed=256000
1071-
pros2.menu.UploadSpeed.230400.windows.upload.speed=256000
1072-
pros2.menu.UploadSpeed.230400=230400
1073-
pros2.menu.UploadSpeed.230400.upload.speed=230400
1074-
pros2.menu.UploadSpeed.460800.linux=460800
1075-
pros2.menu.UploadSpeed.460800.macosx=460800
1076-
pros2.menu.UploadSpeed.460800.upload.speed=460800
1077-
1078-
1079-
pros2.menu.DebugLevel.none=None
1080-
pros2.menu.DebugLevel.none.build.code_debug=0
1081-
pros2.menu.DebugLevel.error=Error
1082-
pros2.menu.DebugLevel.error.build.code_debug=1
1083-
pros2.menu.DebugLevel.warn=Warn
1084-
pros2.menu.DebugLevel.warn.build.code_debug=2
1085-
pros2.menu.DebugLevel.info=Info
1086-
pros2.menu.DebugLevel.info.build.code_debug=3
1087-
pros2.menu.DebugLevel.debug=Debug
1088-
pros2.menu.DebugLevel.debug.build.code_debug=4
1089-
pros2.menu.DebugLevel.verbose=Verbose
1090-
pros2.menu.DebugLevel.verbose.build.code_debug=5
965+
tinys2.name=UM TinyS2
966+
tinys2.vid.0=0x303a
967+
tinys2.pid.0=0x8001
968+
969+
tinys2.upload.tool=esptool_py
970+
tinys2.upload.maximum_size=1310720
971+
tinys2.upload.maximum_data_size=327680
972+
tinys2.upload.flags=
973+
tinys2.upload.use_1200bps_touch=true
974+
tinys2.upload.wait_for_upload_port=true
975+
976+
tinys2.serial.disableDTR=false
977+
tinys2.serial.disableRTS=false
978+
979+
tinys2.build.tarch=xtensa
980+
tinys2.build.bootloader_addr=0x1000
981+
tinys2.build.target=esp32s2
982+
tinys2.build.mcu=esp32s2
983+
tinys2.build.core=esp32
984+
tinys2.build.variant=um_tinys2
985+
tinys2.build.board=TINYS2
986+
987+
tinys2.build.serial=1
988+
tinys2.build.f_cpu=240000000L
989+
tinys2.build.flash_size=4MB
990+
tinys2.build.flash_freq=80m
991+
tinys2.build.flash_mode=dio
992+
tinys2.build.boot=qio
993+
tinys2.build.partitions=default
994+
tinys2.build.defines=
995+
996+
tinys2.menu.SerialMode.cdc=USB CDC
997+
tinys2.menu.SerialMode.cdc.build.serial=1
998+
tinys2.menu.SerialMode.default=UART0
999+
tinys2.menu.SerialMode.default.build.serial=0
1000+
1001+
tinys2.menu.PSRAM.enabled=Enabled
1002+
tinys2.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
1003+
tinys2.menu.PSRAM.disabled=Disabled
1004+
tinys2.menu.PSRAM.disabled.build.defines=
1005+
1006+
tinys2.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
1007+
tinys2.menu.PartitionScheme.default.build.partitions=default
1008+
tinys2.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
1009+
tinys2.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
1010+
tinys2.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
1011+
tinys2.menu.PartitionScheme.minimal.build.partitions=minimal
1012+
tinys2.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
1013+
tinys2.menu.PartitionScheme.no_ota.build.partitions=no_ota
1014+
tinys2.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
1015+
tinys2.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
1016+
tinys2.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
1017+
tinys2.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
1018+
tinys2.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
1019+
tinys2.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
1020+
tinys2.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
1021+
tinys2.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
1022+
tinys2.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
1023+
tinys2.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
1024+
tinys2.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
1025+
tinys2.menu.PartitionScheme.huge_app.build.partitions=huge_app
1026+
tinys2.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
1027+
tinys2.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
1028+
tinys2.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
1029+
tinys2.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
1030+
1031+
tinys2.menu.CPUFreq.240=240MHz (WiFi)
1032+
tinys2.menu.CPUFreq.240.build.f_cpu=240000000L
1033+
tinys2.menu.CPUFreq.160=160MHz (WiFi)
1034+
tinys2.menu.CPUFreq.160.build.f_cpu=160000000L
1035+
tinys2.menu.CPUFreq.80=80MHz (WiFi)
1036+
tinys2.menu.CPUFreq.80.build.f_cpu=80000000L
1037+
tinys2.menu.CPUFreq.40=40MHz
1038+
tinys2.menu.CPUFreq.40.build.f_cpu=40000000L
1039+
tinys2.menu.CPUFreq.20=20MHz
1040+
tinys2.menu.CPUFreq.20.build.f_cpu=20000000L
1041+
tinys2.menu.CPUFreq.10=10MHz
1042+
tinys2.menu.CPUFreq.10.build.f_cpu=10000000L
1043+
1044+
tinys2.menu.FlashSize.4M=4MB (32Mb)
1045+
tinys2.menu.FlashSize.4M.build.flash_size=4MB
1046+
tinys2.menu.FlashSize.2M=2MB (16Mb)
1047+
tinys2.menu.FlashSize.2M.build.flash_size=2MB
1048+
tinys2.menu.FlashSize.2M.build.partitions=minimal
1049+
1050+
tinys2.menu.UploadSpeed.921600=921600
1051+
tinys2.menu.UploadSpeed.921600.upload.speed=921600
1052+
tinys2.menu.UploadSpeed.115200=115200
1053+
tinys2.menu.UploadSpeed.115200.upload.speed=115200
1054+
tinys2.menu.UploadSpeed.256000.windows=256000
1055+
tinys2.menu.UploadSpeed.256000.upload.speed=256000
1056+
tinys2.menu.UploadSpeed.230400.windows.upload.speed=256000
1057+
tinys2.menu.UploadSpeed.230400=230400
1058+
tinys2.menu.UploadSpeed.230400.upload.speed=230400
1059+
tinys2.menu.UploadSpeed.460800.linux=460800
1060+
tinys2.menu.UploadSpeed.460800.macosx=460800
1061+
tinys2.menu.UploadSpeed.460800.upload.speed=460800
1062+
1063+
1064+
tinys2.menu.DebugLevel.none=None
1065+
tinys2.menu.DebugLevel.none.build.code_debug=0
1066+
tinys2.menu.DebugLevel.error=Error
1067+
tinys2.menu.DebugLevel.error.build.code_debug=1
1068+
tinys2.menu.DebugLevel.warn=Warn
1069+
tinys2.menu.DebugLevel.warn.build.code_debug=2
1070+
tinys2.menu.DebugLevel.info=Info
1071+
tinys2.menu.DebugLevel.info.build.code_debug=3
1072+
tinys2.menu.DebugLevel.debug=Debug
1073+
tinys2.menu.DebugLevel.debug.build.code_debug=4
1074+
tinys2.menu.DebugLevel.verbose=Verbose
1075+
tinys2.menu.DebugLevel.verbose.build.code_debug=5
10911076

10921077
##############################################################
10931078
S_ODI_Ultra.name=S.ODI Ultra v1

0 commit comments

Comments
 (0)