Skip to content

Commit e3855a1

Browse files
Jason2866Jason2866
authored
Merge pull request #16 from tasmota/espressif-master
Espressif master
2 parents f50cd1c + d4afbe5 commit e3855a1

File tree

759 files changed

+46492
-4882
lines changed

Some content is hidden

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

759 files changed

+46492
-4882
lines changed

Diff for: ‎.github/workflows/test_selfhosted_runner.yml

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Test Github action on self hosted RPI runnes
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
9+
jobs:
10+
build:
11+
name: Dummy test - self hosted GHR
12+
runs-on: self-hosted
13+
steps:
14+
- name: Check out repo
15+
uses: actions/checkout@v2
16+
- name: Test message 1
17+
run: echo "This is test message"
18+
- name: Test message 2
19+
run: echo "This is test message2"
20+
- name: List directory
21+
run: ls
22+
- name: Create copy of README
23+
run: cp README.md README2.md
24+
- name: Read README2
25+
run: cat README2.md
26+
- name: Delete README2
27+
run: rm README2.md

Diff for: ‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ You can use [Arduino-ESP32 Online Documentation](https://docs.espressif.com/proj
4343
You can use [EspExceptionDecoder](https://github.com/me-no-dev/EspExceptionDecoder) to get meaningful call trace.
4444

4545
### Issue/Bug report template
46-
Before reporting an issue, make sure you've searched for similar one that was already created. Also make sure to go through all the issues labelled as [for reference](https://github.com/espressif/arduino-esp32/issues?utf8=%E2%9C%93&q=is%3Aissue%20label%3A%22for%20reference%22%20).
46+
Before reporting an issue, make sure you've searched for similar one that was already created. Also make sure to go through all the issues labelled as [Type: For reference](https://github.com/espressif/arduino-esp32/issues?q=is%3Aissue+label%3A%22Type%3A+For+reference%22+).
4747

4848
Finally, if you are sure no one else had the issue, follow the [issue template](docs/ISSUE_TEMPLATE.md) while reporting any issue.
4949

Diff for: ‎boards.txt

+159-16
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,6 @@ esp32c3.menu.CDCOnBoot.default.build.cdc_on_boot=0
5757
esp32c3.menu.CDCOnBoot.cdc=Enabled
5858
esp32c3.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
5959

60-
esp32c3.menu.UploadMode.default=UART0
61-
esp32c3.menu.UploadMode.default.upload.use_1200bps_touch=false
62-
esp32c3.menu.UploadMode.default.upload.wait_for_upload_port=false
63-
esp32c3.menu.UploadMode.cdc=Internal USB
64-
esp32c3.menu.UploadMode.cdc.upload.use_1200bps_touch=true
65-
esp32c3.menu.UploadMode.cdc.upload.wait_for_upload_port=true
66-
6760
esp32c3.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
6861
esp32c3.menu.PartitionScheme.default.build.partitions=default
6962
esp32c3.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
@@ -2071,6 +2064,122 @@ ttgo-t7-v14-mini32.menu.DebugLevel.verbose.build.code_debug=5
20712064

20722065
##############################################################
20732066

2067+
ttgo-t-oi-plus.name=TTGO T-OI PLUS RISC-V ESP32-C3
2068+
2069+
ttgo-t-oi-plus.upload.tool=esptool_py
2070+
ttgo-t-oi-plus.upload.maximum_size=1310720
2071+
ttgo-t-oi-plus.upload.maximum_data_size=327680
2072+
ttgo-t-oi-plus.upload.flags=
2073+
ttgo-t-oi-plus.upload.extra_flags=
2074+
2075+
ttgo-t-oi-plus.serial.disableDTR=false
2076+
ttgo-t-oi-plus.serial.disableRTS=false
2077+
2078+
ttgo-t-oi-plus.build.tarch=riscv32
2079+
ttgo-t-oi-plus.build.target=esp
2080+
ttgo-t-oi-plus.build.mcu=esp32c3
2081+
ttgo-t-oi-plus.build.core=esp32
2082+
ttgo-t-oi-plus.build.variant=ttgo-t-oi-plus
2083+
ttgo-t-oi-plus.build.board=TTGO-T-OI-PLUS_DEV
2084+
ttgo-t-oi-plus.build.bootloader_addr=0x0
2085+
2086+
ttgo-t-oi-plus.build.cdc_on_boot=0
2087+
ttgo-t-oi-plus.build.f_cpu=160000000L
2088+
ttgo-t-oi-plus.build.flash_size=4MB
2089+
ttgo-t-oi-plus.build.flash_freq=80m
2090+
ttgo-t-oi-plus.build.flash_mode=qio
2091+
ttgo-t-oi-plus.build.boot=qio
2092+
ttgo-t-oi-plus.build.partitions=default
2093+
ttgo-t-oi-plus.build.defines=
2094+
2095+
ttgo-t-oi-plus.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
2096+
ttgo-t-oi-plus.menu.PartitionScheme.default.build.partitions=default
2097+
ttgo-t-oi-plus.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
2098+
ttgo-t-oi-plus.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
2099+
ttgo-t-oi-plus.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
2100+
ttgo-t-oi-plus.menu.PartitionScheme.minimal.build.partitions=minimal
2101+
ttgo-t-oi-plus.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
2102+
ttgo-t-oi-plus.menu.PartitionScheme.no_ota.build.partitions=no_ota
2103+
ttgo-t-oi-plus.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
2104+
ttgo-t-oi-plus.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
2105+
ttgo-t-oi-plus.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
2106+
ttgo-t-oi-plus.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
2107+
ttgo-t-oi-plus.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
2108+
ttgo-t-oi-plus.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
2109+
ttgo-t-oi-plus.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
2110+
ttgo-t-oi-plus.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
2111+
ttgo-t-oi-plus.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
2112+
ttgo-t-oi-plus.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
2113+
ttgo-t-oi-plus.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
2114+
ttgo-t-oi-plus.menu.PartitionScheme.huge_app.build.partitions=huge_app
2115+
ttgo-t-oi-plus.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
2116+
ttgo-t-oi-plus.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
2117+
ttgo-t-oi-plus.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
2118+
ttgo-t-oi-plus.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
2119+
2120+
2121+
ttgo-t-oi-plus.menu.CPUFreq.160=160MHz (WiFi)
2122+
ttgo-t-oi-plus.menu.CPUFreq.160.build.f_cpu=160000000L
2123+
ttgo-t-oi-plus.menu.CPUFreq.80=80MHz (WiFi)
2124+
ttgo-t-oi-plus.menu.CPUFreq.80.build.f_cpu=80000000L
2125+
ttgo-t-oi-plus.menu.CPUFreq.40=40MHz
2126+
ttgo-t-oi-plus.menu.CPUFreq.40.build.f_cpu=40000000L
2127+
ttgo-t-oi-plus.menu.CPUFreq.20=20MHz
2128+
ttgo-t-oi-plus.menu.CPUFreq.20.build.f_cpu=20000000L
2129+
ttgo-t-oi-plus.menu.CPUFreq.10=10MHz
2130+
ttgo-t-oi-plus.menu.CPUFreq.10.build.f_cpu=10000000L
2131+
2132+
ttgo-t-oi-plus.menu.FlashMode.qio=QIO
2133+
ttgo-t-oi-plus.menu.FlashMode.qio.build.flash_mode=dio
2134+
ttgo-t-oi-plus.menu.FlashMode.qio.build.boot=qio
2135+
ttgo-t-oi-plus.menu.FlashMode.dio=DIO
2136+
ttgo-t-oi-plus.menu.FlashMode.dio.build.flash_mode=dio
2137+
ttgo-t-oi-plus.menu.FlashMode.dio.build.boot=dio
2138+
ttgo-t-oi-plus.menu.FlashMode.qout=QOUT
2139+
ttgo-t-oi-plus.menu.FlashMode.qout.build.flash_mode=dout
2140+
ttgo-t-oi-plus.menu.FlashMode.qout.build.boot=qout
2141+
ttgo-t-oi-plus.menu.FlashMode.dout=DOUT
2142+
ttgo-t-oi-plus.menu.FlashMode.dout.build.flash_mode=dout
2143+
ttgo-t-oi-plus.menu.FlashMode.dout.build.boot=dout
2144+
2145+
ttgo-t-oi-plus.menu.FlashFreq.80=80MHz
2146+
ttgo-t-oi-plus.menu.FlashFreq.80.build.flash_freq=80m
2147+
ttgo-t-oi-plus.menu.FlashFreq.40=40MHz
2148+
ttgo-t-oi-plus.menu.FlashFreq.40.build.flash_freq=40m
2149+
2150+
ttgo-t-oi-plus.menu.FlashSize.4M=4MB (32Mb)
2151+
ttgo-t-oi-plus.menu.FlashSize.4M.build.flash_size=4MB
2152+
2153+
ttgo-t-oi-plus.menu.UploadSpeed.921600=921600
2154+
ttgo-t-oi-plus.menu.UploadSpeed.921600.upload.speed=921600
2155+
ttgo-t-oi-plus.menu.UploadSpeed.115200=115200
2156+
ttgo-t-oi-plus.menu.UploadSpeed.115200.upload.speed=115200
2157+
ttgo-t-oi-plus.menu.UploadSpeed.256000.windows=256000
2158+
ttgo-t-oi-plus.menu.UploadSpeed.256000.upload.speed=256000
2159+
ttgo-t-oi-plus.menu.UploadSpeed.230400.windows.upload.speed=256000
2160+
ttgo-t-oi-plus.menu.UploadSpeed.230400=230400
2161+
ttgo-t-oi-plus.menu.UploadSpeed.230400.upload.speed=230400
2162+
ttgo-t-oi-plus.menu.UploadSpeed.460800.linux=460800
2163+
ttgo-t-oi-plus.menu.UploadSpeed.460800.macosx=460800
2164+
ttgo-t-oi-plus.menu.UploadSpeed.460800.upload.speed=460800
2165+
ttgo-t-oi-plus.menu.UploadSpeed.512000.windows=512000
2166+
ttgo-t-oi-plus.menu.UploadSpeed.512000.upload.speed=512000
2167+
2168+
ttgo-t-oi-plus.menu.DebugLevel.none=None
2169+
ttgo-t-oi-plus.menu.DebugLevel.none.build.code_debug=0
2170+
ttgo-t-oi-plus.menu.DebugLevel.error=Error
2171+
ttgo-t-oi-plus.menu.DebugLevel.error.build.code_debug=1
2172+
ttgo-t-oi-plus.menu.DebugLevel.warn=Warn
2173+
ttgo-t-oi-plus.menu.DebugLevel.warn.build.code_debug=2
2174+
ttgo-t-oi-plus.menu.DebugLevel.info=Info
2175+
ttgo-t-oi-plus.menu.DebugLevel.info.build.code_debug=3
2176+
ttgo-t-oi-plus.menu.DebugLevel.debug=Debug
2177+
ttgo-t-oi-plus.menu.DebugLevel.debug.build.code_debug=4
2178+
ttgo-t-oi-plus.menu.DebugLevel.verbose=Verbose
2179+
ttgo-t-oi-plus.menu.DebugLevel.verbose.build.code_debug=5
2180+
2181+
##############################################################
2182+
20742183
cw02.name=XinaBox CW02
20752184

20762185
cw02.upload.tool=esptool_py
@@ -3801,6 +3910,13 @@ adafruit_metro_esp32s2.menu.DFUOnBoot.default.build.dfu_on_boot=0
38013910
adafruit_metro_esp32s2.menu.DFUOnBoot.dfu=Enabled
38023911
adafruit_metro_esp32s2.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
38033912

3913+
adafruit_metro_esp32s2.menu.UploadMode.cdc=Internal USB
3914+
adafruit_metro_esp32s2.menu.UploadMode.cdc.upload.use_1200bps_touch=true
3915+
adafruit_metro_esp32s2.menu.UploadMode.cdc.upload.wait_for_upload_port=true
3916+
adafruit_metro_esp32s2.menu.UploadMode.default=UART0
3917+
adafruit_metro_esp32s2.menu.UploadMode.default.upload.use_1200bps_touch=false
3918+
adafruit_metro_esp32s2.menu.UploadMode.default.upload.wait_for_upload_port=false
3919+
38043920
adafruit_metro_esp32s2.menu.PSRAM.enabled=Enabled
38053921
adafruit_metro_esp32s2.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
38063922
adafruit_metro_esp32s2.menu.PSRAM.disabled=Disabled
@@ -3915,11 +4031,11 @@ adafruit_metro_esp32s2.menu.DebugLevel.verbose.build.code_debug=5
39154031

39164032
adafruit_magtag29_esp32s2.name=Adafruit MagTag 2.9"
39174033
adafruit_magtag29_esp32s2.vid.0=0x239A
3918-
adafruit_magtag29_esp32s2.pid.0=0x80DF
4034+
adafruit_magtag29_esp32s2.pid.0=0x80E5
39194035
adafruit_magtag29_esp32s2.vid.1=0x239A
3920-
adafruit_magtag29_esp32s2.pid.1=0x00DF
4036+
adafruit_magtag29_esp32s2.pid.1=0x00E5
39214037
adafruit_magtag29_esp32s2.vid.1=0x239A
3922-
adafruit_magtag29_esp32s2.pid.1=0x80E0
4038+
adafruit_magtag29_esp32s2.pid.1=0x80E6
39234039

39244040
adafruit_magtag29_esp32s2.upload.tool=esptool_py
39254041
adafruit_magtag29_esp32s2.upload.maximum_size=1310720
@@ -3966,6 +4082,13 @@ adafruit_magtag29_esp32s2.menu.DFUOnBoot.default.build.dfu_on_boot=0
39664082
adafruit_magtag29_esp32s2.menu.DFUOnBoot.dfu=Enabled
39674083
adafruit_magtag29_esp32s2.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
39684084

4085+
adafruit_magtag29_esp32s2.menu.UploadMode.cdc=Internal USB
4086+
adafruit_magtag29_esp32s2.menu.UploadMode.cdc.upload.use_1200bps_touch=true
4087+
adafruit_magtag29_esp32s2.menu.UploadMode.cdc.upload.wait_for_upload_port=true
4088+
adafruit_magtag29_esp32s2.menu.UploadMode.default=UART0
4089+
adafruit_magtag29_esp32s2.menu.UploadMode.default.upload.use_1200bps_touch=false
4090+
adafruit_magtag29_esp32s2.menu.UploadMode.default.upload.wait_for_upload_port=false
4091+
39694092
adafruit_magtag29_esp32s2.menu.PSRAM.enabled=Enabled
39704093
adafruit_magtag29_esp32s2.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
39714094
adafruit_magtag29_esp32s2.menu.PSRAM.disabled=Disabled
@@ -4131,6 +4254,13 @@ adafruit_funhouse_esp32s2.menu.DFUOnBoot.default.build.dfu_on_boot=0
41314254
adafruit_funhouse_esp32s2.menu.DFUOnBoot.dfu=Enabled
41324255
adafruit_funhouse_esp32s2.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
41334256

4257+
adafruit_funhouse_esp32s2.menu.UploadMode.cdc=Internal USB
4258+
adafruit_funhouse_esp32s2.menu.UploadMode.cdc.upload.use_1200bps_touch=true
4259+
adafruit_funhouse_esp32s2.menu.UploadMode.cdc.upload.wait_for_upload_port=true
4260+
adafruit_funhouse_esp32s2.menu.UploadMode.default=UART0
4261+
adafruit_funhouse_esp32s2.menu.UploadMode.default.upload.use_1200bps_touch=false
4262+
adafruit_funhouse_esp32s2.menu.UploadMode.default.upload.wait_for_upload_port=false
4263+
41344264
adafruit_funhouse_esp32s2.menu.PSRAM.enabled=Enabled
41354265
adafruit_funhouse_esp32s2.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
41364266
adafruit_funhouse_esp32s2.menu.PSRAM.disabled=Disabled
@@ -9386,19 +9516,32 @@ atmegazero_esp32s2.build.core=esp32
93869516
atmegazero_esp32s2.build.variant=atmegazero_esp32s2
93879517
atmegazero_esp32s2.build.board=atmegazero_esp32s2
93889518

9519+
atmegazero_esp32s2.build.cdc_on_boot=1
9520+
atmegazero_esp32s2.build.msc_on_boot=0
9521+
atmegazero_esp32s2.build.dfu_on_boot=0
93899522
atmegazero_esp32s2.build.serial=0
93909523
atmegazero_esp32s2.build.f_cpu=240000000L
9391-
atmegazero_esp32s2.build.flash_size=4MB
9392-
atmegazero_esp32s2.build.flash_freq=80m
9524+
atmegazero_esp32s2.build.flash_size=16MB
9525+
atmegazero_esp32s2.build.flash_freq=40m
93939526
atmegazero_esp32s2.build.flash_mode=qio
93949527
atmegazero_esp32s2.build.boot=qio
93959528
atmegazero_esp32s2.build.partitions=default
93969529
atmegazero_esp32s2.build.defines=
93979530

9398-
atmegazero_esp32s2.menu.SerialMode.cdc=USB CDC
9399-
atmegazero_esp32s2.menu.SerialMode.cdc.build.serial=1
9400-
atmegazero_esp32s2.menu.SerialMode.default=UART0
9401-
atmegazero_esp32s2.menu.SerialMode.default.build.serial=0
9531+
atmegazero_esp32s2.menu.CDCOnBoot.cdc=Enabled
9532+
atmegazero_esp32s2.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
9533+
atmegazero_esp32s2.menu.CDCOnBoot.default=Disabled
9534+
atmegazero_esp32s2.menu.CDCOnBoot.default.build.cdc_on_boot=0
9535+
9536+
atmegazero_esp32s2.menu.MSCOnBoot.default=Disabled
9537+
atmegazero_esp32s2.menu.MSCOnBoot.default.build.msc_on_boot=0
9538+
atmegazero_esp32s2.menu.MSCOnBoot.msc=Enabled
9539+
atmegazero_esp32s2.menu.MSCOnBoot.msc.build.msc_on_boot=1
9540+
9541+
atmegazero_esp32s2.menu.DFUOnBoot.default=Disabled
9542+
atmegazero_esp32s2.menu.DFUOnBoot.default.build.dfu_on_boot=0
9543+
atmegazero_esp32s2.menu.DFUOnBoot.dfu=Enabled
9544+
atmegazero_esp32s2.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
94029545

94039546
atmegazero_esp32s2.menu.PSRAM.disabled=Disabled
94049547
atmegazero_esp32s2.menu.PSRAM.disabled.build.defines=

Diff for: ‎cores/esp32/Esp.cpp

+12-1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ extern "C" {
3838
#define ESP_FLASH_IMAGE_BASE 0x1000 // Flash offset containing flash size and spi mode
3939
#elif CONFIG_IDF_TARGET_ESP32S2
4040
#include "esp32s2/rom/spi_flash.h"
41+
#include "soc/efuse_reg.h"
4142
#define ESP_FLASH_IMAGE_BASE 0x1000
4243
#elif CONFIG_IDF_TARGET_ESP32C3
4344
#include "esp32c3/rom/spi_flash.h"
@@ -274,7 +275,17 @@ const char * EspClass::getChipModel(void)
274275
return "Unknown";
275276
}
276277
#elif CONFIG_IDF_TARGET_ESP32S2
277-
return "ESP32-S2";
278+
uint32_t pkg_ver = REG_GET_FIELD(EFUSE_RD_MAC_SPI_SYS_3_REG, EFUSE_PKG_VERSION);
279+
switch (pkg_ver) {
280+
case 0:
281+
return "ESP32-S2";
282+
case 1:
283+
return "ESP32-S2FH16";
284+
case 2:
285+
return "ESP32-S2FH32";
286+
default:
287+
return "ESP32-S2 (Unknown)";
288+
}
278289
#elif CONFIG_IDF_TARGET_ESP32S3
279290
return "ESP32-S3";
280291
#elif CONFIG_IDF_TARGET_ESP32C3

0 commit comments

Comments
 (0)