Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-25 16:38:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Bump Arduino SDK for ESP32 to 1.0.6 (#1789)

Browse source 
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
This commit is contained in:
Stefan Agner 2021-05-17 01:38:26 +02:00 committed by GitHub
parent 5645be4e0f
commit 98166dfa66
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
esphome/components/ethernet/ethernet_component.cpp
View file

@ -224,10 +224,17 @@ void EthernetComponent::dump_connect_params_() {
ESP_LOGCONFIG(TAG, " Subnet: %s", IPAddress(ip.netmask.addr).toString().c_str()); ESP_LOGCONFIG(TAG, " Subnet: %s", IPAddress(ip.netmask.addr).toString().c_str());
ESP_LOGCONFIG(TAG, " Gateway: %s", IPAddress(ip.gw.addr).toString().c_str()); ESP_LOGCONFIG(TAG, " Gateway: %s", IPAddress(ip.gw.addr).toString().c_str());
ip_addr_t dns_ip = dns_getserver(0); #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(3, 3, 4)
ESP_LOGCONFIG(TAG, " DNS1: %s", IPAddress(dns_ip.u_addr.ip4.addr).toString().c_str()); const ip_addr_t *dns_ip1 = dns_getserver(0);
dns_ip = dns_getserver(1); const ip_addr_t *dns_ip2 = dns_getserver(1);
ESP_LOGCONFIG(TAG, " DNS2: %s", IPAddress(dns_ip.u_addr.ip4.addr).toString().c_str()); #else
ip_addr_t tmp_ip1 = dns_getserver(0);
const ip_addr_t *dns_ip1 = &tmp_ip1;
ip_addr_t tmp_ip2 = dns_getserver(1);
const ip_addr_t *dns_ip2 = &tmp_ip2;
#endif
ESP_LOGCONFIG(TAG, " DNS1: %s", IPAddress(dns_ip1->u_addr.ip4.addr).toString().c_str());
ESP_LOGCONFIG(TAG, " DNS2: %s", IPAddress(dns_ip2->u_addr.ip4.addr).toString().c_str());
uint8_t mac[6]; uint8_t mac[6];
esp_eth_get_mac(mac); esp_eth_get_mac(mac);
ESP_LOGCONFIG(TAG, " MAC Address: %02X:%02X:%02X:%02X:%02X:%02X", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); ESP_LOGCONFIG(TAG, " MAC Address: %02X:%02X:%02X:%02X:%02X:%02X", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);

2
esphome/core/config.py
View file

@ -76,7 +76,7 @@ PLATFORMIO_ESP8266_LUT = {
PLATFORMIO_ESP32_LUT = { PLATFORMIO_ESP32_LUT = {
**ARDUINO_VERSION_ESP32, **ARDUINO_VERSION_ESP32,
"RECOMMENDED": ARDUINO_VERSION_ESP32["1.0.4"], "RECOMMENDED": ARDUINO_VERSION_ESP32["1.0.6"],
"LATEST": "espressif32", "LATEST": "espressif32",
"DEV": ARDUINO_VERSION_ESP32["dev"], "DEV": ARDUINO_VERSION_ESP32["dev"],
} }

5
esphome/core/util.h
View file

@ -5,6 +5,11 @@
namespace esphome { namespace esphome {
/// Macro for IDF version comparision
#ifndef ESP_IDF_VERSION_VAL
#define ESP_IDF_VERSION_VAL(major, minor, patch) ((major << 16) | (minor << 8) | (patch))
#endif
/// Return whether the node is connected to the network (through wifi, eth, ...) /// Return whether the node is connected to the network (through wifi, eth, ...)
bool network_is_connected(); bool network_is_connected();
/// Get the active network hostname /// Get the active network hostname