Skip to content

Commit 0094ea2

Browse files
HendrikVEHendrikVE
committed
Merge remote-tracking branch 'upstream/master'
2 parents 09e859b + 2fba812 commit 0094ea2

File tree

24 files changed

+1042
-277
lines changed

24 files changed

+1042
-277
lines changed

‎Kconfig.projbuild

Lines changed: 139 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,147 @@ config AUTOCONNECT_WIFI
106106
bool "Autoconnect WiFi on boot"
107107
default "n"
108108
depends on AUTOSTART_ARDUINO
109+
select ARDUINO_SELECTIVE_WiFi
109110
help
110111
If enabled, WiFi will connect to the last used SSID (if station was enabled),
111112
else connection will be started only after calling WiFi.begin(ssid, password)
112113

114+
config ARDUINO_SELECTIVE_COMPILATION
115+
bool "Include only specific Arduino libraries"
116+
default n
117+
118+
config ARDUINO_SELECTIVE_ArduinoOTA
119+
bool "Enable ArduinoOTA"
120+
depends on ARDUINO_SELECTIVE_COMPILATION
121+
select ARDUINO_SELECTIVE_WiFi
122+
select ARDUINO_SELECTIVE_ESPmDNS
123+
default y
124+
125+
config ARDUINO_SELECTIVE_AsyncUDP
126+
bool "Enable AsyncUDP"
127+
depends on ARDUINO_SELECTIVE_COMPILATION
128+
default y
129+
130+
config ARDUINO_SELECTIVE_AzureIoT
131+
bool "Enable AzureIoT"
132+
depends on ARDUINO_SELECTIVE_COMPILATION
133+
select ARDUINO_SELECTIVE_HTTPClient
134+
default y
135+
136+
config ARDUINO_SELECTIVE_BLE
137+
bool "Enable BLE"
138+
depends on ARDUINO_SELECTIVE_COMPILATION
139+
default y
140+
141+
config ARDUINO_SELECTIVE_BluetoothSerial
142+
bool "Enable BluetoothSerial"
143+
depends on ARDUINO_SELECTIVE_COMPILATION
144+
default y
145+
146+
config ARDUINO_SELECTIVE_DNSServer
147+
bool "Enable DNSServer"
148+
depends on ARDUINO_SELECTIVE_COMPILATION
149+
select ARDUINO_SELECTIVE_WiFi
150+
default y
151+
152+
config ARDUINO_SELECTIVE_EEPROM
153+
bool "Enable EEPROM"
154+
depends on ARDUINO_SELECTIVE_COMPILATION
155+
default y
156+
157+
config ARDUINO_SELECTIVE_ESP32
158+
bool "Enable ESP32"
159+
depends on ARDUINO_SELECTIVE_COMPILATION
160+
default y
161+
162+
config ARDUINO_SELECTIVE_ESPmDNS
163+
bool "Enable ESPmDNS"
164+
depends on ARDUINO_SELECTIVE_COMPILATION
165+
select ARDUINO_SELECTIVE_WiFi
166+
default y
167+
168+
config ARDUINO_SELECTIVE_FS
169+
bool "Enable FS"
170+
depends on ARDUINO_SELECTIVE_COMPILATION
171+
default y
172+
173+
config ARDUINO_SELECTIVE_HTTPClient
174+
bool "Enable HTTPClient"
175+
depends on ARDUINO_SELECTIVE_COMPILATION
176+
select ARDUINO_SELECTIVE_WiFi
177+
select ARDUINO_SELECTIVE_WiFiClientSecure
178+
default y
179+
180+
config ARDUINO_SELECTIVE_NetBIOS
181+
bool "Enable NetBIOS"
182+
depends on ARDUINO_SELECTIVE_COMPILATION
183+
select ARDUINO_SELECTIVE_WiFi
184+
default y
185+
186+
config ARDUINO_SELECTIVE_Preferences
187+
bool "Enable Preferences"
188+
depends on ARDUINO_SELECTIVE_COMPILATION
189+
default y
190+
191+
config ARDUINO_SELECTIVE_SD
192+
bool "Enable SD"
193+
depends on ARDUINO_SELECTIVE_COMPILATION
194+
select ARDUINO_SELECTIVE_FS
195+
default y
196+
197+
config ARDUINO_SELECTIVE_SD_MMC
198+
bool "Enable SD_MMC"
199+
depends on ARDUINO_SELECTIVE_COMPILATION
200+
select ARDUINO_SELECTIVE_FS
201+
default y
202+
203+
config ARDUINO_SELECTIVE_SimpleBLE
204+
bool "Enable SimpleBLE"
205+
depends on ARDUINO_SELECTIVE_COMPILATION
206+
default y
207+
208+
config ARDUINO_SELECTIVE_SPI
209+
bool "Enable SPI"
210+
depends on ARDUINO_SELECTIVE_COMPILATION
211+
default y
212+
213+
config ARDUINO_SELECTIVE_SPIFFS
214+
bool "Enable SPIFFS"
215+
depends on ARDUINO_SELECTIVE_COMPILATION
216+
select ARDUINO_SELECTIVE_FS
217+
default y
218+
219+
config ARDUINO_SELECTIVE_Ticker
220+
bool "Enable Ticker"
221+
depends on ARDUINO_SELECTIVE_COMPILATION
222+
default y
223+
224+
config ARDUINO_SELECTIVE_Update
225+
bool "Enable Update"
226+
depends on ARDUINO_SELECTIVE_COMPILATION
227+
default y
228+
229+
config ARDUINO_SELECTIVE_WebServer
230+
bool "Enable WebServer"
231+
depends on ARDUINO_SELECTIVE_COMPILATION
232+
default y
233+
select ARDUINO_SELECTIVE_FS
234+
235+
config ARDUINO_SELECTIVE_WiFi
236+
bool "Enable WiFi"
237+
depends on ARDUINO_SELECTIVE_COMPILATION
238+
default y
239+
240+
config ARDUINO_SELECTIVE_WiFiClientSecure
241+
bool "Enable WiFiClientSecure"
242+
depends on ARDUINO_SELECTIVE_COMPILATION
243+
select ARDUINO_SELECTIVE_WiFi
244+
default y
245+
246+
config ARDUINO_SELECTIVE_Wire
247+
bool "Enable Wire"
248+
depends on ARDUINO_SELECTIVE_COMPILATION
249+
default y
250+
251+
113252
endmenu

‎Makefile.projbuild

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ endif
99
BOOT_APP_BIN_FLASH_CMD = $(ESPTOOLPY_SERIAL) write_flash $(BOOT_APP_BIN_OFFSET) $(BOOT_APP_BIN_PATH)
1010
ESPTOOL_ALL_FLASH_ARGS += $(BOOT_APP_BIN_OFFSET) $(BOOT_APP_BIN_PATH)
1111

12-
CPPFLAGS += -DARDUINO=10800 -DESP32=1 -DARDUINO_ARCH_ESP32=1
12+
CPPFLAGS += -DARDUINO=10800 -DESP32=1 -DARDUINO_ARCH_ESP32=1 -DBOARD_HAS_PSRAM
1313

1414
boot-app0:
1515
@echo "Rebooting to APP0"

‎README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@ Most of the framework is implemented. Most noticable is the missing analogWrite.
1919

2020
## Installation Instructions
2121

22-
- Using Arduino IDE
22+
#### [Latest release ![Release Version](https://img.shields.io/github/release/espressif/arduino-esp32/all.svg?style=plastic) ![Release Date](https://img.shields.io/github/release-date/espressif/arduino-esp32.svg?style=plastic)](https://github.com/espressif/arduino-esp32/releases/latest/)
23+
24+
- Using Arduino IDE Boards Manager (preferred)
25+
+ [Instructions for Boards Manager](docs/arduino-ide/boards_manager.md)
26+
- Using Arduino IDE with the development repository
2327
+ [Instructions for Windows](docs/arduino-ide/windows.md)
2428
+ [Instructions for Mac](docs/arduino-ide/mac.md)
2529
+ [Instructions for Debian/Ubuntu Linux](docs/arduino-ide/debian_ubuntu.md)

‎boards.txt

Lines changed: 204 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,62 @@ menu.PSRAM=PSRAM
88

99
##############################################################
1010

11+
ttgo-lora32-v1.name=TTGO LoRa32-OLED V1
12+
13+
ttgo-lora32-v1.upload.tool=esptool
14+
ttgo-lora32-v1.upload.maximum_size=1310720
15+
ttgo-lora32-v1.upload.maximum_data_size=294912
16+
ttgo-lora32-v1.upload.wait_for_upload_port=true
17+
18+
ttgo-lora32-v1.serial.disableDTR=true
19+
ttgo-lora32-v1.serial.disableRTS=true
20+
21+
ttgo-lora32-v1.build.mcu=esp32
22+
ttgo-lora32-v1.build.core=esp32
23+
ttgo-lora32-v1.build.variant=ttgo-lora32-v1
24+
ttgo-lora32-v1.build.board=TTGO_LoRa32_V1
25+
26+
ttgo-lora32-v1.build.f_cpu=240000000L
27+
ttgo-lora32-v1.build.flash_mode=dio
28+
ttgo-lora32-v1.build.flash_size=4MB
29+
ttgo-lora32-v1.build.boot=dio
30+
ttgo-lora32-v1.build.partitions=default
31+
32+
ttgo-lora32-v1.menu.FlashFreq.80=80MHz
33+
ttgo-lora32-v1.menu.FlashFreq.80.build.flash_freq=80m
34+
ttgo-lora32-v1.menu.FlashFreq.40=40MHz
35+
ttgo-lora32-v1.menu.FlashFreq.40.build.flash_freq=40m
36+
37+
ttgo-lora32-v1.menu.UploadSpeed.921600=921600
38+
ttgo-lora32-v1.menu.UploadSpeed.921600.upload.speed=921600
39+
ttgo-lora32-v1.menu.UploadSpeed.115200=115200
40+
ttgo-lora32-v1.menu.UploadSpeed.115200.upload.speed=115200
41+
ttgo-lora32-v1.menu.UploadSpeed.256000.windows=256000
42+
ttgo-lora32-v1.menu.UploadSpeed.256000.upload.speed=256000
43+
ttgo-lora32-v1.menu.UploadSpeed.230400.windows.upload.speed=256000
44+
ttgo-lora32-v1.menu.UploadSpeed.230400=230400
45+
ttgo-lora32-v1.menu.UploadSpeed.230400.upload.speed=230400
46+
ttgo-lora32-v1.menu.UploadSpeed.460800.linux=460800
47+
ttgo-lora32-v1.menu.UploadSpeed.460800.macosx=460800
48+
ttgo-lora32-v1.menu.UploadSpeed.460800.upload.speed=460800
49+
ttgo-lora32-v1.menu.UploadSpeed.512000.windows=512000
50+
ttgo-lora32-v1.menu.UploadSpeed.512000.upload.speed=512000
51+
52+
ttgo-lora32-v1.menu.DebugLevel.none=None
53+
ttgo-lora32-v1.menu.DebugLevel.none.build.code_debug=0
54+
ttgo-lora32-v1.menu.DebugLevel.error=Error
55+
ttgo-lora32-v1.menu.DebugLevel.error.build.code_debug=1
56+
ttgo-lora32-v1.menu.DebugLevel.warn=Warn
57+
ttgo-lora32-v1.menu.DebugLevel.warn.build.code_debug=2
58+
ttgo-lora32-v1.menu.DebugLevel.info=Info
59+
ttgo-lora32-v1.menu.DebugLevel.info.build.code_debug=3
60+
ttgo-lora32-v1.menu.DebugLevel.debug=Debug
61+
ttgo-lora32-v1.menu.DebugLevel.debug.build.code_debug=4
62+
ttgo-lora32-v1.menu.DebugLevel.verbose=Verbose
63+
ttgo-lora32-v1.menu.DebugLevel.verbose.build.code_debug=5
64+
65+
##############################################################
66+
1167
esp32.name=ESP32 Dev Module
1268

1369
esp32.upload.tool=esptool
@@ -1553,6 +1609,64 @@ m5stack-core-esp32.menu.DebugLevel.verbose.build.code_debug=5
15531609

15541610
##############################################################
15551611

1612+
m5stack-fire.name=M5Stack-FIRE
1613+
1614+
m5stack-fire.upload.tool=esptool
1615+
m5stack-fire.upload.maximum_size=1310720
1616+
m5stack-fire.upload.maximum_data_size=327680
1617+
m5stack-fire.upload.wait_for_upload_port=true
1618+
1619+
m5stack-fire.serial.disableDTR=true
1620+
m5stack-fire.serial.disableRTS=true
1621+
1622+
m5stack-fire.build.mcu=esp32
1623+
m5stack-fire.build.core=esp32
1624+
m5stack-fire.build.variant=m5stack_fire
1625+
m5stack-fire.build.board=M5STACK_FIRE
1626+
1627+
m5stack-fire.build.f_cpu=240000000L
1628+
m5stack-fire.build.flash_size=16MB
1629+
m5stack-fire.build.flash_freq=80m
1630+
m5stack-fire.build.flash_mode=dio
1631+
m5stack-fire.build.boot=dio
1632+
m5stack-fire.build.partitions=default
1633+
m5stack-fire.build.defines=
1634+
1635+
m5stack-fire.menu.PSRAM.enabled=Enabled
1636+
m5stack-fire.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue
1637+
m5stack-fire.menu.PSRAM.disabled=Disabled
1638+
m5stack-fire.menu.PSRAM.disabled.build.defines=
1639+
1640+
m5stack-fire.menu.UploadSpeed.921600=921600
1641+
m5stack-fire.menu.UploadSpeed.921600.upload.speed=921600
1642+
m5stack-fire.menu.UploadSpeed.115200=115200
1643+
m5stack-fire.menu.UploadSpeed.115200.upload.speed=115200
1644+
m5stack-fire.menu.UploadSpeed.256000.windows=256000
1645+
m5stack-fire.menu.UploadSpeed.256000.upload.speed=256000
1646+
m5stack-fire.menu.UploadSpeed.230400.windows.upload.speed=256000
1647+
m5stack-fire.menu.UploadSpeed.230400=230400
1648+
m5stack-fire.menu.UploadSpeed.230400.upload.speed=230400
1649+
m5stack-fire.menu.UploadSpeed.460800.linux=460800
1650+
m5stack-fire.menu.UploadSpeed.460800.macosx=460800
1651+
m5stack-fire.menu.UploadSpeed.460800.upload.speed=460800
1652+
m5stack-fire.menu.UploadSpeed.512000.windows=512000
1653+
m5stack-fire.menu.UploadSpeed.512000.upload.speed=512000
1654+
1655+
m5stack-fire.menu.DebugLevel.none=None
1656+
m5stack-fire.menu.DebugLevel.none.build.code_debug=0
1657+
m5stack-fire.menu.DebugLevel.error=Error
1658+
m5stack-fire.menu.DebugLevel.error.build.code_debug=1
1659+
m5stack-fire.menu.DebugLevel.warn=Warn
1660+
m5stack-fire.menu.DebugLevel.warn.build.code_debug=2
1661+
m5stack-fire.menu.DebugLevel.info=Info
1662+
m5stack-fire.menu.DebugLevel.info.build.code_debug=3
1663+
m5stack-fire.menu.DebugLevel.debug=Debug
1664+
m5stack-fire.menu.DebugLevel.debug.build.code_debug=4
1665+
m5stack-fire.menu.DebugLevel.verbose=Verbose
1666+
m5stack-fire.menu.DebugLevel.verbose.build.code_debug=5
1667+
1668+
##############################################################
1669+
15561670
odroid_esp32.name=ODROID ESP32
15571671

15581672
odroid_esp32.upload.tool=esptool
@@ -1840,6 +1954,96 @@ CoreESP32.menu.UploadSpeed.512000.upload.speed=512000
18401954

18411955
##############################################################
18421956

1957+
1958+
alksesp32.name=ALKS ESP32
1959+
1960+
alksesp32.upload.tool=esptool
1961+
alksesp32.upload.maximum_size=1310720
1962+
alksesp32.upload.maximum_data_size=327680
1963+
alksesp32.upload.wait_for_upload_port=true
1964+
1965+
alksesp32.serial.disableDTR=true
1966+
alksesp32.serial.disableRTS=true
1967+
1968+
alksesp32.build.mcu=esp32
1969+
alksesp32.build.core=esp32
1970+
alksesp32.build.variant=alksesp32
1971+
alksesp32.build.board=ALKS
1972+
1973+
alksesp32.build.f_cpu=240000000L
1974+
alksesp32.build.flash_size=4MB
1975+
alksesp32.build.flash_freq=40m
1976+
alksesp32.build.flash_mode=dio
1977+
alksesp32.build.boot=dio
1978+
alksesp32.build.partitions=default
1979+
alksesp32.build.defines=
1980+
1981+
alksesp32.menu.PartitionScheme.default=Default
1982+
alksesp32.menu.PartitionScheme.default.build.partitions=default
1983+
alksesp32.menu.PartitionScheme.minimal=Minimal (2MB FLASH)
1984+
alksesp32.menu.PartitionScheme.minimal.build.partitions=minimal
1985+
alksesp32.menu.PartitionScheme.no_ota=No OTA (Large APP)
1986+
alksesp32.menu.PartitionScheme.no_ota.build.partitions=no_ota
1987+
alksesp32.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
1988+
alksesp32.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA)
1989+
alksesp32.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
1990+
alksesp32.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
1991+
1992+
alksesp32.menu.FlashMode.qio=QIO
1993+
alksesp32.menu.FlashMode.qio.build.flash_mode=dio
1994+
alksesp32.menu.FlashMode.qio.build.boot=qio
1995+
alksesp32.menu.FlashMode.dio=DIO
1996+
alksesp32.menu.FlashMode.dio.build.flash_mode=dio
1997+
alksesp32.menu.FlashMode.dio.build.boot=dio
1998+
alksesp32.menu.FlashMode.qout=QOUT
1999+
alksesp32.menu.FlashMode.qout.build.flash_mode=dout
2000+
alksesp32.menu.FlashMode.qout.build.boot=qout
2001+
alksesp32.menu.FlashMode.dout=DOUT
2002+
alksesp32.menu.FlashMode.dout.build.flash_mode=dout
2003+
alksesp32.menu.FlashMode.dout.build.boot=dout
2004+
2005+
alksesp32.menu.FlashFreq.80=80MHz
2006+
alksesp32.menu.FlashFreq.80.build.flash_freq=80m
2007+
alksesp32.menu.FlashFreq.40=40MHz
2008+
alksesp32.menu.FlashFreq.40.build.flash_freq=40m
2009+
2010+
alksesp32.menu.FlashSize.4M=4MB (32Mb)
2011+
alksesp32.menu.FlashSize.4M.build.flash_size=4MB
2012+
alksesp32.menu.FlashSize.2M=2MB (16Mb)
2013+
alksesp32.menu.FlashSize.2M.build.flash_size=2MB
2014+
alksesp32.menu.FlashSize.2M.build.partitions=minimal
2015+
2016+
alksesp32.menu.UploadSpeed.921600=921600
2017+
alksesp32.menu.UploadSpeed.921600.upload.speed=921600
2018+
alksesp32.menu.UploadSpeed.115200=115200
2019+
alksesp32.menu.UploadSpeed.115200.upload.speed=115200
2020+
alksesp32.menu.UploadSpeed.256000.windows=256000
2021+
alksesp32.menu.UploadSpeed.256000.upload.speed=256000
2022+
alksesp32.menu.UploadSpeed.230400.windows.upload.speed=256000
2023+
alksesp32.menu.UploadSpeed.230400=230400
2024+
alksesp32.menu.UploadSpeed.230400.upload.speed=230400
2025+
alksesp32.menu.UploadSpeed.460800.linux=460800
2026+
alksesp32.menu.UploadSpeed.460800.macosx=460800
2027+
alksesp32.menu.UploadSpeed.460800.upload.speed=460800
2028+
alksesp32.menu.UploadSpeed.512000.windows=512000
2029+
alksesp32.menu.UploadSpeed.512000.upload.speed=512000
2030+
2031+
alksesp32.menu.DebugLevel.none=None
2032+
alksesp32.menu.DebugLevel.none.build.code_debug=0
2033+
alksesp32.menu.DebugLevel.error=Error
2034+
alksesp32.menu.DebugLevel.error.build.code_debug=1
2035+
alksesp32.menu.DebugLevel.warn=Warn
2036+
alksesp32.menu.DebugLevel.warn.build.code_debug=2
2037+
alksesp32.menu.DebugLevel.info=Info
2038+
alksesp32.menu.DebugLevel.info.build.code_debug=3
2039+
alksesp32.menu.DebugLevel.debug=Debug
2040+
alksesp32.menu.DebugLevel.debug.build.code_debug=4
2041+
alksesp32.menu.DebugLevel.verbose=Verbose
2042+
alksesp32.menu.DebugLevel.verbose.build.code_debug=5
2043+
2044+
##############################################################
2045+
2046+
18432047
wipy3.name=WiPy 3.0
18442048

18452049
wipy3.upload.tool=esptool
@@ -1894,4 +2098,3 @@ wipy3.menu.DebugLevel.debug=Debug
18942098
wipy3.menu.DebugLevel.debug.build.code_debug=4
18952099
wipy3.menu.DebugLevel.verbose=Verbose
18962100
wipy3.menu.DebugLevel.verbose.build.code_debug=5
1897-

0 commit comments

Comments
 (0)