Skip to content

Commit a856b26

Browse files
committed
fix(net): Update pin naming and log levels
1 parent cdf0acb commit a856b26

File tree

5 files changed

+23
-11
lines changed

5 files changed

+23
-11
lines changed

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

+17-7
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,11 @@ bool ETHClass::beginSPI(
535535
if (_spi != NULL) {
536536
pinMode(_pin_cs, OUTPUT);
537537
digitalWrite(_pin_cs, HIGH);
538-
perimanSetPinBusExtraType(_pin_cs, "ETH_CS");
538+
char cs_num_str[3];
539+
itoa(_eth_index, cs_num_str, 10);
540+
strcat(strcpy(_cs_str, "ETH_CS["), cs_num_str);
541+
strcat(_cs_str, "]");
542+
perimanSetPinBusExtraType(_pin_cs, _cs_str);
539543
}
540544
#endif
541545

@@ -742,40 +746,46 @@ bool ETHClass::beginSPI(
742746
#if ETH_SPI_SUPPORTS_CUSTOM
743747
if (_spi == NULL) {
744748
#endif
745-
if (!perimanSetPinBus(_pin_cs, ESP32_BUS_TYPE_ETHERNET_SPI, (void *)(this), -1, -1)) {
749+
if (!perimanSetPinBus(_pin_cs, ESP32_BUS_TYPE_ETHERNET_SPI, (void *)(this), _eth_index, -1)) {
746750
goto err;
747751
}
752+
perimanSetPinBusExtraType(_pin_cs, "ETH_SPI_CS");
748753
#if ETH_SPI_SUPPORTS_CUSTOM
749754
}
750755
#endif
751756
#if ETH_SPI_SUPPORTS_NO_IRQ
752757
if (_pin_irq != -1) {
753758
#endif
754-
if (!perimanSetPinBus(_pin_irq, ESP32_BUS_TYPE_ETHERNET_SPI, (void *)(this), -1, -1)) {
759+
if (!perimanSetPinBus(_pin_irq, ESP32_BUS_TYPE_ETHERNET_SPI, (void *)(this), _eth_index, -1)) {
755760
goto err;
756761
}
762+
perimanSetPinBusExtraType(_pin_irq, "ETH_IRQ");
757763
#if ETH_SPI_SUPPORTS_NO_IRQ
758764
}
759765
#endif
760766
if (_pin_sck != -1) {
761-
if (!perimanSetPinBus(_pin_sck, ESP32_BUS_TYPE_ETHERNET_SPI, (void *)(this), -1, -1)) {
767+
if (!perimanSetPinBus(_pin_sck, ESP32_BUS_TYPE_ETHERNET_SPI, (void *)(this), _eth_index, -1)) {
762768
goto err;
763769
}
770+
perimanSetPinBusExtraType(_pin_sck, "ETH_SPI_SCK");
764771
}
765772
if (_pin_miso != -1) {
766-
if (!perimanSetPinBus(_pin_miso, ESP32_BUS_TYPE_ETHERNET_SPI, (void *)(this), -1, -1)) {
773+
if (!perimanSetPinBus(_pin_miso, ESP32_BUS_TYPE_ETHERNET_SPI, (void *)(this), _eth_index, -1)) {
767774
goto err;
768775
}
776+
perimanSetPinBusExtraType(_pin_miso, "ETH_SPI_MISO");
769777
}
770778
if (_pin_mosi != -1) {
771-
if (!perimanSetPinBus(_pin_mosi, ESP32_BUS_TYPE_ETHERNET_SPI, (void *)(this), -1, -1)) {
779+
if (!perimanSetPinBus(_pin_mosi, ESP32_BUS_TYPE_ETHERNET_SPI, (void *)(this), _eth_index, -1)) {
772780
goto err;
773781
}
782+
perimanSetPinBusExtraType(_pin_mosi, "ETH_SPI_MOSI");
774783
}
775784
if (_pin_rst != -1) {
776-
if (!perimanSetPinBus(_pin_rst, ESP32_BUS_TYPE_ETHERNET_SPI, (void *)(this), -1, -1)) {
785+
if (!perimanSetPinBus(_pin_rst, ESP32_BUS_TYPE_ETHERNET_SPI, (void *)(this), _eth_index, -1)) {
777786
goto err;
778787
}
788+
perimanSetPinBusExtraType(_pin_rst, "ETH_RST");
779789
}
780790

781791
Network.onSysEvent(onEthConnected, ARDUINO_EVENT_ETH_CONNECTED);

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

+1
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ class ETHClass : public NetworkInterface {
188188
esp_eth_phy_t *_phy;
189189
#if ETH_SPI_SUPPORTS_CUSTOM
190190
SPIClass *_spi;
191+
char _cs_str[10];
191192
#endif
192193
uint8_t _spi_freq_mhz;
193194
int8_t _pin_cs;

Diff for: libraries/PPP/src/PPP.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,7 @@ bool PPPClass::begin(ppp_modem_model_t model, uint8_t uart_num, int baud_rate) {
283283
} else {
284284
pinMode(_pin_rst, OUTPUT);
285285
}
286+
perimanSetPinBusExtraType(_pin_rst, "PPP_MODEM_RST");
286287
digitalWrite(_pin_rst, !_pin_rst_act_low);
287288
delay(200);
288289
digitalWrite(_pin_rst, _pin_rst_act_low);

Diff for: libraries/WiFi/src/AP.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ static void _onApArduinoEvent(arduino_event_t *ev) {
8585
if (_ap_network_if == NULL || ev->event_id < ARDUINO_EVENT_WIFI_AP_START || ev->event_id > ARDUINO_EVENT_WIFI_AP_GOT_IP6) {
8686
return;
8787
}
88-
log_d("Arduino AP Event: %d - %s", ev->event_id, Network.eventName(ev->event_id));
88+
log_v("Arduino AP Event: %d - %s", ev->event_id, Network.eventName(ev->event_id));
8989
if (ev->event_id == ARDUINO_EVENT_WIFI_AP_START) {
9090
if (_ap_network_if->getStatusBits() & ESP_NETIF_WANT_IP6_BIT) {
9191
esp_err_t err = esp_netif_create_ip6_linklocal(_ap_network_if->netif());

Diff for: libraries/WiFi/src/STA.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ static void _onStaArduinoEvent(arduino_event_t *ev) {
107107
return;
108108
}
109109
static bool first_connect = true;
110-
log_d("Arduino STA Event: %d - %s", ev->event_id, Network.eventName(ev->event_id));
110+
log_v("Arduino STA Event: %d - %s", ev->event_id, Network.eventName(ev->event_id));
111111

112112
if (ev->event_id == ARDUINO_EVENT_WIFI_STA_START) {
113113
_sta_network_if->_setStatus(WL_DISCONNECTED);
@@ -162,11 +162,11 @@ static void _onStaArduinoEvent(arduino_event_t *ev) {
162162
_sta_network_if->connect();
163163
}
164164
} else if (ev->event_id == ARDUINO_EVENT_WIFI_STA_GOT_IP) {
165-
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
165+
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_VERBOSE
166166
uint8_t *ip = (uint8_t *)&(ev->event_info.got_ip.ip_info.ip.addr);
167167
uint8_t *mask = (uint8_t *)&(ev->event_info.got_ip.ip_info.netmask.addr);
168168
uint8_t *gw = (uint8_t *)&(ev->event_info.got_ip.ip_info.gw.addr);
169-
log_d(
169+
log_v(
170170
"STA IP: %u.%u.%u.%u, MASK: %u.%u.%u.%u, GW: %u.%u.%u.%u", ip[0], ip[1], ip[2], ip[3], mask[0], mask[1], mask[2], mask[3], gw[0], gw[1], gw[2], gw[3]
171171
);
172172
#endif

0 commit comments

Comments
 (0)