cc3000 websocket demo for cc3000
Dependencies: NVIC_set_all_priorities WebSocketClient cc3000_hostdriver_mbedsocket mbed
Revision 10:a7f01c5e1e19, committed 2013-11-07
- Comitter:
- Kojto
- Date:
- Thu Nov 07 20:18:18 2013 +0000
- Parent:
- 9:822a9333d544
- Child:
- 11:32afff984c83
- Commit message:
- - updated to the host driver rev 45; - using the new EthernetInterface
Changed in this revision
--- a/NVIC_set_all_priorities.lib Tue Oct 08 15:07:59 2013 +0000 +++ b/NVIC_set_all_priorities.lib Thu Nov 07 20:18:18 2013 +0000 @@ -1,1 +1,1 @@ -https://mbed.org/users/frankvnk/code/NVIC_set_all_priorities/#676bbfffe9f6 +https://mbed.org/users/frankvnk/code/NVIC_set_all_priorities/#01504ecd2025
--- a/cc3000_hostdriver_mbedsocket.lib Tue Oct 08 15:07:59 2013 +0000 +++ b/cc3000_hostdriver_mbedsocket.lib Thu Nov 07 20:18:18 2013 +0000 @@ -1,1 +1,1 @@ -http://mbed.org/users/Kojto/code/cc3000_hostdriver_mbedsocket/#9dd909fb7caf +http://mbed.org/users/Kojto/code/cc3000_hostdriver_mbedsocket/#50ab13d8f2dc
--- a/main.cpp Tue Oct 08 15:07:59 2013 +0000 +++ b/main.cpp Thu Nov 07 20:18:18 2013 +0000 @@ -21,89 +21,20 @@ using namespace mbed_cc3000; -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); +cc3000 wifi(PTA16, PTA13, PTD0, SPI(PTD2, PTD3, PTC5), "ssid", "key", WPA2, false); Serial pc(USBTX, USBRX); #elif (MY_BOARD == WIFI_DIPCORTEX) -cc3000 wifi(p28, p27, p30, SPI(p21, p14, p37), PIN_INT0_IRQn); +cc3000 wifi(p28, p27, p30, SPI(p21, p14, p37), "ssid", "key", WPA2, false); Serial pc(UART_TX, UART_RX); +#elif (MY_BOARD == MBED_BOARD_EXAMPLE) +cc3000 wifi(p9, p10, p8, SPI(p5, p6, p7), "ssid", "key", WPA2, false); +Serial pc(USBTX, USBRX); #else #endif -#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 - -/** - * \brief Print cc3000 information - * \param none - * \return none - */ -void print_cc3000_info() { - uint8_t myMAC[8]; - - 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 \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]); -} - -/** - * \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) { - printf("Connecting to SSID: %s. Timeout is 10s. \r\n",ssid); - if (wifi.connect_to_AP((uint8_t *)ssid, (uint8_t *)key, sec_mode) == true) { - printf(" Connected. \r\n"); - } else { - printf(" Connection timed-out (error). Please restart. \r\n"); - while(1); - } -} - -/** - * \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); -} - -/** - * \brief First time configuration - * \param none - * \return none - */ -void do_FTC(void) { - 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. \r\n"); - } - user_info.FTC = 1; - wifi.set_user_file_info((uint8_t *)&user_info, sizeof(user_info)); - wifi._wlan.stop(); - printf("FTC finished. \r\n"); -} - /** * \brief Websocket demo * \param none @@ -113,41 +44,13 @@ init(); /* board dependent init */ pc.baud(115200); - wifi.start(0); printf("cc3000 Websocket demo. \r\n"); - print_cc3000_info(); - - printf("Attempting SSID Connection. \r\n"); -#if (USE_SMART_CONFIG == 1) - if (user_info.FTC == 1) { - wifi._wlan.ioctl_set_connection_policy(0, 1, 1); + wifi.init(); + if (wifi.connect() == -1) { + printf("Failed to connect. Please verify connection details and try again. \r\n"); } else { - printf("Smart config is not set, starting configuration. \r\n"); - do_FTC(); - printf("Smart config is set. Please restart your board. \r\n"); - while(1); + printf("IP address: %s \r\n", wifi.getIPAddress()); } -#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); -#else - connect_to_ssid(SSID); -#endif -#else - connect_to_ssid(SSID); -#endif -#endif - printf("DHCP request \r\n"); - while (wifi.is_dhcp_configured() == false) { - wait_ms(500); - 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]); /* change your_channel to your defined nickname */ Websocket ws("ws://sockets.mbed.org/ws/your_channel/wo");
--- a/main.h Tue Oct 08 15:07:59 2013 +0000 +++ b/main.h Thu Nov 07 20:18:18 2013 +0000 @@ -16,26 +16,13 @@ #ifndef MAIN_H #define MAIN_H -#define WIGO 1 -#define WIFI_DIPCORTEX 2 -#define UNDEFINED 3 +#define WIGO 1 +#define WIFI_DIPCORTEX 2 +#define MBED_BOARD_EXAMPLE 3 +#define UNDEFINED 4 #define MY_BOARD WIGO -// use this defines in AP_SECURITY -#define NONE 0 -#define WEP 1 -#define WPA 2 -#define WPA2 3 - -// use smart config -#define USE_SMART_CONFIG 0 - - // Default SSID Settings -#define AP_KEY "test" -#define AP_SECURITY WPA2 // WPA2 must be enabled for use with iPhone or Android phone hotspot! -#define SSID "test" - void init(); #endif