Skip to content

Commit 941fb5e

Browse files
committed
Merge branch 'wakeonlan'; commit 'a6a9a518a723df969ab9519d5dba3ba3b6ab5b6f' into HEAD
2 parents baf9d8d + a6a9a51 commit 941fb5e

Some content is hidden

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

42 files changed

+1709
-481
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: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
1-
BOOT_APP_BIN_OFFSET := 0xe000
21
BOOT_APP_BIN_ROOT := $(call dequote,$(COMPONENT_PATH))
3-
BOOT_APP_BIN_PATH := $(call dequote,$(abspath $(BOOT_APP_BIN_ROOT)/$(subst $(quote),,tools/partitions/boot_app0.bin)))
42

53
ifndef CONFIG_PARTITION_TABLE_CUSTOM
64
PARTITION_TABLE_CSV_PATH = $(call dequote,$(abspath $(BOOT_APP_BIN_ROOT)/$(subst $(quote),,tools/partitions/$(CONFIG_ARDUHAL_PARTITION_SCHEME).csv)))
75
endif
86

9-
BOOT_APP_BIN_FLASH_CMD = $(ESPTOOLPY_SERIAL) write_flash $(BOOT_APP_BIN_OFFSET) $(BOOT_APP_BIN_PATH)
10-
ESPTOOL_ALL_FLASH_ARGS += $(BOOT_APP_BIN_OFFSET) $(BOOT_APP_BIN_PATH)
11-
127
CPPFLAGS += -DARDUINO=10800 -DESP32=1 -DARDUINO_ARCH_ESP32=1 -DBOARD_HAS_PSRAM
13-
14-
boot-app0:
15-
@echo "Rebooting to APP0"
16-
$(BOOT_APP_BIN_FLASH_CMD)
17-

README.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
# Arduino core for ESP32 WiFi chip
2-
3-
[![Build Status](https://travis-ci.org/espressif/arduino-esp32.svg?branch=master)](https://travis-ci.org/espressif/arduino-esp32)
1+
# Arduino core for ESP32 WiFi chip [![Build Status](https://travis-ci.org/espressif/arduino-esp32.svg?branch=master)](https://travis-ci.org/espressif/arduino-esp32)
42

53
### 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)
64

@@ -12,14 +10,19 @@
1210
- [ESP32Dev Board PINMAP](#esp32dev-board-pinmap)
1311

1412
## Development Status
13+
[Latest stable release ![Release Version](https://img.shields.io/github/release/espressif/arduino-esp32.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/)
14+
15+
[Latest development release ![Development Version](https://img.shields.io/github/release/espressif/arduino-esp32/all.svg?style=plastic) ![Development Date](https://img.shields.io/github/release-date-pre/espressif/arduino-esp32.svg?style=plastic)](https://github.com/espressif/arduino-esp32/releases/latest/)
16+
1517
Most of the framework is implemented. Most noticable is the missing analogWrite. While analogWrite is on it's way, there are a few other options that you can use:
1618
- 16 channels [LEDC](cores/esp32/esp32-hal-ledc.h) which is PWM
1719
- 8 channels [SigmaDelta](cores/esp32/esp32-hal-sigmadelta.h) which uses SigmaDelta modulation
1820
- 2 channels [DAC](cores/esp32/esp32-hal-dac.h) which gives real analog output
1921

2022
## Installation Instructions
21-
22-
- Using Arduino IDE
23+
- Using Arduino IDE Boards Manager (preferred)
24+
+ [Instructions for Boards Manager](docs/arduino-ide/boards_manager.md)
25+
- Using Arduino IDE with the development repository
2326
+ [Instructions for Windows](docs/arduino-ide/windows.md)
2427
+ [Instructions for Mac](docs/arduino-ide/mac.md)
2528
+ [Instructions for Debian/Ubuntu Linux](docs/arduino-ide/debian_ubuntu.md)

0 commit comments

Comments
 (0)