Diff: main.cpp

Revision:

3:f38499c4000e

Parent:

1:1ef047ffeef4

Child:

4:52e1684bf322

--- a/main.cpp	Thu Oct 03 15:58:15 2013 +0000
+++ b/main.cpp	Thu Oct 03 18:03:05 2013 +0200
@@ -14,56 +14,60 @@
  * limitations under the License.
  */
 #include "mbed.h"
-#include "KL25Z_irq_prio.h"
 #include "cc3000.h"
 #include "main.h"
 
 using namespace mbed_cc3000;
 
-#if (WIGO_BOARD)
-// Wi-Go battery charger control
-DigitalOut PWR_EN1(PTB2);
-DigitalOut PWR_EN2(PTB3);
+tUserFS user_info;
+
+/* 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
 
-Serial pc(USBTX, USBRX);
-cc3000 wigo(PTA16, PTA13, PTD0, SPI(PTD2, PTD3, PTC5), PORTA_IRQn);
-tUserFS user_info;
-
 #ifndef CC3000_UNENCRYPTED_SMART_CONFIG
   const uint8_t smartconfigkey[] = {0x73,0x6d,0x61,0x72,0x74,0x63,0x6f,0x6e,0x66,0x69,0x67,0x41,0x45,0x53,0x31,0x36};
 #else
   const uint8_t smartconfigkey = 0;
 #endif
 
-/** Print cc3000 information
- *  \param  none
+/**
+ *  \brief Print cc3000 information
+ *  \param none
  *  \return none
  */
 void print_cc3000_info() {
     uint8_t myMAC[8];
 
-    printf("MAC address + cc3000 info\n");
-    wigo.get_user_file_info((uint8_t *)&user_info, sizeof(user_info));
-    wigo.get_mac_address(myMAC);
-    printf(" MAC address %02x:%02x:%02x:%02x:%02x:%02x\n\n", myMAC[0], myMAC[1], myMAC[2], myMAC[3], myMAC[4], myMAC[5]);
+    printf("MAC address + cc3000 info \r\n");
+    wifi.get_user_file_info((uint8_t *)&user_info, sizeof(user_info));
+    wifi.get_mac_address(myMAC);
+    printf(" MAC address %02x:%02x:%02x:%02x:%02x:%02x \r\n \r\n", myMAC[0], myMAC[1], myMAC[2], myMAC[3], myMAC[4], myMAC[5]);
 
-    printf(" FTC        %i\n",user_info.FTC);
-    printf(" PP_version %i.%i\n",user_info.PP_version[0], user_info.PP_version[1]);
-    printf(" SERV_PACK  %i.%i\n",user_info.SERV_PACK[0], user_info.SERV_PACK[1]);
-    printf(" DRV_VER    %i.%i.%i\n",user_info.DRV_VER[0], user_info.DRV_VER[1], user_info.DRV_VER[2]);
-    printf(" FW_VER     %i.%i.%i\n",user_info.FW_VER[0], user_info.FW_VER[1], user_info.FW_VER[2]);
+    printf(" FTC        %i \r\n",user_info.FTC);
+    printf(" PP_version %i.%i \r\n",user_info.PP_version[0], user_info.PP_version[1]);
+    printf(" SERV_PACK  %i.%i \r\n",user_info.SERV_PACK[0], user_info.SERV_PACK[1]);
+    printf(" DRV_VER    %i.%i.%i \r\n",user_info.DRV_VER[0], user_info.DRV_VER[1], user_info.DRV_VER[2]);
+    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(uint8_t *ssid, uint8_t *key, uint8_t sec_mode) {
+void connect_to_ssid(char *ssid, char *key, unsigned char sec_mode) {
     printf("Connecting to SSID: %s. Timeout is 10s.\n",ssid);
-    if (wigo.connect_to_AP(ssid, key, sec_mode) == true) {
+    if (wifi.connect_to_AP((uint8_t *)ssid, (uint8_t *)key, sec_mode) == true) {
         printf(" Connected\n");
     } else {
         printf(" Connection timed-out (error). Please restart.\n");
@@ -71,42 +75,30 @@
   }
 }
 
-/** 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(uint8_t *ssid) {
-    wigo.connect_open(ssid);
+void connect_to_ssid(char *ssid) {
+    wifi.connect_open((uint8_t *)ssid);
 }
 
-void wigo_init(void) {
-    /* KL25 specific code */
-    // Wi-Go set current to 500mA since we're turning on the Wi-Fi
-    SET_PWR_EN1;
-    SET_PWR_EN2;
-
-    NVIC_SetAllPriority(3);
-    NVIC_SetPriority(SPI0_IRQn, 0x0);     // Wi-Fi SPI interrupt must be higher priority than SysTick
-    NVIC_SetPriority(PORTA_IRQn, 0x1);
-    NVIC_SetPriority(SysTick_IRQn, 0x2);  // SysTick set to lower priority than Wi-Fi SPI bus interrupt
-    CLEAR_PCR_INTERRUPT;
-    CLEAN_PORT_INTERRUPT;
-}
-
-/** First time configuration
- *  \param  none
+/**
+ *  \brief First time configuration
+ *  \param none
  *  \return none
  */
 void do_FTC(void) {
-    printf("Running First Time Configuration\n");
-    wigo.start_smart_config(smartconfigkey);
-    while (wigo.is_dhcp_configured() == false) {
+    printf("Running First Time Configuration \r\n");
+    wifi.start_smart_config(smartconfigkey);
+    while (wifi.is_dhcp_configured() == false) {
          wait_ms(500);
-         printf("Waiting for dhcp to be set.\n");
+         printf("Waiting for dhcp to be set. \r\n");
     }
     user_info.FTC = 1;
-    wigo.set_user_file_info((uint8_t *)&user_info, sizeof(user_info));
-    wigo._wlan.stop();
+    wifi.set_user_file_info((uint8_t *)&user_info, sizeof(user_info));
+    wifi._wlan.stop();
     printf("FTC finished.\n");
 }
 
@@ -115,59 +107,61 @@
  *  \return int
  */
 int main() {
-    wigo_init();
+    init(); /* board dependent init */
     pc.baud(115200);
 
-    wigo.start(0);
+    wifi.start(0);
     printf("CC3000 ping demo.\n");
     print_cc3000_info();
 
-    printf("Attempting SSID Connection\n");
+    printf("Attempting SSID Connection. \r\n");
 #if (USE_SMART_CONFIG == 1)
     if (user_info.FTC == 1) {
-        wigo._wlan.ioctl_set_connection_policy(0, 1, 1);
+        wifi._wlan.ioctl_set_connection_policy(0, 1, 1);
     } else {
-        printf("Smart config is not set, starting configuration\n");
+        printf("Smart config is not set, starting configuration. \r\n");
         do_FTC();
-        printf("Smart config is set. Please restart your board.\n");
+        printf("Smart config is set. Please restart your board. \r\n");
         while(1);
     }
 #else
-    wigo._wlan.ioctl_set_connection_policy(0, 0, 0);
-
-
+    wifi._wlan.ioctl_set_connection_policy(0, 0, 0);
 #ifndef CC3000_TINY_DRIVER
 #ifdef AP_KEY
-    connect_to_ssid((uint8_t *)SSID,(uint8_t *)AP_KEY,AP_SECURITY);
+    connect_to_ssid(SSID, AP_KEY, AP_SECURITY);
 #else
-    connect_to_ssid((uint8_t *)SSID);
+    connect_to_ssid(SSID);
 #endif
 #else
-    connect_to_ssid((uint8_t *)SSID);
+    connect_to_ssid(SSID);
 #endif
 #endif
-    printf("DHCP request\n");
-    while (wigo.is_dhcp_configured() == false) {
+    printf("DHCP request \r\n");
+    while (wifi.is_dhcp_configured() == false) {
          wait_ms(500);
-         printf("  Waiting for dhcp to be set.\n");
+         printf("  Waiting for dhcp to be set. \r\n");
     }
 
+    tNetappIpconfigRetArgs ipinfo2;
+    wifi.get_ip_config(&ipinfo2); // data is returned in the ipinfo2 structure
+    printf("DHCP assigned IP Address = %d.%d.%d.%d \r\n", ipinfo2.aucIP[3], ipinfo2.aucIP[2], ipinfo2.aucIP[1], ipinfo2.aucIP[0]);
+
     uint32_t ip;
     uint8_t *site = (uint8_t *)"google.com";
-    printf("Get an IP address of %s\n",site);
+    printf("Get an IP address of %s \r\n",site);
     if (wigo._socket.gethostbyname(site,strlen((const char *)site), &ip)) {
         uint8_t add0 = (ip >> 24);
         uint8_t add1 = (ip >> 16);
         uint8_t add2 = (ip >> 8);
         uint8_t add3 = (ip >> 0);
-        printf("IP address of %s: %d:%d:%d:%d \n", site, add0, add1, add2, add3);
+        printf("IP address of %s: %d:%d:%d:%d \r\n", site, add0, add1, add2, add3);
     } else {
         printf("Failed");
     }
 
-    printf("Starting sending ping\n");
+    printf("Starting sending ping. \r\n");
     uint32_t reply_count = wigo.ping(ip, 5, 500, 32);
-    printf("Received %d replies\n", reply_count);
-    printf("Ping demo completed.\n");
+    printf("Received %d replies. \r\n", reply_count);
+    printf("Ping demo completed. \r\n");
     wigo.disconnect();
 }