GitHub-Proxy/ESP3D
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/luc-github/ESP3D.git synced 2025-08-15 13:45:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add mDNS feature

Browse Source 
Add mDNS feature
This commit is contained in:
luc lebosse 2015-04-21 10:39:04 +08:00
parent 7bd428b47a
commit f2d80d6017
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
esp8266/wifi.cpp
View File

@ -22,6 +22,7 @@
#include "config.h" #include "config.h"
#include "ESP8266WiFi.h" #include "ESP8266WiFi.h"
#include "IPAddress.h" #include "IPAddress.h"
#include <ESP8266mDNS.h>
extern "C" { extern "C" {
#include "user_interface.h" #include "user_interface.h"
} }
@ -65,7 +66,7 @@ void WIFI_CONFIG::configAP(IPAddress local_ip, IPAddress gateway, IPAddress subn
char * WIFI_CONFIG::mac2str(uint8_t mac [WL_MAC_ADDR_LENGTH]) char * WIFI_CONFIG::mac2str(uint8_t mac [WL_MAC_ADDR_LENGTH])
{ {
static char macstr [18]; static char macstr [18];
if (0>sprintf(macstr, "%02X:%02X:%02X:%02X:%02X:%02X",mac[5],mac[4],mac[3],mac[2],mac[1],mac[0])) strcpy (macstr, "00:00:00:00:00:00"); if (0>sprintf(macstr, "%02X:%02X:%02X:%02X:%02X:%02X",mac[0],mac[1],mac[2],mac[3],mac[4],mac[5])) strcpy (macstr, "00:00:00:00:00:00");
return macstr; return macstr;
} }
@ -85,6 +86,8 @@ bool WIFI_CONFIG::Setup()
char sbuf[35]; char sbuf[35];
int wstatus; int wstatus;
byte ip[4]={0,0,0,0}; byte ip[4]={0,0,0,0};
IPAddress currentIP;
//AP or client ? //AP or client ?
if (!CONFIG::read_byte(EP_WIFI_MODE, &bbuf ) || !CONFIG::read_string(EP_SSID, sbuf , MAX_SSID_LENGH) ||!CONFIG::read_string(EP_PASSWORD, pwd , MAX_PASSWORD_LENGH)) return false; if (!CONFIG::read_byte(EP_WIFI_MODE, &bbuf ) || !CONFIG::read_string(EP_SSID, sbuf , MAX_SSID_LENGH) ||!CONFIG::read_string(EP_PASSWORD, pwd , MAX_PASSWORD_LENGH)) return false;
//disconnect if connected //disconnect if connected
@ -99,6 +102,12 @@ bool WIFI_CONFIG::Setup()
{ {
WiFi.mode(WIFI_STA); WiFi.mode(WIFI_STA);
WiFi.begin(sbuf, pwd); WiFi.begin(sbuf, pwd);
byte i=0;
while (WiFi.status() != WL_CONNECTED && i<40) {
delay(500);
Serial.println(WiFi.status());
i++;
}
} }
//DHCP or Static IP ? //DHCP or Static IP ?
if (!CONFIG::read_byte(EP_IP_MODE, &bbuf )) return false; if (!CONFIG::read_byte(EP_IP_MODE, &bbuf )) return false;
@ -123,6 +132,18 @@ bool WIFI_CONFIG::Setup()
if (wifi_get_opmode()==WIFI_AP || wifi_get_opmode()==WIFI_AP_STA) configAP( local_ip, gateway, subnet); if (wifi_get_opmode()==WIFI_AP || wifi_get_opmode()==WIFI_AP_STA) configAP( local_ip, gateway, subnet);
else WiFi.config( local_ip, gateway, subnet); else WiFi.config( local_ip, gateway, subnet);
} }
//Get IP
if (wifi_get_opmode()==WIFI_STA)currentIP=WiFi.localIP();
else currentIP=WiFi.softAPIP();
// Set up mDNS responder:
// - first argument is the domain name, in this example
// the fully-qualified domain name is "esp8266.local"
// - second argument is the IP address to advertise
// we send our IP address on the WiFi network
// Note: for AP mode we would use WiFi.softAPIP()!
if (!mdns.begin("esp8266", currentIP)) {
Serial.println("Error setting up MDNS responder!");
}
return true; return true;
} }

3
esp8266/wifi.h
View File

@ -23,10 +23,13 @@
#include <Arduino.h> #include <Arduino.h>
#include "IPAddress.h" #include "IPAddress.h"
#include <ESP8266WiFi.h> #include <ESP8266WiFi.h>
#include <ESP8266mDNS.h>
class WIFI_CONFIG class WIFI_CONFIG
{ {
public: public:
// multicast DNS responder feature
MDNSResponder mdns;
bool Setup(); bool Setup();
char * mac2str(uint8_t mac [WL_MAC_ADDR_LENGTH]); char * mac2str(uint8_t mac [WL_MAC_ADDR_LENGTH]);
char * ip2str(IPAddress Ip ); char * ip2str(IPAddress Ip );