github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-07-10 17:05:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2026-03-08 08:16:26 -10:00
parent d59c2c3435 3f143d9f19
commit cb4d969ffc
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/ethernet/esp_eth_phy_jl1101.c
+2
View File
@@ -12,6 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#include "esphome/core/defines.h"
#ifdef USE_ESP32
#include <string.h>
esphome/components/ethernet/ethernet_component.h
+1 -1
View File
@@ -214,7 +214,7 @@ class EthernetComponent : public Component {
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
extern EthernetComponent *global_eth_component;
#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 4, 2)
#if defined(USE_ETHERNET_JL1101) && (ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 4, 2) || !defined(PLATFORMIO))
extern "C" esp_eth_phy_t *esp_eth_phy_new_jl1101(const eth_phy_config_t *config);
#endif