arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-27 21:16:50 +03:00
Code

reorder part one

Browse Source
This commit is contained in:
Markus Sattler 2015-12-28 17:22:36 +01:00
parent b1b19299bb
commit 49b0821beb
2 changed files with 1066 additions and 935 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1863
libraries/ESP8266WiFi/src/ESP8266WiFi.cpp
View File

File diff suppressed because it is too large Load Diff

138
libraries/ESP8266WiFi/src/ESP8266WiFi.h
View File

@ -61,96 +61,82 @@ class ESP8266WiFiClass {
void mode(WiFiMode); void mode(WiFiMode);
WiFiMode getMode(); WiFiMode getMode();
// ----------------------------------------------------------------------------------------------
// ---------------------------------------- STA function ----------------------------------------
// ----------------------------------------------------------------------------------------------
int begin(const char* ssid, const char *passphrase = NULL, int32_t channel = 0, const uint8_t* bssid = NULL); int begin(const char* ssid, const char *passphrase = NULL, int32_t channel = 0, const uint8_t* bssid = NULL);
int begin(char* ssid, char *passphrase = NULL, int32_t channel = 0, const uint8_t* bssid = NULL); int begin(char* ssid, char *passphrase = NULL, int32_t channel = 0, const uint8_t* bssid = NULL);
int begin(); int begin();
uint8_t waitForConnectResult();
void softAP(const char* ssid, const char* passphrase = NULL, int channel = 1, int ssid_hidden = 0);
void config(IPAddress local_ip, IPAddress gateway, IPAddress subnet); void config(IPAddress local_ip, IPAddress gateway, IPAddress subnet);
void config(IPAddress local_ip, IPAddress gateway, IPAddress subnet, IPAddress dns); void config(IPAddress local_ip, IPAddress gateway, IPAddress subnet, IPAddress dns);
void softAPConfig(IPAddress local_ip, IPAddress gateway, IPAddress subnet);
int softAPdisconnect(bool wifioff = false);
int disconnect(bool wifioff = false); int disconnect(bool wifioff = false);
uint8_t waitForConnectResult();
// STA network info
IPAddress localIP();
uint8_t* macAddress(uint8_t* mac); uint8_t* macAddress(uint8_t* mac);
String macAddress(void); String macAddress(void);
uint8_t* softAPmacAddress(uint8_t* mac);
String softAPmacAddress(void);
IPAddress localIP();
IPAddress softAPIP();
IPAddress subnetMask(); IPAddress subnetMask();
IPAddress gatewayIP(); IPAddress gatewayIP();
IPAddress dnsIP(uint8_t dns_no = 0); IPAddress dnsIP(uint8_t dns_no = 0);
String SSID() const;
String psk() const;
uint8_t *BSSID(void);
String BSSIDstr(void);
int32_t channel(void);
int32_t RSSI();
int8_t scanComplete();
void scanDelete();
int8_t scanNetworks(bool async = false, bool show_hidden = false);
String SSID(uint8_t networkItem);
uint8_t encryptionType(uint8_t networkItem);
int32_t RSSI(uint8_t networkItem);
uint8_t * BSSID(uint8_t networkItem);
String BSSIDstr(uint8_t networkItem);
int32_t channel(uint8_t networkItem);
bool isHidden(uint8_t networkItem);
bool getNetworkInfo(uint8_t networkItem, String &ssid, uint8_t &encryptionType, int32_t &RSSI, uint8_t* &BSSID, int32_t &channel, bool &isHidden);
wl_status_t status();
int hostByName(const char* aHostname, IPAddress& aResult);
String hostname(void); String hostname(void);
bool hostname(char* aHostname); bool hostname(char* aHostname);
bool hostname(const char* aHostname); bool hostname(const char* aHostname);
bool hostname(String aHostname); bool hostname(String aHostname);
// STA WiFi info
wl_status_t status();
String SSID() const;
String psk() const;
bool beginWPSConfig(void); uint8_t *BSSID(void);
String BSSIDstr(void);
void printDiag(Print& dest); int32_t RSSI();
// ----------------------------------------------------------------------------------------------
// ----------------------------------------- AP function ----------------------------------------
// ----------------------------------------------------------------------------------------------
void softAP(const char* ssid, const char* passphrase = NULL, int channel = 1, int ssid_hidden = 0);
void softAPConfig(IPAddress local_ip, IPAddress gateway, IPAddress subnet);
int softAPdisconnect(bool wifioff = false);
void beginSmartConfig(); IPAddress softAPIP();
bool smartConfigDone();
void stopSmartConfig();
friend class WiFiClient; uint8_t* softAPmacAddress(uint8_t* mac);
friend class WiFiServer; String softAPmacAddress(void);
// ----------------------------------------------------------------------------------------------
// ----------------------------------------- scan function --------------------------------------
// ----------------------------------------------------------------------------------------------
int8_t scanNetworks(bool async = false, bool show_hidden = false);
int8_t scanComplete();
void scanDelete();
// scan result
bool getNetworkInfo(uint8_t networkItem, String &ssid, uint8_t &encryptionType, int32_t &RSSI, uint8_t* &BSSID, int32_t &channel, bool &isHidden);
String SSID(uint8_t networkItem);
uint8_t encryptionType(uint8_t networkItem);
int32_t RSSI(uint8_t networkItem);
uint8_t * BSSID(uint8_t networkItem);
String BSSIDstr(uint8_t networkItem);
int32_t channel(uint8_t networkItem);
bool isHidden(uint8_t networkItem);
// ----------------------------------------------------------------------------------------------
// -------------------------------------- Generic WiFi function ---------------------------------
// ----------------------------------------------------------------------------------------------
int32_t channel(void);
bool setSleepMode(WiFiSleepType_t type); bool setSleepMode(WiFiSleepType_t type);
WiFiSleepType_t getSleepMode(); WiFiSleepType_t getSleepMode();
@ -158,6 +144,34 @@ class ESP8266WiFiClass {
bool setPhyMode(WiFiPhyMode_t mode); bool setPhyMode(WiFiPhyMode_t mode);
WiFiPhyMode_t getPhyMode(); WiFiPhyMode_t getPhyMode();
// ----------------------------------------------------------------------------------------------
// ------------------------------------ Generic Network function --------------------------------
// ----------------------------------------------------------------------------------------------
int hostByName(const char* aHostname, IPAddress& aResult);
// ----------------------------------------------------------------------------------------------
// ------------------------------------ STA remote configure -----------------------------------
// ----------------------------------------------------------------------------------------------
bool beginWPSConfig(void);
void beginSmartConfig();
bool smartConfigDone();
void stopSmartConfig();
// ----------------------------------------------------------------------------------------------
// ------------------------------------------- Debug --------------------------------------------
// ----------------------------------------------------------------------------------------------
void printDiag(Print& dest);
friend class WiFiClient;
friend class WiFiServer;
protected: protected:
void _mode(WiFiMode); void _mode(WiFiMode);
static void _scanDone(void* result, int status); static void _scanDone(void* result, int status);