Diff: main.cpp

Revision:

7:748a599726d8

Parent:

6:694279899cf2

--- a/main.cpp	Fri Dec 11 00:58:10 2015 +0000
+++ b/main.cpp	Sat Dec 26 21:27:15 2015 +0000
@@ -1,14 +1,21 @@
 #include "mbed.h"
 #include "M2XStreamClient.h"
-#include "ESP8266Interface.h"
+#include "WIZnetInterface.h"
 #include "TCPSocketConnection.h"
 
 
 /*
-*  ESP8266 Wifi Config for nucleo 411
+*  WIZnet 5500 Config for nucleo 411
 */
-ESP8266Interface wifi(D8,D2,D3,"wifiName","wifiPassword",115200); // TX,RX,Reset,SSID,Password,Baud 
+Serial pc(SERIAL_TX, SERIAL_RX);
+SPI spi(D11, D12, D13); // mosi, miso, sclk
+
+#define USE_DHCP    1
 
+const char * IP_Addr    = "192.168.2.72";
+const char * IP_Subnet  = "255.255.255.0";
+const char * IP_Gateway = "192.168.2.2";
+unsigned char MAC_Addr[6] = { 0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED };
 //
 // Fill these field in from you ATT M2X Account
 //
@@ -18,18 +25,48 @@
 
 int main()
 {
-    printf("Starting...\r\n");
+  pc.baud(115200); // console terminal to 115200 baud
+
+  pc.printf("STM32 WIZnet M2X Example\r\n");
+
+  pc.printf("Initializing SPI\r\n");
+  spi.frequency(1000000);
+  pc.printf("Initializing Ethernet\r\n");
+  WIZnetInterface ethernet(&spi,D10, D3);
+
+#if USE_DHCP
+  pc.printf("Ethernet Init\r\n");
+  int ret = ethernet.init(MAC_Addr);
+#else
+  int ret = ethernet.init(MAC_Addr,IP_Addr,IP_Subnet,IP_Gateway);
+#endif
 
-    // connect to wifi
-    wifi.init(); //Reset
-    wifi.connect(); //Use DHCP
-    printf("IP Address is %s \n\r", wifi.getIPAddress());
+  if (!ret) 
+  {
+    pc.printf("Initialized, MAC: %s\r\n", ethernet.getMACAddress());
+    ret = ethernet.connect();
+    
+    if (!ret) 
+    {
+      pc.printf("IP: %s, MASK: %s, GW: %s\r\n",
+      ethernet.getIPAddress(), ethernet.getNetworkMask(), ethernet.getGateway());
+    }
+    else
+    {
+      pc.printf("Error ethernet.connect() - ret = %d\r\n", ret);
+      exit(0);
+    }
+  }
+  else
+  {
+    pc.printf("Error ethernet.init() - ret = %d\r\n", ret);
+    exit(0);
+  }
 
     // Initialize the M2X client
     Client client;
     M2XStreamClient m2xClient(&client, m2xKey,1,"52.22.150.98"); // api-m2x.att.com
     
-    int ret;
     volatile int randomNumber = 0;
 
     while (true) {