espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-06-03 11:29:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_send_softap_event_error' into 'master'

Browse Source 
fix(esp8266): Fix send softap event id error

See merge request sdk/ESP8266_RTOS_SDK!249
This commit is contained in:
Wu Jian Gang
2018-06-28 19:34:51 +08:00
parent 6ab3c2ced0 922b2819ff
commit 8a90670956
6 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/esp8266/lib/VERSION
View File

@ -1,8 +1,8 @@
gwen:
crypto: 137694e
espnow: 137694e
core: bc4803f
net80211: 34c6b8d
core: 52dd0c7
net80211: 52dd0c7
pp: 137694e
pwm: 0181338
smartconfig:9ec59b5

BIN
components/esp8266/lib/libcore.a
View File

Binary file not shown.

BIN
components/esp8266/lib/libnet80211.a
View File

Binary file not shown.

4
components/esp8266/source/event_default_handlers.c
View File

@ -251,6 +251,10 @@ static esp_err_t esp_system_event_debug(system_event_t *event)
MAC2STR(stadisconnected->mac), stadisconnected->aid);
break;
}
case SYSTEM_EVENT_AP_STAIPASSIGNED: {
ESP_LOGD(TAG, "SYSTEM_EVENT_AP_STAIPASSIGNED");
break;
}
case SYSTEM_EVENT_AP_PROBEREQRECVED: {
system_event_ap_probe_req_rx_t *ap_probereqrecved = &event->event_info.ap_probereqrecved;
ESP_LOGD(TAG, "SYSTEM_EVENT_AP_PROBEREQRECVED, rssi:%d, mac:" MACSTR, \

4
components/lwip/apps/dhcpserver/dhcpserver.c
View File

@ -678,9 +678,9 @@ static void send_ack(struct dhcps_msg *m, u16_t len)
}
SendAck_err_t = udp_sendto(pcb_dhcps, p, IP_ADDR_BROADCAST, DHCPS_CLIENT_PORT);
DHCPS_LOG("dhcps: send_ack>>udp_sendto result %x\n", SendAck_err_t);
#if DHCPS_DEBUG
udp_sendto(pcb_dhcps, p, IP_ADDR_BROADCAST, DHCPS_CLIENT_PORT);
DHCPS_LOG("dhcps: send_ack>>udp_sendto result %x\n", SendAck_err_t);
#endif
if (SendAck_err_t == ERR_OK) {

2
components/lwip/port/esp8266/netif/ethernetif.c
View File

@ -269,7 +269,7 @@ int8_t ethernetif_init(struct netif* netif)
if (wifi_get_netif(TCPIP_ADAPTER_IF_STA) == TCPIP_ADAPTER_IF_STA) {
esp_wifi_get_mac(TCPIP_ADAPTER_IF_STA, mac);
} else {
esp_wifi_set_mac(TCPIP_ADAPTER_IF_AP, mac);
esp_wifi_get_mac(TCPIP_ADAPTER_IF_AP, mac);
}
memcpy(netif->hwaddr, mac, NETIF_MAX_HWADDR_LEN);