m5/M5Stack_MicroPython
0
0
Fork 0
mirror of https://github.com/m5stack/M5Stack_MicroPython.git synced 2026-05-20 10:14:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug fix: LAN class not added to the network module

Browse Source
This commit is contained in:
Boris Lovosevic
2018-01-18 09:44:18 +01:00
parent cc836a3c5d
commit af0a91d0ba
2 changed files with 27 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MicroPython_BUILD/components/micropython/esp32/modnetwork.c
+26 -37
View File
@@ -337,7 +337,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp_scan_obj, esp_scan);
STATIC mp_obj_t esp_isconnected(mp_obj_t self_in) {
wlan_if_obj_t *self = MP_OBJ_TO_PTR(self_in);
if (self->if_id == WIFI_IF_STA) {
tcpip_adapter_ip_info_t info;
//tcpip_adapter_ip_info_t info;
//tcpip_adapter_get_ip_info(WIFI_IF_STA, &info);
//return mp_obj_new_bool(info.ip.addr != 0);
return mp_obj_new_bool(_isConnected);
@@ -824,56 +824,45 @@ extern const mp_obj_type_t mdns_type;
//==============================================================
STATIC const mp_map_elem_t mp_module_network_globals_table[] = {
{ MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_network) },
{ MP_OBJ_NEW_QSTR(MP_QSTR___init__), (mp_obj_t)&esp_initialize_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_WLAN), (mp_obj_t)&get_wlan_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_phy_mode), (mp_obj_t)&esp_phy_mode_obj },
#ifdef MICROPY_USE_ETHERNET
{ MP_OBJ_NEW_QSTR(MP_QSTR_LAN), (mp_obj_t)&get_lan_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_network) },
{ MP_OBJ_NEW_QSTR(MP_QSTR___init__), (mp_obj_t)&esp_initialize_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_WLAN), (mp_obj_t)&get_wlan_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_phy_mode), (mp_obj_t)&esp_phy_mode_obj },
#ifdef CONFIG_MICROPY_USE_ETHERNET
{ MP_OBJ_NEW_QSTR(MP_QSTR_LAN), (mp_obj_t)&get_lan_obj },
#endif
#ifdef CONFIG_MICROPY_USE_MQTT
{ MP_ROM_QSTR(MP_QSTR_mqtt), MP_ROM_PTR(&mqtt_type) },
{ MP_ROM_QSTR(MP_QSTR_mqtt), MP_ROM_PTR(&mqtt_type) },
#endif
#ifdef CONFIG_MICROPY_USE_TELNET
{ MP_ROM_QSTR(MP_QSTR_telnet), MP_ROM_PTR(&network_telnet_type) },
{ MP_ROM_QSTR(MP_QSTR_telnet), MP_ROM_PTR(&network_telnet_type) },
#endif
#ifdef CONFIG_MICROPY_USE_FTPSERVER
{ MP_ROM_QSTR(MP_QSTR_ftp), MP_ROM_PTR(&network_ftp_type) },
{ MP_ROM_QSTR(MP_QSTR_ftp), MP_ROM_PTR(&network_ftp_type) },
#endif
#ifdef CONFIG_MICROPY_USE_MDNS
{ MP_ROM_QSTR(MP_QSTR_mDNS), MP_ROM_PTR(&mdns_type) },
{ MP_ROM_QSTR(MP_QSTR_mDNS), MP_ROM_PTR(&mdns_type) },
#endif
#if MODNETWORK_INCLUDE_CONSTANTS
{ MP_OBJ_NEW_QSTR(MP_QSTR_STA_IF),
MP_OBJ_NEW_SMALL_INT(WIFI_IF_STA)},
{ MP_OBJ_NEW_QSTR(MP_QSTR_AP_IF),
MP_OBJ_NEW_SMALL_INT(WIFI_IF_AP)},
{ MP_OBJ_NEW_QSTR(MP_QSTR_STA_IF), MP_OBJ_NEW_SMALL_INT(WIFI_IF_STA)},
{ MP_OBJ_NEW_QSTR(MP_QSTR_AP_IF), MP_OBJ_NEW_SMALL_INT(WIFI_IF_AP)},
{ MP_OBJ_NEW_QSTR(MP_QSTR_MODE_11B),
MP_OBJ_NEW_SMALL_INT(WIFI_PROTOCOL_11B) },
{ MP_OBJ_NEW_QSTR(MP_QSTR_MODE_11G),
MP_OBJ_NEW_SMALL_INT(WIFI_PROTOCOL_11G) },
{ MP_OBJ_NEW_QSTR(MP_QSTR_MODE_11N),
MP_OBJ_NEW_SMALL_INT(WIFI_PROTOCOL_11N) },
{ MP_OBJ_NEW_QSTR(MP_QSTR_MODE_11B), MP_OBJ_NEW_SMALL_INT(WIFI_PROTOCOL_11B) },
{ MP_OBJ_NEW_QSTR(MP_QSTR_MODE_11G), MP_OBJ_NEW_SMALL_INT(WIFI_PROTOCOL_11G) },
{ MP_OBJ_NEW_QSTR(MP_QSTR_MODE_11N), MP_OBJ_NEW_SMALL_INT(WIFI_PROTOCOL_11N) },
{ MP_OBJ_NEW_QSTR(MP_QSTR_AUTH_OPEN),
MP_OBJ_NEW_SMALL_INT(WIFI_AUTH_OPEN) },
{ MP_OBJ_NEW_QSTR(MP_QSTR_AUTH_WEP),
MP_OBJ_NEW_SMALL_INT(WIFI_AUTH_WEP) },
{ MP_OBJ_NEW_QSTR(MP_QSTR_AUTH_WPA_PSK),
MP_OBJ_NEW_SMALL_INT(WIFI_AUTH_WPA_PSK) },
{ MP_OBJ_NEW_QSTR(MP_QSTR_AUTH_WPA2_PSK),
MP_OBJ_NEW_SMALL_INT(WIFI_AUTH_WPA2_PSK) },
{ MP_OBJ_NEW_QSTR(MP_QSTR_AUTH_WPA_WPA2_PSK),
MP_OBJ_NEW_SMALL_INT(WIFI_AUTH_WPA_WPA2_PSK) },
{ MP_OBJ_NEW_QSTR(MP_QSTR_AUTH_MAX),
MP_OBJ_NEW_SMALL_INT(WIFI_AUTH_MAX) },
{ MP_OBJ_NEW_QSTR(MP_QSTR_AUTH_OPEN), MP_OBJ_NEW_SMALL_INT(WIFI_AUTH_OPEN) },
{ MP_OBJ_NEW_QSTR(MP_QSTR_AUTH_WEP), MP_OBJ_NEW_SMALL_INT(WIFI_AUTH_WEP) },
{ MP_OBJ_NEW_QSTR(MP_QSTR_AUTH_WPA_PSK), MP_OBJ_NEW_SMALL_INT(WIFI_AUTH_WPA_PSK) },
{ MP_OBJ_NEW_QSTR(MP_QSTR_AUTH_WPA2_PSK), MP_OBJ_NEW_SMALL_INT(WIFI_AUTH_WPA2_PSK) },
{ MP_OBJ_NEW_QSTR(MP_QSTR_AUTH_WPA_WPA2_PSK), MP_OBJ_NEW_SMALL_INT(WIFI_AUTH_WPA_WPA2_PSK) },
{ MP_OBJ_NEW_QSTR(MP_QSTR_AUTH_MAX), MP_OBJ_NEW_SMALL_INT(WIFI_AUTH_MAX) },
{ MP_OBJ_NEW_QSTR(MP_QSTR_PHY_LAN8720),
MP_OBJ_NEW_SMALL_INT(PHY_LAN8720) },
{ MP_OBJ_NEW_QSTR(MP_QSTR_PHY_TLK110),
MP_OBJ_NEW_SMALL_INT(PHY_TLK110) },
#ifdef CONFIG_MICROPY_USE_ETHERNET
{ MP_OBJ_NEW_QSTR(MP_QSTR_PHY_LAN8720), MP_OBJ_NEW_SMALL_INT(PHY_LAN8720) },
{ MP_OBJ_NEW_QSTR(MP_QSTR_PHY_TLK110), MP_OBJ_NEW_SMALL_INT(PHY_TLK110) },
#endif
#endif
};
MicroPython_BUILD/components/micropython/esp32/modnetwork.h
+1 -1
View File
@@ -35,7 +35,7 @@ typedef struct _wlan_if_obj_t {
extern const mp_obj_type_t wlan_if_type;
#ifdef MICROPY_USE_ETHERNET
#ifdef CONFIG_MICROPY_USE_ETHERNET
MP_DECLARE_CONST_FUN_OBJ_KW(get_lan_obj);
#endif