Arduino Core 3 (#407)
* Add and remove libs and components for Arduino Core 3 * Arduino Core 3 * Add back Solo1 * Change ESP32-S3 to 4MB build * Update README.md * Fix retain and number of retries * Fix rolling log * Fix defaults * Fix BleScanner on Solo1 * Export settings * Import settings * Fix HA Battery voltage * Change submodule * Update espMqttClient and AsyncTCP * Webserial and MQTT/Network reconnecting * Update nuki_ble --------- Co-authored-by: iranl <iranl@github.com>
This commit is contained in:
@@ -108,9 +108,15 @@ static String md5str(String &in){
|
||||
return String(out);
|
||||
memset(_buf, 0x00, 16);
|
||||
mbedtls_md5_init(&_ctx);
|
||||
#if (ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0))
|
||||
mbedtls_md5_starts_ret(&_ctx);
|
||||
mbedtls_md5_update_ret(&_ctx, (const uint8_t *)in.c_str(), in.length());
|
||||
mbedtls_md5_finish_ret(&_ctx, _buf);
|
||||
#else
|
||||
mbedtls_md5_starts(&_ctx);
|
||||
mbedtls_md5_update(&_ctx, (const uint8_t *)in.c_str(), in.length());
|
||||
mbedtls_md5_finish(&_ctx, _buf);
|
||||
#endif
|
||||
for(i = 0; i < 16; i++) {
|
||||
sprintf(out + (i * 2), "%02x", _buf[i]);
|
||||
}
|
||||
|
||||
@@ -62,8 +62,8 @@ typedef struct {
|
||||
} HTTPUpload;
|
||||
|
||||
#include "detail/RequestHandler.h"
|
||||
#include "EthServer.h"
|
||||
#include "EthClient.h"
|
||||
#include <EthServer.h>
|
||||
#include <EthClient.h>
|
||||
|
||||
namespace fs {
|
||||
class FS;
|
||||
|
||||
@@ -18,7 +18,8 @@ uint8_t WifiEthClient::connected()
|
||||
|
||||
int WifiEthClient::setTimeout(uint32_t seconds)
|
||||
{
|
||||
return _wifiClient->setTimeout(seconds);
|
||||
_wifiClient->setTimeout(seconds);
|
||||
return seconds;
|
||||
}
|
||||
|
||||
size_t WifiEthClient::write(const char *buffer, size_t size)
|
||||
|
||||
@@ -38,7 +38,7 @@ EthClient* WifiEthServer::available()
|
||||
_wifiEthClient = nullptr;
|
||||
}
|
||||
|
||||
_wifiClient = _wifiServer.available();
|
||||
_wifiClient = _wifiServer.accept();
|
||||
_wifiEthClient = new WifiEthClient(&_wifiClient);
|
||||
return _wifiEthClient;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user