Procházet zdrojové kódy

【完善】导出一些连接状态常量

SummerGift před 6 roky
rodič
revize
410be0cc71
2 změnil soubory, kde provedl 21 přidání a 6 odebrání
  1. 6 0
      port/genhdr/qstrdefs.generated.h
  2. 15 6
      port/network_wlan.c

+ 6 - 0
port/genhdr/qstrdefs.generated.h

@@ -715,5 +715,11 @@ QDEF(MP_QSTR_hidden, (const byte*)"\xef\x06" "hidden")
 QDEF(MP_QSTR_authmode, (const byte*)"\xce\x08" "authmode")
 QDEF(MP_QSTR_authmode, (const byte*)"\xce\x08" "authmode")
 QDEF(MP_QSTR_channel, (const byte*)"\x26\x07" "channel")
 QDEF(MP_QSTR_channel, (const byte*)"\x26\x07" "channel")
 QDEF(MP_QSTR_dhcp_hostname, (const byte*)"\xa2\x0d" "dhcp_hostname")
 QDEF(MP_QSTR_dhcp_hostname, (const byte*)"\xa2\x0d" "dhcp_hostname")
+QDEF(MP_QSTR_STAT_GOT_IP, (const byte*)"\xb2\x0b" "STAT_GOT_IP")
+QDEF(MP_QSTR_STAT_CONNECT_FAIL, (const byte*)"\x0b\x11" "STAT_CONNECT_FAIL")
+QDEF(MP_QSTR_STAT_NO_AP_FOUND, (const byte*)"\xee\x10" "STAT_NO_AP_FOUND")
+QDEF(MP_QSTR_STAT_WRONG_PASSWORD, (const byte*)"\x0b\x13" "STAT_WRONG_PASSWORD")
+QDEF(MP_QSTR_STAT_CONNECTING, (const byte*)"\xf6\x0f" "STAT_CONNECTING")
+QDEF(MP_QSTR_STAT_IDLE, (const byte*)"\x0c\x09" "STAT_IDLE")
 
 
 // This file was automatically generated by makeqstrdata.py
 // This file was automatically generated by makeqstrdata.py

+ 15 - 6
port/network_wlan.c

@@ -47,6 +47,15 @@ typedef struct _wlan_if_obj_t {
     int if_id;
     int if_id;
 } wlan_if_obj_t;
 } wlan_if_obj_t;
 
 
+enum {
+    STATION_IDLE = 0,
+    STATION_CONNECTING,
+    STATION_WRONG_PASSWORD,
+    STATION_NO_AP_FOUND,
+    STATION_CONNECT_FAIL,
+    STATION_GOT_IP,
+};
+
 const mp_obj_type_t wlan_if_type;
 const mp_obj_type_t wlan_if_type;
 STATIC struct rt_wlan_info _ap_info;
 STATIC struct rt_wlan_info _ap_info;
 STATIC char _ap_password[RT_WLAN_PASSWORD_MAX_LENGTH];
 STATIC char _ap_password[RT_WLAN_PASSWORD_MAX_LENGTH];
@@ -529,12 +538,12 @@ STATIC const mp_rom_map_elem_t wlan_if_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_ifconfig), MP_ROM_PTR(&wlan_ifconfig_obj) },
     { MP_ROM_QSTR(MP_QSTR_ifconfig), MP_ROM_PTR(&wlan_ifconfig_obj) },
     
     
 #if MODNETWORK_INCLUDE_CONSTANTS
 #if MODNETWORK_INCLUDE_CONSTANTS
-//    { MP_ROM_QSTR(MP_QSTR_STAT_IDLE), MP_ROM_INT(STATION_IDLE)},
-//    { MP_ROM_QSTR(MP_QSTR_STAT_CONNECTING), MP_ROM_INT(STATION_CONNECTING)},
-//    { MP_ROM_QSTR(MP_QSTR_STAT_WRONG_PASSWORD), MP_ROM_INT(STATION_WRONG_PASSWORD)},
-//    { MP_ROM_QSTR(MP_QSTR_STAT_NO_AP_FOUND), MP_ROM_INT(STATION_NO_AP_FOUND)},
-//    { MP_ROM_QSTR(MP_QSTR_STAT_CONNECT_FAIL), MP_ROM_INT(STATION_CONNECT_FAIL)},
-//    { MP_ROM_QSTR(MP_QSTR_STAT_GOT_IP), MP_ROM_INT(STATION_GOT_IP)},
+    { MP_ROM_QSTR(MP_QSTR_STAT_IDLE), MP_ROM_INT(STATION_IDLE)},
+    { MP_ROM_QSTR(MP_QSTR_STAT_CONNECTING), MP_ROM_INT(STATION_CONNECTING)},
+    { MP_ROM_QSTR(MP_QSTR_STAT_WRONG_PASSWORD), MP_ROM_INT(STATION_WRONG_PASSWORD)},
+    { MP_ROM_QSTR(MP_QSTR_STAT_NO_AP_FOUND), MP_ROM_INT(STATION_NO_AP_FOUND)},
+    { MP_ROM_QSTR(MP_QSTR_STAT_CONNECT_FAIL), MP_ROM_INT(STATION_CONNECT_FAIL)},
+    { MP_ROM_QSTR(MP_QSTR_STAT_GOT_IP), MP_ROM_INT(STATION_GOT_IP)},
 
 
 //    { MP_ROM_QSTR(MP_QSTR_MODE_11B), MP_ROM_INT(PHY_MODE_11B) },
 //    { MP_ROM_QSTR(MP_QSTR_MODE_11B), MP_ROM_INT(PHY_MODE_11B) },
 //    { MP_ROM_QSTR(MP_QSTR_MODE_11G), MP_ROM_INT(PHY_MODE_11G) },
 //    { MP_ROM_QSTR(MP_QSTR_MODE_11G), MP_ROM_INT(PHY_MODE_11G) },