jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-28 05:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9767 from Staars/MI32

Browse Source 
prepare changes for ESP-idf > 4.0
This commit is contained in:
Theo Arends 2020-11-08 11:57:57 +01:00 committed by GitHub
commit 18a6b8a34d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/libesp32/ESP32-Ethernet/src/ETH.cpp
View File

@ -204,8 +204,13 @@ IPAddress ETHClass::gatewayIP()
IPAddress ETHClass::dnsIP(uint8_t dns_no) IPAddress ETHClass::dnsIP(uint8_t dns_no)
{ {
#ifdef ESP_IDF_VERSION_VAL //idf_version.h header file is only available in ESP-IDF v4.0 -> this is equal to: #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 0, 0)
const ip_addr_t *dns_ip = dns_getserver(dns_no);
return IPAddress(dns_ip->u_addr.ip4.addr);
#else
ip_addr_t dns_ip = dns_getserver(dns_no); ip_addr_t dns_ip = dns_getserver(dns_no);
return IPAddress(dns_ip.u_addr.ip4.addr); return IPAddress(dns_ip.u_addr.ip4.addr);
#endif
} }
IPAddress ETHClass::broadcastIP() IPAddress ETHClass::broadcastIP()

2
lib/libesp32/NimBLE-Arduino/src/FreeRTOS.cpp
View File

@ -264,7 +264,7 @@ void FreeRTOS::Semaphore::setName(std::string name) {
* @param [in] length The amount of storage to allocate for the ring buffer. * @param [in] length The amount of storage to allocate for the ring buffer.
* @param [in] type The type of buffer. One of RINGBUF_TYPE_NOSPLIT, RINGBUF_TYPE_ALLOWSPLIT, RINGBUF_TYPE_BYTEBUF. * @param [in] type The type of buffer. One of RINGBUF_TYPE_NOSPLIT, RINGBUF_TYPE_ALLOWSPLIT, RINGBUF_TYPE_BYTEBUF.
*/ */
#ifdef ESP_IDF_VERSION //Quick hack to detect if using IDF version that replaced ringbuf_type_t #if defined(ESP_IDF_VERSION) && !defined(ESP_IDF_VERSION_VAL) //Quick hack to detect if using IDF version that replaced ringbuf_type_t, ESP_IDF_VERSION_VAL is for IDF>4.0.0
Ringbuffer::Ringbuffer(size_t length, RingbufferType_t type) { Ringbuffer::Ringbuffer(size_t length, RingbufferType_t type) {
#else #else
Ringbuffer::Ringbuffer(size_t length, ringbuf_type_t type) { Ringbuffer::Ringbuffer(size_t length, ringbuf_type_t type) {

2
lib/libesp32/NimBLE-Arduino/src/FreeRTOS.h
View File

@ -68,7 +68,7 @@ public:
*/ */
class Ringbuffer { class Ringbuffer {
public: public:
#ifdef ESP_IDF_VERSION //Quick hack to detect if using IDF version that replaced ringbuf_type_t #if defined(ESP_IDF_VERSION) && !defined(ESP_IDF_VERSION_VAL) //Quick hack to detect if using IDF version that replaced ringbuf_type_t, ESP_IDF_VERSION_VAL is for IDF>4.0.0
Ringbuffer(size_t length, RingbufferType_t type = RINGBUF_TYPE_NOSPLIT); Ringbuffer(size_t length, RingbufferType_t type = RINGBUF_TYPE_NOSPLIT);
#else #else
Ringbuffer(size_t length, ringbuf_type_t type = RINGBUF_TYPE_NOSPLIT); Ringbuffer(size_t length, ringbuf_type_t type = RINGBUF_TYPE_NOSPLIT);