Skip to content

Commit 4ab1b5f

Browse files
Jason2866Jason2866
authored
Tasmota changes
* rm components from idf_component.yml * rm WPA2 Enterprise AP connect support * rm WiFiClientSecure * Revert crypt update PR espressif#5807 * add ETH_PHY_JL1101
1 parent d71c8e3 commit 4ab1b5f

File tree

12 files changed

+31
-532
lines changed

12 files changed

+31
-532
lines changed

Diff for: ‎CMakeLists.txt

+1-77
Original file line numberDiff line numberDiff line change
@@ -77,35 +77,25 @@ set(CORE_SRCS
7777
set(ARDUINO_ALL_LIBRARIES
7878
ArduinoOTA
7979
AsyncUDP
80-
BLE
81-
BluetoothSerial
8280
DNSServer
8381
EEPROM
84-
ESP_I2S
85-
ESP_SR
8682
ESPmDNS
8783
Ethernet
8884
FFat
8985
FS
9086
HTTPClient
9187
HTTPUpdate
92-
Insights
9388
LittleFS
9489
NetBIOS
9590
Preferences
96-
RainMaker
9791
SD_MMC
9892
SD
99-
SimpleBLE
100-
SPIFFS
10193
SPI
10294
Ticker
10395
Update
10496
USB
10597
WebServer
106-
WiFiClientSecure
10798
WiFi
108-
WiFiProv
10999
Wire
110100
)
111101

@@ -114,22 +104,10 @@ set(ARDUINO_LIBRARY_ArduinoOTA_REQUIRES esp_https_ota)
114104

115105
set(ARDUINO_LIBRARY_AsyncUDP_SRCS libraries/AsyncUDP/src/AsyncUDP.cpp)
116106

117-
set(ARDUINO_LIBRARY_BluetoothSerial_SRCS
118-
libraries/BluetoothSerial/src/BluetoothSerial.cpp
119-
libraries/BluetoothSerial/src/BTAddress.cpp
120-
libraries/BluetoothSerial/src/BTAdvertisedDeviceSet.cpp
121-
libraries/BluetoothSerial/src/BTScanResultsSet.cpp)
122-
123107
set(ARDUINO_LIBRARY_DNSServer_SRCS libraries/DNSServer/src/DNSServer.cpp)
124108

125109
set(ARDUINO_LIBRARY_EEPROM_SRCS libraries/EEPROM/src/EEPROM.cpp)
126110

127-
set(ARDUINO_LIBRARY_ESP_I2S_SRCS libraries/ESP_I2S/src/ESP_I2S.cpp)
128-
129-
set(ARDUINO_LIBRARY_ESP_SR_SRCS
130-
libraries/ESP_SR/src/ESP_SR.cpp
131-
libraries/ESP_SR/src/esp32-hal-sr.c)
132-
133111
set(ARDUINO_LIBRARY_ESPmDNS_SRCS libraries/ESPmDNS/src/ESPmDNS.cpp)
134112

135113
set(ARDUINO_LIBRARY_Ethernet_SRCS libraries/Ethernet/src/ETH.cpp)
@@ -144,35 +122,19 @@ set(ARDUINO_LIBRARY_HTTPClient_SRCS libraries/HTTPClient/src/HTTPClient.cpp)
144122

145123
set(ARDUINO_LIBRARY_HTTPUpdate_SRCS libraries/HTTPUpdate/src/HTTPUpdate.cpp)
146124

147-
set(ARDUINO_LIBRARY_Insights_SRCS libraries/Insights/src/Insights.cpp)
148-
149125
set(ARDUINO_LIBRARY_LittleFS_SRCS libraries/LittleFS/src/LittleFS.cpp)
150126

151127
set(ARDUINO_LIBRARY_NetBIOS_SRCS libraries/NetBIOS/src/NetBIOS.cpp)
152128

153129
set(ARDUINO_LIBRARY_Preferences_SRCS libraries/Preferences/src/Preferences.cpp)
154130

155-
set(ARDUINO_LIBRARY_RainMaker_SRCS
156-
libraries/RainMaker/src/RMaker.cpp
157-
libraries/RainMaker/src/RMakerNode.cpp
158-
libraries/RainMaker/src/RMakerParam.cpp
159-
libraries/RainMaker/src/RMakerDevice.cpp
160-
libraries/RainMaker/src/RMakerType.cpp
161-
libraries/RainMaker/src/RMakerQR.cpp
162-
libraries/RainMaker/src/RMakerUtils.cpp
163-
libraries/RainMaker/src/AppInsights.cpp)
164-
165131
set(ARDUINO_LIBRARY_SD_MMC_SRCS libraries/SD_MMC/src/SD_MMC.cpp)
166132

167133
set(ARDUINO_LIBRARY_SD_SRCS
168134
libraries/SD/src/SD.cpp
169135
libraries/SD/src/sd_diskio.cpp
170136
libraries/SD/src/sd_diskio_crc.c)
171137

172-
set(ARDUINO_LIBRARY_SimpleBLE_SRCS libraries/SimpleBLE/src/SimpleBLE.cpp)
173-
174-
set(ARDUINO_LIBRARY_SPIFFS_SRCS libraries/SPIFFS/src/SPIFFS.cpp)
175-
176138
set(ARDUINO_LIBRARY_SPI_SRCS libraries/SPI/src/SPI.cpp)
177139

178140
set(ARDUINO_LIBRARY_Ticker_SRCS libraries/Ticker/src/Ticker.cpp)
@@ -197,10 +159,6 @@ set(ARDUINO_LIBRARY_WebServer_SRCS
197159
libraries/WebServer/src/Parsing.cpp
198160
libraries/WebServer/src/detail/mimetable.cpp)
199161

200-
set(ARDUINO_LIBRARY_WiFiClientSecure_SRCS
201-
libraries/WiFiClientSecure/src/ssl_client.cpp
202-
libraries/WiFiClientSecure/src/WiFiClientSecure.cpp)
203-
204162
set(ARDUINO_LIBRARY_WiFi_SRCS
205163
libraries/WiFi/src/WiFiAP.cpp
206164
libraries/WiFi/src/WiFiClient.cpp
@@ -212,42 +170,8 @@ set(ARDUINO_LIBRARY_WiFi_SRCS
212170
libraries/WiFi/src/WiFiSTA.cpp
213171
libraries/WiFi/src/WiFiUdp.cpp)
214172

215-
set(ARDUINO_LIBRARY_WiFiProv_SRCS libraries/WiFiProv/src/WiFiProv.cpp)
216-
217173
set(ARDUINO_LIBRARY_Wire_SRCS libraries/Wire/src/Wire.cpp)
218174

219-
set(ARDUINO_LIBRARY_BLE_SRCS
220-
libraries/BLE/src/BLE2902.cpp
221-
libraries/BLE/src/BLE2904.cpp
222-
libraries/BLE/src/BLEAddress.cpp
223-
libraries/BLE/src/BLEAdvertisedDevice.cpp
224-
libraries/BLE/src/BLEAdvertising.cpp
225-
libraries/BLE/src/BLEBeacon.cpp
226-
libraries/BLE/src/BLECharacteristic.cpp
227-
libraries/BLE/src/BLECharacteristicMap.cpp
228-
libraries/BLE/src/BLEClient.cpp
229-
libraries/BLE/src/BLEDescriptor.cpp
230-
libraries/BLE/src/BLEDescriptorMap.cpp
231-
libraries/BLE/src/BLEDevice.cpp
232-
libraries/BLE/src/BLEEddystoneTLM.cpp
233-
libraries/BLE/src/BLEEddystoneURL.cpp
234-
libraries/BLE/src/BLEExceptions.cpp
235-
libraries/BLE/src/BLEHIDDevice.cpp
236-
libraries/BLE/src/BLERemoteCharacteristic.cpp
237-
libraries/BLE/src/BLERemoteDescriptor.cpp
238-
libraries/BLE/src/BLERemoteService.cpp
239-
libraries/BLE/src/BLEScan.cpp
240-
libraries/BLE/src/BLESecurity.cpp
241-
libraries/BLE/src/BLEServer.cpp
242-
libraries/BLE/src/BLEService.cpp
243-
libraries/BLE/src/BLEServiceMap.cpp
244-
libraries/BLE/src/BLEUtils.cpp
245-
libraries/BLE/src/BLEUUID.cpp
246-
libraries/BLE/src/BLEValue.cpp
247-
libraries/BLE/src/FreeRTOS.cpp
248-
libraries/BLE/src/GeneralUtils.cpp
249-
)
250-
251175
set(ARDUINO_LIBRARIES_SRCS)
252176
set(ARDUINO_LIBRARIES_REQUIRES)
253177
set(ARDUINO_LIBRARIES_INCLUDEDIRS)
@@ -269,7 +193,7 @@ set(includedirs variants/${CONFIG_ARDUINO_VARIANT}/ cores/esp32/ ${ARDUINO_LIBRA
269193
set(srcs ${CORE_SRCS} ${ARDUINO_LIBRARIES_SRCS})
270194
set(priv_includes cores/esp32/libb64)
271195
set(requires spi_flash esp_partition mbedtls wifi_provisioning wpa_supplicant esp_adc esp_eth http_parser)
272-
set(priv_requires fatfs nvs_flash app_update spiffs bootloader_support bt esp_hid ${ARDUINO_LIBRARIES_REQUIRES})
196+
set(priv_requires fatfs nvs_flash app_update bootloader_support bt esp_hid ${ARDUINO_LIBRARIES_REQUIRES})
273197

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

Diff for: ‎idf_component.yml

+2-39
Original file line numberDiff line numberDiff line change
@@ -43,44 +43,7 @@ files:
4343
- "programmers.txt"
4444
dependencies:
4545
idf: ">=5.1"
46-
# mdns 1.2.1 is necessary to build H2 with no WiFi
46+
# mdns 1.2.3 is necessary to build H2 with no WiFi
4747
mdns: "^1.2.3"
48-
chmorgan/esp-libhelix-mp3:
49-
version: "1.0.3"
50-
require: public
51-
espressif/esp-zboss-lib:
52-
version: "^1.0.1"
53-
rules:
54-
- if: "target != esp32c2"
55-
espressif/esp-zigbee-lib:
56-
version: "^1.0.1"
57-
rules:
58-
- if: "target != esp32c2"
59-
esp-dsp:
60-
version: "^1.3.4"
61-
rules:
62-
- if: "target != esp32c2"
63-
espressif/esp_rainmaker:
64-
version: "^1.0.0"
65-
rules:
66-
- if: "target != esp32c2"
67-
espressif/rmaker_common:
68-
version: "^1.4.3"
69-
rules:
70-
- if: "target != esp32c2"
71-
espressif/esp_insights:
72-
version: "^1.0.1"
73-
rules:
74-
- if: "target != esp32c2"
75-
espressif/qrcode:
76-
version: "^0.1.0~1"
77-
rules:
78-
- if: "target != esp32c2"
79-
joltwallet/littlefs: "^1.10.2"
80-
espressif/esp-sr:
81-
version: "^1.4.2"
82-
rules:
83-
- if: "target in [esp32s3]"
84-
examples:
85-
- path: ./idf_component_examples/Hello_world
48+
joltwallet/littlefs: "^1.14.1"
8649

Diff for: ‎libraries/Ethernet/src/ETH.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,9 @@ bool ETHClass::begin(eth_phy_type_t type, int32_t phy_addr, int mdc, int mdio, i
153153
case ETH_PHY_DP83848:
154154
phy = esp_eth_phy_new_dp83848(&phy_config);
155155
break;
156+
case ETH_PHY_JL1101:
157+
phy = esp_eth_phy_new_jl1101(&phy_config);
158+
break;
156159
case ETH_PHY_KSZ8041:
157160
phy = esp_eth_phy_new_ksz80xx(&phy_config);
158161
break;

Diff for: ‎libraries/Ethernet/src/ETH.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@
6363
// This will be uncommented once custom SPI support is available in ESP-IDF
6464
#define ETH_SPI_SUPPORTS_CUSTOM 1
6565

66+
// This will be removed when the support is backported to official IDF 5.1
67+
#define ETH_SPI_SUPPORTS_NO_IRQ 1
68+
6669
#include "WiFi.h"
6770
#if ETH_SPI_SUPPORTS_CUSTOM
6871
#include "SPI.h"
@@ -91,7 +94,7 @@ typedef enum { ETH_CLOCK_GPIO0_IN, ETH_CLOCK_GPIO0_OUT, ETH_CLOCK_GPIO16_OUT, ET
9194

9295
typedef enum {
9396
#if CONFIG_ETH_USE_ESP32_EMAC
94-
ETH_PHY_LAN8720, ETH_PHY_TLK110, ETH_PHY_RTL8201, ETH_PHY_DP83848, ETH_PHY_KSZ8041, ETH_PHY_KSZ8081,
97+
ETH_PHY_LAN8720, ETH_PHY_TLK110, ETH_PHY_RTL8201, ETH_PHY_JL1101, ETH_PHY_DP83848, ETH_PHY_KSZ8041, ETH_PHY_KSZ8081,
9598
#endif /* CONFIG_ETH_USE_ESP32_EMAC */
9699
#if CONFIG_ETH_SPI_ETHERNET_DM9051
97100
ETH_PHY_DM9051,

Diff for: ‎libraries/HTTPClient/src/HTTPClient.cpp

-96
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131

3232
#ifdef HTTPCLIENT_1_1_COMPATIBLE
3333
#include <WiFi.h>
34-
#include <WiFiClientSecure.h>
3534
#endif
3635

3736
#include <StreamString.h>
@@ -61,37 +60,6 @@ class TransportTraits
6160
}
6261
};
6362

64-
class TLSTraits : public TransportTraits
65-
{
66-
public:
67-
TLSTraits(const char* CAcert, const char* clicert = nullptr, const char* clikey = nullptr) :
68-
_cacert(CAcert), _clicert(clicert), _clikey(clikey)
69-
{
70-
}
71-
72-
std::unique_ptr<WiFiClient> create() override
73-
{
74-
return std::unique_ptr<WiFiClient>(new WiFiClientSecure());
75-
}
76-
77-
bool verify(WiFiClient& client, const char* host) override
78-
{
79-
WiFiClientSecure& wcs = static_cast<WiFiClientSecure&>(client);
80-
if (_cacert == nullptr) {
81-
wcs.setInsecure();
82-
} else {
83-
wcs.setCACert(_cacert);
84-
wcs.setCertificate(_clicert);
85-
wcs.setPrivateKey(_clikey);
86-
}
87-
return true;
88-
}
89-
90-
protected:
91-
const char* _cacert;
92-
const char* _clicert;
93-
const char* _clikey;
94-
};
9563
#endif // HTTPCLIENT_1_1_COMPATIBLE
9664

9765
/**
@@ -197,29 +165,6 @@ bool HTTPClient::begin(WiFiClient &client, String host, uint16_t port, String ur
197165

198166

199167
#ifdef HTTPCLIENT_1_1_COMPATIBLE
200-
bool HTTPClient::begin(String url, const char* CAcert)
201-
{
202-
if(_client && !_tcpDeprecated) {
203-
log_d("mix up of new and deprecated api");
204-
_canReuse = false;
205-
end();
206-
}
207-
208-
clear();
209-
_port = 443;
210-
if (!beginInternal(url, "https")) {
211-
return false;
212-
}
213-
_secure = true;
214-
_transportTraits = TransportTraitsPtr(new TLSTraits(CAcert));
215-
if(!_transportTraits) {
216-
log_e("could not create transport traits");
217-
return false;
218-
}
219-
220-
return true;
221-
}
222-
223168
/**
224169
* parsing the url for all needed parameters
225170
* @param url String
@@ -322,47 +267,6 @@ bool HTTPClient::begin(String host, uint16_t port, String uri)
322267
return true;
323268
}
324269

325-
bool HTTPClient::begin(String host, uint16_t port, String uri, const char* CAcert)
326-
{
327-
if(_client && !_tcpDeprecated) {
328-
log_d("mix up of new and deprecated api");
329-
_canReuse = false;
330-
end();
331-
}
332-
333-
clear();
334-
_host = host;
335-
_port = port;
336-
_uri = uri;
337-
338-
if (strlen(CAcert) == 0) {
339-
return false;
340-
}
341-
_secure = true;
342-
_transportTraits = TransportTraitsPtr(new TLSTraits(CAcert));
343-
return true;
344-
}
345-
346-
bool HTTPClient::begin(String host, uint16_t port, String uri, const char* CAcert, const char* cli_cert, const char* cli_key)
347-
{
348-
if(_client && !_tcpDeprecated) {
349-
log_d("mix up of new and deprecated api");
350-
_canReuse = false;
351-
end();
352-
}
353-
354-
clear();
355-
_host = host;
356-
_port = port;
357-
_uri = uri;
358-
359-
if (strlen(CAcert) == 0) {
360-
return false;
361-
}
362-
_secure = true;
363-
_transportTraits = TransportTraitsPtr(new TLSTraits(CAcert, cli_cert, cli_key));
364-
return true;
365-
}
366270
#endif // HTTPCLIENT_1_1_COMPATIBLE
367271

368272
/**

Diff for: ‎libraries/HTTPClient/src/HTTPClient.h

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
#include <memory>
3535
#include <Arduino.h>
3636
#include <WiFiClient.h>
37-
#include <WiFiClientSecure.h>
3837

3938
/// Cookie jar support
4039
#include <vector>

0 commit comments

Comments
 (0)