Skip to content

Commit 9363ce8

Browse files
pre-commit-ci-lite[bot]pre-commit-ci-lite[bot]
authored
ci(pre-commit): Apply automatic fixes
1 parent 8466e3e commit 9363ce8

File tree

5 files changed

+28
-52
lines changed

5 files changed

+28
-52
lines changed

Diff for: ‎libraries/Ethernet/examples/ETH_LAN8720/ETH_LAN8720.ino

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Important to be defined BEFORE including ETH.h for ETH.begin() to work.
77
// Example RMII LAN8720 (Olimex, etc.)
88
#ifndef ETH_PHY_MDC
9-
#define ETH_PHY_TYPE ETH_PHY_LAN8720
9+
#define ETH_PHY_TYPE ETH_PHY_LAN8720
1010
#if CONFIG_IDF_TARGET_ESP32
1111
#define ETH_PHY_ADDR 0
1212
#define ETH_PHY_MDC 23

Diff for: ‎libraries/Ethernet/examples/ETH_TLK110/ETH_TLK110.ino

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <ETH.h>
77

88
#ifndef ETH_PHY_MDC
9-
#define ETH_PHY_TYPE ETH_PHY_TLK110
9+
#define ETH_PHY_TYPE ETH_PHY_TLK110
1010
#if CONFIG_IDF_TARGET_ESP32
1111
#define ETH_PHY_ADDR 31
1212
#define ETH_PHY_MDC 23

Diff for: ‎libraries/Ethernet/src/ETH.cpp

+15-39
Original file line numberDiff line numberDiff line change
@@ -152,45 +152,21 @@ void ETHClass::setTaskStackSize(size_t size) {
152152
#if CONFIG_IDF_TARGET_ESP32
153153
#define ETH_EMAC_DEFAULT_CONFIG() ETH_ESP32_EMAC_DEFAULT_CONFIG()
154154
#elif CONFIG_IDF_TARGET_ESP32P4
155-
#define ETH_EMAC_DEFAULT_CONFIG() \
156-
{ \
157-
.smi_gpio = \
158-
{ \
159-
.mdc_num = 31, \
160-
.mdio_num = 52 \
161-
}, \
162-
.interface = EMAC_DATA_INTERFACE_RMII, \
163-
.clock_config = \
164-
{ \
165-
.rmii = \
166-
{ \
167-
.clock_mode = EMAC_CLK_EXT_IN, \
168-
.clock_gpio = (emac_rmii_clock_gpio_t) ETH_RMII_CLK \
169-
} \
170-
}, \
171-
.dma_burst_len = ETH_DMA_BURST_LEN_32, \
172-
.intr_priority = 0, \
173-
.emac_dataif_gpio = \
174-
{ \
175-
.rmii = \
176-
{ \
177-
.tx_en_num = ETH_RMII_TX_EN, \
178-
.txd0_num = ETH_RMII_TX0, \
179-
.txd1_num = ETH_RMII_TX1, \
180-
.crs_dv_num = ETH_RMII_CRS_DV, \
181-
.rxd0_num = ETH_RMII_RX0, \
182-
.rxd1_num = ETH_RMII_RX1_EN \
183-
} \
184-
}, \
185-
.clock_config_out_in = \
186-
{ \
187-
.rmii = \
188-
{ \
189-
.clock_mode = EMAC_CLK_EXT_IN, \
190-
.clock_gpio = (emac_rmii_clock_gpio_t) -1 \
191-
} \
192-
}, \
193-
}
155+
#define ETH_EMAC_DEFAULT_CONFIG() \
156+
{ \
157+
.smi_gpio = {.mdc_num = 31, .mdio_num = 52}, .interface = EMAC_DATA_INTERFACE_RMII, \
158+
.clock_config = {.rmii = {.clock_mode = EMAC_CLK_EXT_IN, .clock_gpio = (emac_rmii_clock_gpio_t)ETH_RMII_CLK}}, .dma_burst_len = ETH_DMA_BURST_LEN_32, \
159+
.intr_priority = 0, \
160+
.emac_dataif_gpio = \
161+
{.rmii = \
162+
{.tx_en_num = ETH_RMII_TX_EN, \
163+
.txd0_num = ETH_RMII_TX0, \
164+
.txd1_num = ETH_RMII_TX1, \
165+
.crs_dv_num = ETH_RMII_CRS_DV, \
166+
.rxd0_num = ETH_RMII_RX0, \
167+
.rxd1_num = ETH_RMII_RX1_EN}}, \
168+
.clock_config_out_in = {.rmii = {.clock_mode = EMAC_CLK_EXT_IN, .clock_gpio = (emac_rmii_clock_gpio_t) - 1}}, \
169+
}
194170
#endif
195171

196172
bool ETHClass::begin(eth_phy_type_t type, int32_t phy_addr, int mdc, int mdio, int power, eth_clock_mode_t clock_mode) {

Diff for: ‎libraries/Ethernet/src/ETH.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -93,16 +93,16 @@ typedef enum {
9393
typedef emac_rmii_clock_mode_t eth_clock_mode_t;
9494
#include "pins_arduino.h"
9595
#ifndef ETH_RMII_TX_EN
96-
#define ETH_RMII_TX_EN 49
96+
#define ETH_RMII_TX_EN 49
9797
#endif
9898
#ifndef ETH_RMII_TX0
99-
#define ETH_RMII_TX0 34
99+
#define ETH_RMII_TX0 34
100100
#endif
101101
#ifndef ETH_RMII_TX1
102-
#define ETH_RMII_TX1 35
102+
#define ETH_RMII_TX1 35
103103
#endif
104104
#ifndef ETH_RMII_RX0
105-
#define ETH_RMII_RX0 29
105+
#define ETH_RMII_RX0 29
106106
#endif
107107
#ifndef ETH_RMII_RX1_EN
108108
#define ETH_RMII_RX1_EN 30
@@ -111,7 +111,7 @@ typedef emac_rmii_clock_mode_t eth_clock_mode_t;
111111
#define ETH_RMII_CRS_DV 28
112112
#endif
113113
#ifndef ETH_RMII_CLK
114-
#define ETH_RMII_CLK 50
114+
#define ETH_RMII_CLK 50
115115
#endif
116116
#endif
117117
#endif /* CONFIG_ETH_USE_ESP32_EMAC */

Diff for: ‎variants/esp32p4/pins_arduino.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,18 @@ static const uint8_t T11 = 13;
5757
static const uint8_t T12 = 14;
5858
static const uint8_t T13 = 15;
5959

60-
#define ETH_PHY_TYPE ETH_PHY_TLK110
61-
#define ETH_PHY_ADDR 1
62-
#define ETH_PHY_MDC 31
63-
#define ETH_PHY_MDIO 52
64-
#define ETH_PHY_POWER 51
60+
#define ETH_PHY_TYPE ETH_PHY_TLK110
61+
#define ETH_PHY_ADDR 1
62+
#define ETH_PHY_MDC 31
63+
#define ETH_PHY_MDIO 52
64+
#define ETH_PHY_POWER 51
6565
#define ETH_RMII_TX_EN 49
6666
#define ETH_RMII_TX0 34
6767
#define ETH_RMII_TX1 35
6868
#define ETH_RMII_RX0 29
6969
#define ETH_RMII_RX1_EN 30
7070
#define ETH_RMII_CRS_DV 28
7171
#define ETH_RMII_CLK 50
72-
#define ETH_CLK_MODE EMAC_CLK_EXT_IN
72+
#define ETH_CLK_MODE EMAC_CLK_EXT_IN
7373

7474
#endif /* Pins_Arduino_h */

0 commit comments

Comments
 (0)