Skip to content

Commit 8569b2c

Browse files
me-no-devme-no-dev
committed
Initial Commit
1 parent 93d7785 commit 8569b2c

File tree

4,322 files changed

+646385
-251671
lines changed

Some content is hidden

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

4,322 files changed

+646385
-251671
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
tools/xtensa-esp32-elf
2+
tools/xtensa-esp32s2-elf
23
tools/dist
34
tools/esptool
45
tools/esptool.exe

‎CMakeLists.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,8 @@ set(BLE_SRCS
110110
libraries/BLE/src/GeneralUtils.cpp
111111
)
112112

113-
set(COMPONENT_SRCS ${CORE_SRCS} ${LIBRARY_SRCS} ${BLE_SRCS})
114113

115-
set(COMPONENT_ADD_INCLUDEDIRS
114+
set(includedirs
116115
variants/esp32/
117116
cores/esp32/
118117
libraries/ArduinoOTA/src
@@ -142,9 +141,10 @@ set(COMPONENT_ADD_INCLUDEDIRS
142141
libraries/Wire/src
143142
)
144143

145-
set(COMPONENT_PRIV_INCLUDEDIRS cores/esp32/libb64)
144+
set(srcs ${CORE_SRCS} ${LIBRARY_SRCS} ${BLE_SRCS})
145+
set(priv_includes cores/esp32/libb64)
146+
set(requires spi_flash mbedtls mdns esp_adc_cal)
147+
set(priv_requires fatfs nvs_flash app_update spiffs bootloader_support openssl bt main)
146148

147-
set(COMPONENT_REQUIRES spi_flash mbedtls mdns esp_adc_cal)
148-
set(COMPONENT_PRIV_REQUIRES fatfs nvs_flash app_update spiffs bootloader_support openssl bt)
149+
idf_component_register(INCLUDE_DIRS ${includedirs} PRIV_INCLUDE_DIRS ${priv_includes} SRCS ${srcs} REQUIRES ${requires} PRIV_REQUIRES ${priv_requires})
149150

150-
register_component()

‎Kconfig.projbuild

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ config ENABLE_ARDUINO_DEPENDS
55
select LWIP_SO_RCVBUF
66
select ETHERNET
77
select WIFI_ENABLED
8-
select ESP32_PHY_CALIBRATION_AND_DATA_STORAGE
8+
select ESP32_PHY_CALIBRATION_AND_DATA_STORAGE if IDF_TARGET_ESP32
99
select MEMMAP_SMP
1010
default "y"
1111

‎boards.txt

+134
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,140 @@ menu.Revision=Board Revision
1212
### DO NOT PUT BOARDS ABOVE THE OFFICIAL ESPRESSIF BOARDS! ###
1313
##############################################################
1414

15+
esp32s2.name=ESP32S2 Dev Module
16+
17+
esp32s2.upload.tool=esptool_py
18+
esp32s2.upload.maximum_size=1310720
19+
esp32s2.upload.maximum_data_size=327680
20+
esp32s2.upload.wait_for_upload_port=true
21+
22+
esp32s2.serial.disableDTR=true
23+
esp32s2.serial.disableRTS=true
24+
25+
esp32s2.build.mcu=esp32s2
26+
esp32s2.build.core=esp32
27+
esp32s2.build.variant=esp32
28+
esp32s2.build.board=ESP32S2_DEV
29+
30+
esp32s2.build.f_cpu=240000000L
31+
esp32s2.build.flash_size=4MB
32+
esp32s2.build.flash_freq=80m
33+
esp32s2.build.flash_mode=qio
34+
esp32s2.build.boot=qio
35+
esp32s2.build.partitions=default
36+
esp32s2.build.defines=
37+
38+
esp32s2.menu.PSRAM.disabled=Disabled
39+
esp32s2.menu.PSRAM.disabled.build.defines=
40+
esp32s2.menu.PSRAM.enabled=Enabled
41+
esp32s2.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
42+
43+
esp32s2.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
44+
esp32s2.menu.PartitionScheme.default.build.partitions=default
45+
esp32s2.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
46+
esp32s2.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
47+
esp32s2.menu.PartitionScheme.default_8MB=8M Flash (3MB APP/1.5MB FAT)
48+
esp32s2.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
49+
esp32s2.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
50+
esp32s2.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
51+
esp32s2.menu.PartitionScheme.minimal.build.partitions=minimal
52+
esp32s2.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
53+
esp32s2.menu.PartitionScheme.no_ota.build.partitions=no_ota
54+
esp32s2.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
55+
esp32s2.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
56+
esp32s2.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
57+
esp32s2.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
58+
esp32s2.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
59+
esp32s2.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
60+
esp32s2.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
61+
esp32s2.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
62+
esp32s2.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
63+
esp32s2.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
64+
esp32s2.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
65+
esp32s2.menu.PartitionScheme.huge_app.build.partitions=huge_app
66+
esp32s2.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
67+
esp32s2.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
68+
esp32s2.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
69+
esp32s2.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
70+
esp32s2.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FAT)
71+
esp32s2.menu.PartitionScheme.fatflash.build.partitions=ffat
72+
esp32s2.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
73+
esp32s2.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9MB FATFS)
74+
esp32s2.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
75+
esp32s2.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
76+
77+
esp32s2.menu.CPUFreq.240=240MHz (WiFi)
78+
esp32s2.menu.CPUFreq.240.build.f_cpu=240000000L
79+
esp32s2.menu.CPUFreq.160=160MHz (WiFi)
80+
esp32s2.menu.CPUFreq.160.build.f_cpu=160000000L
81+
esp32s2.menu.CPUFreq.80=80MHz (WiFi)
82+
esp32s2.menu.CPUFreq.80.build.f_cpu=80000000L
83+
esp32s2.menu.CPUFreq.40=40MHz
84+
esp32s2.menu.CPUFreq.40.build.f_cpu=40000000L
85+
esp32s2.menu.CPUFreq.20=20MHz
86+
esp32s2.menu.CPUFreq.20.build.f_cpu=20000000L
87+
esp32s2.menu.CPUFreq.10=10MHz
88+
esp32s2.menu.CPUFreq.10.build.f_cpu=10000000L
89+
90+
esp32s2.menu.FlashMode.qio=QIO
91+
esp32s2.menu.FlashMode.qio.build.flash_mode=dio
92+
esp32s2.menu.FlashMode.qio.build.boot=qio
93+
esp32s2.menu.FlashMode.dio=DIO
94+
esp32s2.menu.FlashMode.dio.build.flash_mode=dio
95+
esp32s2.menu.FlashMode.dio.build.boot=dio
96+
esp32s2.menu.FlashMode.qout=QOUT
97+
esp32s2.menu.FlashMode.qout.build.flash_mode=dout
98+
esp32s2.menu.FlashMode.qout.build.boot=qout
99+
esp32s2.menu.FlashMode.dout=DOUT
100+
esp32s2.menu.FlashMode.dout.build.flash_mode=dout
101+
esp32s2.menu.FlashMode.dout.build.boot=dout
102+
103+
esp32s2.menu.FlashFreq.80=80MHz
104+
esp32s2.menu.FlashFreq.80.build.flash_freq=80m
105+
esp32s2.menu.FlashFreq.40=40MHz
106+
esp32s2.menu.FlashFreq.40.build.flash_freq=40m
107+
108+
esp32s2.menu.FlashSize.4M=4MB (32Mb)
109+
esp32s2.menu.FlashSize.4M.build.flash_size=4MB
110+
esp32s2.menu.FlashSize.8M=8MB (64Mb)
111+
esp32s2.menu.FlashSize.8M.build.flash_size=8MB
112+
esp32s2.menu.FlashSize.8M.build.partitions=default_8MB
113+
esp32s2.menu.FlashSize.2M=2MB (16Mb)
114+
esp32s2.menu.FlashSize.2M.build.flash_size=2MB
115+
esp32s2.menu.FlashSize.2M.build.partitions=minimal
116+
esp32s2.menu.FlashSize.16M=16MB (128Mb)
117+
esp32s2.menu.FlashSize.16M.build.flash_size=16MB
118+
119+
esp32s2.menu.UploadSpeed.921600=921600
120+
esp32s2.menu.UploadSpeed.921600.upload.speed=921600
121+
esp32s2.menu.UploadSpeed.115200=115200
122+
esp32s2.menu.UploadSpeed.115200.upload.speed=115200
123+
esp32s2.menu.UploadSpeed.256000.windows=256000
124+
esp32s2.menu.UploadSpeed.256000.upload.speed=256000
125+
esp32s2.menu.UploadSpeed.230400.windows.upload.speed=256000
126+
esp32s2.menu.UploadSpeed.230400=230400
127+
esp32s2.menu.UploadSpeed.230400.upload.speed=230400
128+
esp32s2.menu.UploadSpeed.460800.linux=460800
129+
esp32s2.menu.UploadSpeed.460800.macosx=460800
130+
esp32s2.menu.UploadSpeed.460800.upload.speed=460800
131+
esp32s2.menu.UploadSpeed.512000.windows=512000
132+
esp32s2.menu.UploadSpeed.512000.upload.speed=512000
133+
134+
esp32s2.menu.DebugLevel.none=None
135+
esp32s2.menu.DebugLevel.none.build.code_debug=0
136+
esp32s2.menu.DebugLevel.error=Error
137+
esp32s2.menu.DebugLevel.error.build.code_debug=1
138+
esp32s2.menu.DebugLevel.warn=Warn
139+
esp32s2.menu.DebugLevel.warn.build.code_debug=2
140+
esp32s2.menu.DebugLevel.info=Info
141+
esp32s2.menu.DebugLevel.info.build.code_debug=3
142+
esp32s2.menu.DebugLevel.debug=Debug
143+
esp32s2.menu.DebugLevel.debug.build.code_debug=4
144+
esp32s2.menu.DebugLevel.verbose=Verbose
145+
esp32s2.menu.DebugLevel.verbose.build.code_debug=5
146+
147+
##############################################################
148+
15149
esp32.name=ESP32 Dev Module
16150

17151
esp32.upload.tool=esptool_py

‎cores/esp32/Arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,10 @@ typedef bool boolean;
115115
typedef uint8_t byte;
116116
typedef unsigned int word;
117117

118+
#ifdef __cplusplus
118119
void setup(void);
119120
void loop(void);
120121

121-
#ifdef __cplusplus
122122
long random(long, long);
123123
#endif
124124
void randomSeed(unsigned long);

‎cores/esp32/Esp.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ extern "C" {
3535
#ifdef ESP_IDF_VERSION_MAJOR // IDF 4+
3636
#if CONFIG_IDF_TARGET_ESP32 // ESP32/PICO-D4
3737
#include "esp32/rom/spi_flash.h"
38+
#elif CONFIG_IDF_TARGET_ESP32S2
39+
#include "esp32s2/rom/spi_flash.h"
3840
#else
3941
#error Target CONFIG_IDF_TARGET is not supported
4042
#endif

‎cores/esp32/HardwareSerial.cpp

+18-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
#include "pins_arduino.h"
77
#include "HardwareSerial.h"
88

9+
#if CONFIG_IDF_TARGET_ESP32
10+
911
#ifndef RX1
1012
#define RX1 9
1113
#endif
@@ -22,11 +24,25 @@
2224
#define TX2 17
2325
#endif
2426

27+
#else
28+
29+
#ifndef RX1
30+
#define RX1 18
31+
#endif
32+
33+
#ifndef TX1
34+
#define TX1 17
35+
#endif
36+
37+
#endif
38+
2539
#if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_SERIAL)
2640
HardwareSerial Serial(0);
2741
HardwareSerial Serial1(1);
42+
#if CONFIG_IDF_TARGET_ESP32
2843
HardwareSerial Serial2(2);
2944
#endif
45+
#endif
3046

3147
HardwareSerial::HardwareSerial(int uart_nr) : _uart_nr(uart_nr), _uart(NULL) {}
3248

@@ -47,11 +63,12 @@ void HardwareSerial::begin(unsigned long baud, uint32_t config, int8_t rxPin, in
4763
rxPin = RX1;
4864
txPin = TX1;
4965
}
66+
#if CONFIG_IDF_TARGET_ESP32
5067
if(_uart_nr == 2 && rxPin < 0 && txPin < 0) {
5168
rxPin = RX2;
5269
txPin = TX2;
5370
}
54-
71+
#endif
5572
_uart = uartBegin(_uart_nr, baud ? baud : 9600, config, rxPin, txPin, 256, invert);
5673

5774
if(!baud) {

‎cores/esp32/HardwareSerial.h

+2
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,9 @@ extern void serialEventRun(void) __attribute__((weak));
111111
#if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_SERIAL)
112112
extern HardwareSerial Serial;
113113
extern HardwareSerial Serial1;
114+
#if CONFIG_IDF_TARGET_ESP32
114115
extern HardwareSerial Serial2;
115116
#endif
117+
#endif
116118

117119
#endif // HardwareSerial_h

‎cores/esp32/MD5Builder.h

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
#ifdef ESP_IDF_VERSION_MAJOR // IDF 4+
2727
#if CONFIG_IDF_TARGET_ESP32 // ESP32/PICO-D4
2828
#include "esp32/rom/md5_hash.h"
29+
#elif CONFIG_IDF_TARGET_ESP32S2
30+
#include "esp32s2/rom/md5_hash.h"
2931
#else
3032
#error Target CONFIG_IDF_TARGET is not supported
3133
#endif

0 commit comments

Comments
 (0)