Rework MDNS code to run with WiFi101

Author: sandeepmistry

examples/MDNS_WiFiWebServer/MDNS_WiFiWebServer.ino

@@ -2,15 +2,15 @@
  MDNS WiFi Web Server
 
  A simple web server that shows the value of the analog input pins,
- and exposes itself on the MDNS name 'winc1500.local'.
+ and exposes itself on the MDNS name 'wifi101.local'.
 
  On Linux (like Ubuntu 15.04) or OSX you can access the web page
- on the device in a browser at 'http://winc1500.local/'.
+ on the device in a browser at 'http://wifi101.local/'.
 
  On Windows you'll first need to install the Bonjour Printer Services
  from:
    https://support.apple.com/kb/dl999?locale=en_US
- Then you can access the device in a browser at 'http://winc1500.local/'.
+ Then you can access the device in a browser at 'http://wifi101.local/'.
 
  This example is written for a network using WPA encryption. For
  WEP or WPA, change the Wifi.begin() call accordingly.
@@ -29,51 +29,26 @@
 */
 
 #include <SPI.h>
-#include <Adafruit_WINC1500.h>
-#include <Adafruit_WINC1500MDNS.h>
-
-// Define the MDNS name that the board will respond to:
-#define MDNS_NAME "winc1500"
-// Note that the actual MDNS name will have '.local' after
-// the name above, so "winc1500" will be accessible on
-// the MDNS name "winc1500.local".
-
-// Define the WINC1500 board connections below.
-// If you're following the Adafruit WINC1500 board
-// guide you don't need to modify these:
-#define WINC_CS   8
-#define WINC_IRQ  7
-#define WINC_RST  4
-#define WINC_EN   2     // or, tie EN to VCC and comment this out
-// The SPI pins of the WINC1500 (SCK, MOSI, MISO) should be
-// connected to the hardware SPI port of the Arduino.
-// On an Uno or compatible these are SCK = #13, MISO = #12, MOSI = #11.
-// On an Arduino Zero use the 6-pin ICSP header, see:
-//   https://www.arduino.cc/en/Reference/SPI
-
-// Setup the WINC1500 connection with the pins above and the default hardware SPI.
-Adafruit_WINC1500 WiFi(WINC_CS, WINC_IRQ, WINC_RST);
-
-// Or just use hardware SPI (SCK/MOSI/MISO) and defaults, SS -> #10, INT -> #7, RST -> #5, EN -> 3-5V
-//Adafruit_WINC1500 WiFi;
+#include <WiFi101.h>
+#include <WifiMdns.h>
 
 char ssid[] = "yourNetwork";      // your network SSID (name)
 char pass[] = "secretPassword";   // your network password
 int keyIndex = 0;                 // your network key Index number (needed only for WEP)
 
+char mdnsName[] = "wifi101"; // the MDNS name that the board will respond to
+// Note that the actual MDNS name will have '.local' after
+// the name above, so "wifi101" will be accessible on
+// the MDNS name "wifi101.local".
+
 int status = WL_IDLE_STATUS;
 
 // Create a MDNS responder to listen and respond to MDNS name requests.
-MDNSResponder mdns(&WiFi);  // Need to pass in a reference to the WiFi class above.
+MDNSResponder mdns;
 
-Adafruit_WINC1500Server server(80);
+WiFiServer server(80);
 
 void setup() {
-#ifdef WINC_EN
-  pinMode(WINC_EN, OUTPUT);
-  digitalWrite(WINC_EN, HIGH);
-#endif
-
   //Initialize serial and wait for port to open:
   Serial.begin(9600);
   while (!Serial) {
@@ -105,13 +80,13 @@ void setup() {
   // Setup the MDNS responder to listen to the configured name.
   // NOTE: You _must_ call this _after_ connecting to the WiFi network and
   // being assigned an IP address.
-  if (!mdns.begin(MDNS_NAME)) {
+  if (!mdns.begin(mdnsName)) {
     Serial.println("Failed to start MDNS responder!");
     while(1);
   }
 
   Serial.print("Server listening at http://");
-  Serial.print(MDNS_NAME);
+  Serial.print(mdnsName);
   Serial.println(".local/");
 }
 
@@ -122,7 +97,7 @@ void loop() {
   mdns.update();
 
   // listen for incoming clients
-  Adafruit_WINC1500Client client = server.available();
+  WiFiClient client = server.available();
   if (client) {
     Serial.println("new client");
     // an http request ends with a blank line

keywords.txt

@@ -40,6 +40,7 @@ getSocket	KEYWORD2
 WiFiClient	KEYWORD2
 WiFiServer	KEYWORD2
 WiFiSSLClient	KEYWORD2
+WifiMdns	KEYWORD2
 
 #######################################
 # Constants (LITERAL1)

src/Adafruit_WINC1500MDNS.cpp renamed to src/WiFiMdns.cpp

@@ -20,8 +20,9 @@
 // You should have received a copy of the GNU Lesser General Public
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 #include "Arduino.h"
-#include "Adafruit_WINC1500MDNS.h"
+#include "WiFiMdns.h"
 
 // Important RFC's for reference:
 // - DNS request and response: http://www.ietf.org/rfc/rfc1035.txt
@@ -36,14 +37,13 @@
 #define IP_OFFSET 10
 
 
-MDNSResponder::MDNSResponder(Adafruit_WINC1500* wifi)
+MDNSResponder::MDNSResponder()
   : _expected(NULL)
   , _expectedLen(0)
+  , _index(0)
   , _response(NULL)
   , _responseLen(0)
-  , _index(0)
   , _mdnsSocket()
-  , _wifi(wifi)
 { }
 
 MDNSResponder::~MDNSResponder() {
@@ -74,7 +74,7 @@ bool MDNSResponder::begin(const char* domain, uint32_t ttlSeconds)
   }
   _expected[0] = (uint8_t)n;
   // Copy in domain characters as lowercase
-  for (int i = 0; i < n; ++i) {
+  for (unsigned int i = 0; i < n; ++i) {
     _expected[1+i] = tolower(domain[i]);
   }
   // Values for:
@@ -134,15 +134,15 @@ bool MDNSResponder::begin(const char* domain, uint32_t ttlSeconds)
   memcpy(records + TTL_OFFSET, ttl, 4);
   memcpy(records + A_RECORD_SIZE + 2 + TTL_OFFSET, ttl, 4);
   // Add IP address to response
-  uint32_t ipAddress = _wifi->localIP();
+  uint32_t ipAddress = WiFi.localIP();
   records[IP_OFFSET]     = (uint8_t) ipAddress;
   records[IP_OFFSET + 1] = (uint8_t)(ipAddress >> 8);
   records[IP_OFFSET + 2] = (uint8_t)(ipAddress >> 16);
   records[IP_OFFSET + 3] = (uint8_t)(ipAddress >> 24);
 
   // Open the MDNS UDP listening socket on port 5353 with multicast address
   // 224.0.0.251 (0xE00000FB)
-  if (!_mdnsSocket.begin(5353, 0xE00000FB)) {
+  if (!_mdnsSocket.beginMulti(IPAddress(224, 0, 0, 251), 5353)) {
     return false;
   }
 

src/Adafruit_WINC1500MDNS.h renamed to src/WiFiMdns.h

@@ -20,15 +20,16 @@
 // You should have received a copy of the GNU Lesser General Public
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-#ifndef ADAFRUIT_WINC1500MDNS_H
-#define ADAFRUIT_WINC1500MDNS_H
 
-#include "Adafruit_WINC1500.h"
-#include "Adafruit_WINC1500Udp.h"
+#ifndef WIFIMDNS_H
+#define WIFIMDNS_H
+
+#include "WiFi101.h"
+#include "WiFiUdp.h"
 
 class MDNSResponder {
 public:
-  MDNSResponder(Adafruit_WINC1500* wifi);
+  MDNSResponder();
   ~MDNSResponder();
   bool begin(const char* domain, uint32_t ttlSeconds = 3600);
   void update();
@@ -46,9 +47,7 @@ class MDNSResponder {
   uint8_t* _response;
   int _responseLen;
   // UDP socket for receiving/sending MDNS data.
-  Adafruit_WINC1500UDP _mdnsSocket;
-  // Reference to WINC1500 wifi object, used to get IP address.
-  Adafruit_WINC1500* _wifi;
+  WiFiUDP _mdnsSocket;
 };
 
 #endif