Skip to content

Commit 44b2ddf

Browse files
Jason2866Jason2866
authored
Tasmota changes (#318)
1 parent 35f7e96 commit 44b2ddf

File tree

10 files changed

+33
-219
lines changed

10 files changed

+33
-219
lines changed

‎CMakeLists.txt

Lines changed: 2 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,8 @@ set(CORE_SRCS
7777
set(LIBRARY_SRCS
7878
libraries/ArduinoOTA/src/ArduinoOTA.cpp
7979
libraries/AsyncUDP/src/AsyncUDP.cpp
80-
libraries/BluetoothSerial/src/BluetoothSerial.cpp
81-
libraries/BluetoothSerial/src/BTAddress.cpp
82-
libraries/BluetoothSerial/src/BTAdvertisedDeviceSet.cpp
83-
libraries/BluetoothSerial/src/BTScanResultsSet.cpp
8480
libraries/DNSServer/src/DNSServer.cpp
8581
libraries/EEPROM/src/EEPROM.cpp
86-
libraries/ESP_I2S/src/ESP_I2S.cpp
87-
libraries/ESP_SR/src/ESP_SR.cpp
88-
libraries/ESP_SR/src/esp32-hal-sr.c
8982
libraries/ESPmDNS/src/ESPmDNS.cpp
9083
libraries/Ethernet/src/ETH.cpp
9184
libraries/FFat/src/FFat.cpp
@@ -94,23 +87,12 @@ set(LIBRARY_SRCS
9487
libraries/HTTPClient/src/HTTPClient.cpp
9588
libraries/HTTPUpdate/src/HTTPUpdate.cpp
9689
libraries/LittleFS/src/LittleFS.cpp
97-
libraries/Insights/src/Insights.cpp
9890
libraries/NetBIOS/src/NetBIOS.cpp
9991
libraries/Preferences/src/Preferences.cpp
100-
libraries/RainMaker/src/RMaker.cpp
101-
libraries/RainMaker/src/RMakerNode.cpp
102-
libraries/RainMaker/src/RMakerParam.cpp
103-
libraries/RainMaker/src/RMakerDevice.cpp
104-
libraries/RainMaker/src/RMakerType.cpp
105-
libraries/RainMaker/src/RMakerQR.cpp
106-
libraries/RainMaker/src/RMakerUtils.cpp
107-
libraries/RainMaker/src/AppInsights.cpp
10892
libraries/SD_MMC/src/SD_MMC.cpp
10993
libraries/SD/src/SD.cpp
11094
libraries/SD/src/sd_diskio.cpp
11195
libraries/SD/src/sd_diskio_crc.c
112-
libraries/SimpleBLE/src/SimpleBLE.cpp
113-
libraries/SPIFFS/src/SPIFFS.cpp
11496
libraries/SPI/src/SPI.cpp
11597
libraries/Ticker/src/Ticker.cpp
11698
libraries/Update/src/Updater.cpp
@@ -127,8 +109,6 @@ set(LIBRARY_SRCS
127109
libraries/WebServer/src/WebServer.cpp
128110
libraries/WebServer/src/Parsing.cpp
129111
libraries/WebServer/src/detail/mimetable.cpp
130-
libraries/WiFiClientSecure/src/ssl_client.cpp
131-
libraries/WiFiClientSecure/src/WiFiClientSecure.cpp
132112
libraries/WiFi/src/WiFiAP.cpp
133113
libraries/WiFi/src/WiFiClient.cpp
134114
libraries/WiFi/src/WiFi.cpp
@@ -138,84 +118,40 @@ set(LIBRARY_SRCS
138118
libraries/WiFi/src/WiFiServer.cpp
139119
libraries/WiFi/src/WiFiSTA.cpp
140120
libraries/WiFi/src/WiFiUdp.cpp
141-
libraries/WiFiProv/src/WiFiProv.cpp
142121
libraries/Wire/src/Wire.cpp
143122
)
144123

145-
set(BLE_SRCS
146-
libraries/BLE/src/BLE2902.cpp
147-
libraries/BLE/src/BLE2904.cpp
148-
libraries/BLE/src/BLEAddress.cpp
149-
libraries/BLE/src/BLEAdvertisedDevice.cpp
150-
libraries/BLE/src/BLEAdvertising.cpp
151-
libraries/BLE/src/BLEBeacon.cpp
152-
libraries/BLE/src/BLECharacteristic.cpp
153-
libraries/BLE/src/BLECharacteristicMap.cpp
154-
libraries/BLE/src/BLEClient.cpp
155-
libraries/BLE/src/BLEDescriptor.cpp
156-
libraries/BLE/src/BLEDescriptorMap.cpp
157-
libraries/BLE/src/BLEDevice.cpp
158-
libraries/BLE/src/BLEEddystoneTLM.cpp
159-
libraries/BLE/src/BLEEddystoneURL.cpp
160-
libraries/BLE/src/BLEExceptions.cpp
161-
libraries/BLE/src/BLEHIDDevice.cpp
162-
libraries/BLE/src/BLERemoteCharacteristic.cpp
163-
libraries/BLE/src/BLERemoteDescriptor.cpp
164-
libraries/BLE/src/BLERemoteService.cpp
165-
libraries/BLE/src/BLEScan.cpp
166-
libraries/BLE/src/BLESecurity.cpp
167-
libraries/BLE/src/BLEServer.cpp
168-
libraries/BLE/src/BLEService.cpp
169-
libraries/BLE/src/BLEServiceMap.cpp
170-
libraries/BLE/src/BLEUtils.cpp
171-
libraries/BLE/src/BLEUUID.cpp
172-
libraries/BLE/src/BLEValue.cpp
173-
libraries/BLE/src/FreeRTOS.cpp
174-
libraries/BLE/src/GeneralUtils.cpp
175-
)
176-
177124
set(includedirs
178125
variants/${CONFIG_ARDUINO_VARIANT}/
179126
cores/esp32/
180127
libraries/ArduinoOTA/src
181128
libraries/AsyncUDP/src
182-
libraries/BLE/src
183-
libraries/BluetoothSerial/src
184129
libraries/DNSServer/src
185130
libraries/EEPROM/src
186-
libraries/ESP_I2S/src
187-
libraries/ESP_SR/src
188-
libraries/ESP32/src
189131
libraries/ESPmDNS/src
190132
libraries/Ethernet/src
191133
libraries/FFat/src
192134
libraries/FS/src
193135
libraries/HTTPClient/src
194136
libraries/HTTPUpdate/src
195137
libraries/LittleFS/src
196-
libraries/Insights/src
197138
libraries/NetBIOS/src
198139
libraries/Preferences/src
199-
libraries/RainMaker/src
200140
libraries/SD_MMC/src
201141
libraries/SD/src
202-
libraries/SimpleBLE/src
203-
libraries/SPIFFS/src
204142
libraries/SPI/src
205143
libraries/Ticker/src
206144
libraries/Update/src
207145
libraries/USB/src
208146
libraries/WebServer/src
209-
libraries/WiFiClientSecure/src
210147
libraries/WiFi/src
211-
libraries/WiFiProv/src
212148
libraries/Wire/src
213149
)
214150

215-
set(srcs ${CORE_SRCS} ${LIBRARY_SRCS} ${BLE_SRCS})
151+
set(srcs ${CORE_SRCS} ${LIBRARY_SRCS})
216152
set(priv_includes cores/esp32/libb64)
217153
set(requires spi_flash esp_partition mbedtls wifi_provisioning wpa_supplicant esp_adc esp_eth http_parser)
218-
set(priv_requires fatfs nvs_flash app_update spiffs bootloader_support bt esp_hid)
154+
set(priv_requires fatfs nvs_flash app_update bootloader_support bt esp_hid)
219155

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

‎cores/esp32/Esp.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,10 @@ String EspClass::getSketchMD5()
248248
md5.add(pb, readBytes);
249249
lengthLeft -= readBytes;
250250
offset += readBytes;
251+
252+
#if CONFIG_FREERTOS_UNICORE
253+
delay(1); // Fix solo WDT
254+
#endif
251255
}
252256
free(pb);
253257
md5.calculate();

‎idf_component.yml

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -29,42 +29,4 @@ dependencies:
2929
idf: ">=5.1"
3030
# mdns 1.2.1 is necessary to build H2 with no WiFi
3131
mdns: "1.2.1"
32-
chmorgan/esp-libhelix-mp3:
33-
version: "1.0.3"
34-
require: public
35-
espressif/esp-zboss-lib:
36-
version: "^1.0.1"
37-
rules:
38-
- if: "target != esp32c2"
39-
espressif/esp-zigbee-lib:
40-
version: "^1.0.1"
41-
rules:
42-
- if: "target != esp32c2"
43-
esp-dsp:
44-
version: "^1.3.4"
45-
rules:
46-
- if: "target != esp32c2"
47-
espressif/esp_rainmaker:
48-
version: "^1.0.0"
49-
rules:
50-
- if: "target != esp32c2"
51-
espressif/rmaker_common:
52-
version: "^1.4.3"
53-
rules:
54-
- if: "target != esp32c2"
55-
espressif/esp_insights:
56-
version: "^1.0.1"
57-
rules:
58-
- if: "target != esp32c2"
59-
espressif/qrcode:
60-
version: "^0.1.0~1"
61-
rules:
62-
- if: "target != esp32c2"
63-
joltwallet/littlefs: "^1.10.2"
64-
espressif/esp-sr:
65-
version: "^1.4.2"
66-
rules:
67-
- if: "target in [esp32s3]"
68-
examples:
69-
- path: idf_component_examples/
70-
32+
joltwallet/littlefs: "^1.11.0"

‎libraries/Ethernet/src/ETH.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,9 @@ bool ETHClass::begin(eth_phy_type_t type, uint8_t phy_addr, int mdc, int mdio, i
149149
case ETH_PHY_DP83848:
150150
phy = esp_eth_phy_new_dp83848(&phy_config);
151151
break;
152+
case ETH_PHY_JL1101:
153+
phy = esp_eth_phy_new_jl1101(&phy_config);
154+
break;
152155
case ETH_PHY_KSZ8041:
153156
phy = esp_eth_phy_new_ksz80xx(&phy_config);
154157
break;

‎libraries/Ethernet/src/ETH.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ typedef enum { ETH_CLOCK_GPIO0_IN, ETH_CLOCK_GPIO0_OUT, ETH_CLOCK_GPIO16_OUT, ET
8989

9090
typedef enum {
9191
#if CONFIG_ETH_USE_ESP32_EMAC
92-
ETH_PHY_LAN8720, ETH_PHY_TLK110, ETH_PHY_RTL8201, ETH_PHY_DP83848, ETH_PHY_KSZ8041, ETH_PHY_KSZ8081,
92+
ETH_PHY_LAN8720, ETH_PHY_TLK110, ETH_PHY_RTL8201, ETH_PHY_JL1101, ETH_PHY_DP83848, ETH_PHY_KSZ8041, ETH_PHY_KSZ8081,
9393
#endif /* CONFIG_ETH_USE_ESP32_EMAC */
9494
#if CONFIG_ETH_SPI_ETHERNET_DM9051
9595
ETH_PHY_DM9051,

‎libraries/HTTPClient/src/HTTPClient.cpp

Lines changed: 0 additions & 96 deletions
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
/**

‎libraries/HTTPClient/src/HTTPClient.h

Lines changed: 0 additions & 1 deletion
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>

‎libraries/Update/src/Updater.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,8 @@ size_t UpdateClass::writeStream(Stream &data) {
393393
if((_bufferLen == remaining() || _bufferLen == SPI_FLASH_SEC_SIZE) && !_writeBuffer())
394394
return written;
395395
written += toRead;
396+
397+
delay(1); // Fix solo WDT
396398
}
397399
return written;
398400
}

‎libraries/WiFiClientSecure/src/ssl_client.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "WiFi.h"
2222

2323
#if !defined(MBEDTLS_KEY_EXCHANGE__SOME__PSK_ENABLED) && !defined(MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED)
24-
# warning "Please call `idf.py menuconfig` then go to Component config -> mbedTLS -> TLS Key Exchange Methods -> Enable pre-shared-key ciphersuites and then check `Enable PSK based cyphersuite modes`. Save and Quit."
24+
//# warning "Please call `idf.py menuconfig` then go to Component config -> mbedTLS -> TLS Key Exchange Methods -> Enable pre-shared-key ciphersuites and then check `Enable PSK based cyphersuite modes`. Save and Quit."
2525
#else
2626

2727
const char *pers = "esp32-tls";

0 commit comments

Comments
 (0)