Skip to content

Commit 0c22fff

Browse files
authored
Ble h2zero
1 parent e30f6b4 commit 0c22fff

18 files changed

+17
-818
lines changed

.gitmodules

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

CMakeLists.txt

Lines changed: 1 addition & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@ set(CORE_SRCS
7878
set(ARDUINO_ALL_LIBRARIES
7979
ArduinoOTA
8080
AsyncUDP
81-
BLE
82-
BluetoothSerial
8381
DNSServer
8482
EEPROM
8583
ESP_I2S
@@ -100,7 +98,6 @@ set(ARDUINO_ALL_LIBRARIES
10098
RainMaker
10199
SD_MMC
102100
SD
103-
SimpleBLE
104101
SPIFFS
105102
SPI
106103
Ticker
@@ -109,7 +106,6 @@ set(ARDUINO_ALL_LIBRARIES
109106
WebServer
110107
NetworkClientSecure
111108
WiFi
112-
WiFiProv
113109
Wire
114110
)
115111

@@ -118,12 +114,6 @@ set(ARDUINO_LIBRARY_ArduinoOTA_REQUIRES esp_https_ota)
118114

119115
set(ARDUINO_LIBRARY_AsyncUDP_SRCS libraries/AsyncUDP/src/AsyncUDP.cpp)
120116

121-
set(ARDUINO_LIBRARY_BluetoothSerial_SRCS
122-
libraries/BluetoothSerial/src/BluetoothSerial.cpp
123-
libraries/BluetoothSerial/src/BTAddress.cpp
124-
libraries/BluetoothSerial/src/BTAdvertisedDeviceSet.cpp
125-
libraries/BluetoothSerial/src/BTScanResultsSet.cpp)
126-
127117
set(ARDUINO_LIBRARY_DNSServer_SRCS libraries/DNSServer/src/DNSServer.cpp)
128118

129119
set(ARDUINO_LIBRARY_EEPROM_SRCS libraries/EEPROM/src/EEPROM.cpp)
@@ -181,8 +171,6 @@ set(ARDUINO_LIBRARY_SD_SRCS
181171
libraries/SD/src/sd_diskio.cpp
182172
libraries/SD/src/sd_diskio_crc.c)
183173

184-
set(ARDUINO_LIBRARY_SimpleBLE_SRCS libraries/SimpleBLE/src/SimpleBLE.cpp)
185-
186174
set(ARDUINO_LIBRARY_SPIFFS_SRCS libraries/SPIFFS/src/SPIFFS.cpp)
187175

188176
set(ARDUINO_LIBRARY_SPI_SRCS libraries/SPI/src/SPI.cpp)
@@ -231,43 +219,8 @@ set(ARDUINO_LIBRARY_WiFi_SRCS
231219
libraries/WiFi/src/STA.cpp
232220
libraries/WiFi/src/AP.cpp)
233221

234-
set(ARDUINO_LIBRARY_WiFiProv_SRCS libraries/WiFiProv/src/WiFiProv.cpp)
235-
236222
set(ARDUINO_LIBRARY_Wire_SRCS libraries/Wire/src/Wire.cpp)
237223

238-
set(ARDUINO_LIBRARY_BLE_SRCS
239-
libraries/BLE/src/BLE2901.cpp
240-
libraries/BLE/src/BLE2902.cpp
241-
libraries/BLE/src/BLE2904.cpp
242-
libraries/BLE/src/BLEAddress.cpp
243-
libraries/BLE/src/BLEAdvertisedDevice.cpp
244-
libraries/BLE/src/BLEAdvertising.cpp
245-
libraries/BLE/src/BLEBeacon.cpp
246-
libraries/BLE/src/BLECharacteristic.cpp
247-
libraries/BLE/src/BLECharacteristicMap.cpp
248-
libraries/BLE/src/BLEClient.cpp
249-
libraries/BLE/src/BLEDescriptor.cpp
250-
libraries/BLE/src/BLEDescriptorMap.cpp
251-
libraries/BLE/src/BLEDevice.cpp
252-
libraries/BLE/src/BLEEddystoneTLM.cpp
253-
libraries/BLE/src/BLEEddystoneURL.cpp
254-
libraries/BLE/src/BLEExceptions.cpp
255-
libraries/BLE/src/BLEHIDDevice.cpp
256-
libraries/BLE/src/BLERemoteCharacteristic.cpp
257-
libraries/BLE/src/BLERemoteDescriptor.cpp
258-
libraries/BLE/src/BLERemoteService.cpp
259-
libraries/BLE/src/BLEScan.cpp
260-
libraries/BLE/src/BLESecurity.cpp
261-
libraries/BLE/src/BLEServer.cpp
262-
libraries/BLE/src/BLEService.cpp
263-
libraries/BLE/src/BLEServiceMap.cpp
264-
libraries/BLE/src/BLEUtils.cpp
265-
libraries/BLE/src/BLEUUID.cpp
266-
libraries/BLE/src/BLEValue.cpp
267-
libraries/BLE/src/FreeRTOS.cpp
268-
libraries/BLE/src/GeneralUtils.cpp
269-
)
270-
271224
set(ARDUINO_LIBRARIES_SRCS)
272225
set(ARDUINO_LIBRARIES_REQUIRES)
273226
set(ARDUINO_LIBRARIES_INCLUDEDIRS)
@@ -288,7 +241,7 @@ endforeach()
288241
set(includedirs variants/${CONFIG_ARDUINO_VARIANT}/ cores/esp32/ ${ARDUINO_LIBRARIES_INCLUDEDIRS})
289242
set(srcs ${CORE_SRCS} ${ARDUINO_LIBRARIES_SRCS})
290243
set(priv_includes cores/esp32/libb64)
291-
set(requires spi_flash esp_partition mbedtls wifi_provisioning wpa_supplicant esp_adc esp_eth http_parser)
244+
set(requires spi_flash esp_partition mbedtls wpa_supplicant esp_adc esp_eth http_parser)
292245
set(priv_requires fatfs nvs_flash app_update spiffs bootloader_support bt esp_hid usb esp_psram ${ARDUINO_LIBRARIES_REQUIRES})
293246

294247
idf_component_register(INCLUDE_DIRS ${includedirs} PRIV_INCLUDE_DIRS ${priv_includes} SRCS ${srcs} REQUIRES ${requires} PRIV_REQUIRES ${priv_requires})

Kconfig.projbuild

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -379,24 +379,4 @@ config ARDUINO_SELECTIVE_NetworkClientSecure
379379
depends on ARDUINO_SELECTIVE_COMPILATION && ARDUINO_SELECTIVE_Network
380380
default y
381381

382-
config ARDUINO_SELECTIVE_WiFiProv
383-
bool "Enable WiFiProv"
384-
depends on ARDUINO_SELECTIVE_COMPILATION && ARDUINO_SELECTIVE_Network && ARDUINO_SELECTIVE_WiFi
385-
default y
386-
387-
config ARDUINO_SELECTIVE_BLE
388-
bool "Enable BLE"
389-
depends on ARDUINO_SELECTIVE_COMPILATION
390-
default y
391-
392-
config ARDUINO_SELECTIVE_BluetoothSerial
393-
bool "Enable BluetoothSerial"
394-
depends on ARDUINO_SELECTIVE_COMPILATION
395-
default y
396-
397-
config ARDUINO_SELECTIVE_SimpleBLE
398-
bool "Enable SimpleBLE"
399-
depends on ARDUINO_SELECTIVE_COMPILATION
400-
default y
401-
402382
endmenu

libraries/Network/src/NetworkEvents.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@
2020
#if SOC_WIFI_SUPPORTED
2121
#include "esp_wifi_types.h"
2222
#include "esp_smartconfig.h"
23+
#if defined __has_include && __has_include("wifi_provisioning/wifi_config.h")
2324
#include "wifi_provisioning/wifi_config.h"
2425
#endif
26+
#endif
2527

2628
#if SOC_WIFI_SUPPORTED
2729
static const int WIFI_SCANNING_BIT = BIT0;
@@ -105,7 +107,9 @@ typedef union {
105107
wifi_event_ap_stadisconnected_t wifi_ap_stadisconnected;
106108
wifi_event_ftm_report_t wifi_ftm_report;
107109
wifi_sta_config_t prov_cred_recv;
110+
#if defined __has_include && __has_include("wifi_provisioning/wifi_config.h")
108111
wifi_prov_sta_fail_reason_t prov_fail_reason;
112+
#endif
109113
smartconfig_event_got_ssid_pswd_t sc_got_ssid_pswd;
110114
#endif
111115
} arduino_event_info_t;

libraries/README.md

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,6 @@ arduino-esp32 includes libraries for Arduino compatibility along with some objec
88
### AsyncUDP
99
Asynchronous task driven UDP datagram client/server
1010

11-
### BLE
12-
Bluetooth Low Energy v4.2 client/server framework
13-
14-
### BluetoothSerial
15-
Serial to Bluetooth redirection server\
16-
Note: This library depends on Bluetooth Classic which is only available for ESP32\
17-
(Bluetoothserial is **not available** for ESP32-S2, ESP32-C3, ESP32-S3).
18-
1911
### DNSServer
2012
A basic UDP DNS daemon (includes captive portal demo)
2113

@@ -79,14 +71,11 @@ arduino-esp32 includes libraries for Arduino compatibility along with some objec
7971
### SD_MMC
8072
Secure Digital card filesystem using 4-lane access
8173

82-
### SimpleBLE
83-
Minimal BLE advertiser
84-
8574
### SPI
8675
Arduino compatible Serial Peripheral Interface driver (master only)
8776

8877
### SPIFFS
89-
SPI Flash Filesystem (see [spiffs-plugin](https://github.com/me-no-dev/arduino-esp32fs-plugin) to upload to device)
78+
SPI Flash Filesystem
9079

9180
### Ticker
9281
A timer to call functions on an interval

libraries/SimpleBLE/examples/SimpleBleDevice/SimpleBleDevice.ino

Lines changed: 0 additions & 54 deletions
This file was deleted.

libraries/SimpleBLE/examples/SimpleBleDevice/ci.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

libraries/SimpleBLE/library.properties

Lines changed: 0 additions & 9 deletions
This file was deleted.

libraries/SimpleBLE/src/SimpleBLE.cpp

Lines changed: 0 additions & 130 deletions
This file was deleted.

0 commit comments

Comments
 (0)