Diff: main.cpp

Revision:

3:4a2dfa38a61e

Parent:

2:f163731f852a

Child:

4:580582a7ce1a

diff -r f163731f852a -r 4a2dfa38a61e main.cpp
--- a/main.cpp	Thu Oct 03 14:46:22 2013 +0000
+++ b/main.cpp	Thu Oct 03 17:32:27 2013 +0200
@@ -20,15 +20,15 @@
 
 using namespace mbed_cc3000;
 
-Serial pc(USBTX, USBRX);
 tUserFS user_info;
-NTPClient ntp;
 
 /* cc3000 module declaration specific for user's board. Check also init() */
 #if (MY_BOARD == WIGO)
 cc3000 wifi(PTA16, PTA13, PTD0, SPI(PTD2, PTD3, PTC5), PORTA_IRQn);
+Serial pc(USBTX, USBRX);
 #elif (MY_BOARD == WIFI_DIPCORTEX)
 cc3000 wifi(p28, p27, p30, SPI(p21, p14, p37), PIN_INT0_IRQn);
+Serial pc(UART_TX, UART_RX);
 #else
 
 #endif
@@ -39,8 +39,9 @@
   const uint8_t smartconfigkey = 0;
 #endif
 
-/** Print cc3000 information
- *  \param  none
+/**
+ *  \brief Print cc3000 information
+ *  \param none
  *  \return none
  */
 void print_cc3000_info() {
@@ -58,10 +59,11 @@
     printf(" FW_VER     %i.%i.%i \r\n",user_info.FW_VER[0], user_info.FW_VER[1], user_info.FW_VER[2]);
 }
 
-/** Connect to SSID with a timeout
- *  \param  ssid     Name of SSID
- *  \param  key      Password
- *  \param  sec_mode Security mode
+/**
+ *  \brief Connect to SSID with a timeout
+ *  \param ssid     Name of SSID
+ *  \param key      Password
+ *  \param sec_mode Security mode
  *  \return none
  */
 void connect_to_ssid(char *ssid, char *key, unsigned char sec_mode) {
@@ -74,16 +76,18 @@
   }
 }
 
-/** Connect to SSID without security
- *  \param  ssid Name of SSID
+/**
+ *  \brief Connect to SSID without security
+ *  \param ssid Name of SSID
  *  \return none
  */
 void connect_to_ssid(char *ssid) {
     wifi.connect_open((uint8_t *)ssid);
 }
 
-/** First time configuration
- *  \param  none
+/**
+ *  \brief First time configuration
+ *  \param none
  *  \return none
  */
 void do_FTC(void) {
@@ -99,7 +103,8 @@
     printf("FTC finished.\n");
 }
 
-/** Ping a site
+/**
+ *  \brief NTP client demo
  *  \param  none
  *  \return int
  */
@@ -108,7 +113,7 @@
     pc.baud(115200);
 
     wifi.start(0);
-    printf("CC3000 NTP client demo. \r\n");
+    printf("cc3000 NTP client demo. \r\n");
     print_cc3000_info();
 
     printf("Attempting SSID Connection. \r\n");
@@ -123,8 +128,6 @@
     }
 #else
     wifi._wlan.ioctl_set_connection_policy(0, 0, 0);
-
-
 #ifndef CC3000_TINY_DRIVER
 #ifdef AP_KEY
     connect_to_ssid(SSID, AP_KEY, AP_SECURITY);
@@ -135,24 +138,26 @@
     connect_to_ssid(SSID);
 #endif
 #endif
-    printf("DHCP request\n");
+    printf("DHCP request \r\n");
     while (wifi.is_dhcp_configured() == false) {
          wait_ms(500);
          printf("  Waiting for dhcp to be set. \r\n");
     }
 
+    NTPClient ntp;
+
     printf("Getting time, 10s timeout. \r\n");
     if (ntp.setTime("0.uk.pool.ntp.org") == 0)
     {
-      printf("Set time successfully. \r\n");
-      time_t ctTime;
-      ctTime = time(NULL);
-      printf("Time is set to (UTC): %s \r\n", ctime(&ctTime));
+        printf("Set time successfully. \r\n");
+        time_t ctTime;
+        ctTime = time(NULL);
+        printf("Time is set to (UTC): %s \r\n", ctime(&ctTime));
     }
     else
     {
-      printf("Error. \r\n");
-    } 
+        printf("Error. \r\n");
+    }
 
     wifi.disconnect();
 }