Revision 39:418427215a94, committed 2016-02-25

Comitter:

Christopher Haster

Date:

Thu Feb 25 04:14:27 2016 -0600

Parent:

28:4c981f8c32a8

Parent:

38:561e0cdbba79

Child:

40:6a90de1da5e2

Commit message:

Merged api-changes

Changed in this revision

--- a/DnsQuery.lib	Mon Feb 22 23:57:17 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-http://developer.mbed.org/users/sarahmarshy/code/DnsQuery/#5705fdae6185

--- a/ESP8266Interface.lib	Mon Feb 22 23:57:17 2016 +0000
+++ b/ESP8266Interface.lib	Thu Feb 25 04:14:27 2016 -0600
@@ -1,1 +1,1 @@
-https://developer.mbed.org/teams/NetworkSocketAPI/code/ESP8266Interface/#276cb279df57
+https://developer.mbed.org/teams/NetworkSocketAPI/code/ESP8266Interface/#70f16502253b

--- a/NetworkSocketAPI.lib	Mon Feb 22 23:57:17 2016 +0000
+++ b/NetworkSocketAPI.lib	Thu Feb 25 04:14:27 2016 -0600
@@ -1,1 +1,1 @@
-http://developer.mbed.org/teams/NetworkSocketAPI/code/NetworkSocketAPI/#3ad72f5406bf
+http://developer.mbed.org/teams/NetworkSocketAPI/code/NetworkSocketAPI/#f2a088d58051

--- a/main.cpp	Mon Feb 22 23:57:17 2016 +0000
+++ b/main.cpp	Thu Feb 25 04:14:27 2016 -0600
@@ -16,11 +16,13 @@
 
 #include "mbed.h"
 #include "ESP8266Interface.h"
+#include "TCPSocket.h"
 
-DigitalOut myled(LED1);
-void flash(){myled = !myled;}
+DigitalOut myled(LED_GREEN);
+void flash(){ myled = !myled; }
 
-ESP8266Interface wifi(D1, D0);
+ESP8266Interface wifi(D1, D0, 1);
+TCPSocket socket(&wifi);
 
 int main()
 {
@@ -28,28 +30,24 @@
     t.attach(flash, 0.4f);
     printf("NetworkSocketAPI Example\r\n");
 
-    wifi.init();
-    wifi.connect("WifiDemo", "");
-    
-    char* ip = wifi.getIPAddress();
-    printf("IP Address is: %s\n", (ip) ? ip : "No IP");
-    char host_ip[50];
-    wifi.getHostByName("time-a.nist.gov", host_ip);
-    printf("time-a.nist.gov resolved to: %s\n", host_ip);
-
-    SocketInterface* mySocket = wifi.allocateSocket(SOCK_TCP);
-    char recieved[100] = {0};
-    int recv_amnt = 0;
+    wifi.connect("Sniffer", "Sandcastle");
     
-    //Sending and receiving from echo server
-    mySocket->setAddressPort(host_ip, 37);
-    mySocket->open();
-    //mySocket->send("xxxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx", 50, 10000);
-    recv_amnt = mySocket->recv(recieved, sizeof(recieved), 10000);
-    mySocket->close();
+    const char *ip = wifi.getIPAddress();
+    const char *mac = wifi.getMACAddress();
+    printf("IP Address is: %s\r\n", (ip) ? ip : "No IP");
+    printf("MAC Address is: %s\r\n", (mac) ? mac : "No MAC");
+
+    socket.open("time-a.nist.gov", 37);
+    printf("time-a.nist.gov resolved to: %s\r\n", socket.getIPAddress());
+
+    char recieved[100] = {0};
+    int32_t size = 0;
+    size = socket.recv(recieved, sizeof(recieved));
+
+    socket.close();
     wifi.disconnect();
-    
-    printf("Recieved: %d bytes, %02x%02x%02x%02x\n", recv_amnt, recieved[0], recieved[1], recieved[2], recieved[3]);
+
+    printf("Recieved: %ld bytes, %02x%02x%02x%02x\r\n", size,
+            recieved[0], recieved[1], recieved[2], recieved[3]);
     printf("NetworkSocketAPI Example Finished\r\n");
-    while(1);
 }

--- a/mbed.bld	Mon Feb 22 23:57:17 2016 +0000
+++ b/mbed.bld	Thu Feb 25 04:14:27 2016 -0600
@@ -1,1 +1,1 @@
-http://mbed.org/users/mbed_official/code/mbed/builds/4336505e4b1c
\ No newline at end of file
+http://mbed.org/users/mbed_official/code/mbed/builds/252557024ec3
\ No newline at end of file