Diff: main.cpp

Revision:

5:12ea15b9c2f4

Parent:

4:b5875efcf0e5

Child:

6:6eaae34586b8

--- a/main.cpp	Thu Oct 03 16:56:32 2013 +0000
+++ b/main.cpp	Thu Oct 03 21:26:22 2013 +0200
@@ -15,79 +15,101 @@
  */
 #include "mbed.h"
 #include "cc3000.h"
-#include "tcp_ip_demo.h"
 #include "main.h"
+#include "TCPSocketConnection.h"
+#include "TCPSocketServer.h"
 
 using namespace mbed_cc3000;
 
-#if (WIGO_BOARD)
-// Wi-Go battery charger control
-DigitalOut PWR_EN1(PTB2);
-DigitalOut PWR_EN2(PTB3);
-// Wi-go LED
-DigitalOut ledr (LED_RED);
-DigitalOut ledg (LED_GREEN);
-DigitalOut ledb (LED_BLUE);
-DigitalOut led1 (PTB8);
-DigitalOut led2 (PTB9);
-DigitalOut led3 (PTB10);
+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);
+#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
 
-/** Initialize LED (only for Wi-go board)
- *  \param  none
- *  \return none
- */
-void initLEDs(void)
-{
-    RED_OFF;
-    GREEN_OFF;
-    BLUE_OFF;
-    LED_D1_OFF;
-    LED_D2_OFF;
-    LED_D3_OFF;
-}
-
-/** Print cc3000 information
- *  \param  none
+/**
+ *  \brief Print cc3000 information
+ *  \param none
  *  \return none
  */
 void print_cc3000_info() {
-    wigo.get_user_file_info((uint8_t *)&userFS, sizeof(userFS));
-    wigo.get_mac_address(myMAC);
-    printf("\n\nWi-Go MAC address %02x:%02x:%02x:%02x:%02x:%02x\n\n", myMAC[0], myMAC[1], myMAC[2], myMAC[3], myMAC[4], myMAC[5]);
+    uint8_t myMAC[8];
 
-    printf("FTC        %i\n",userFS.FTC);
-    printf("PP_version %i.%i\n",userFS.PP_version[0], userFS.PP_version[1]);
-    printf("SERV_PACK  %i.%i\n",userFS.SERV_PACK[0], userFS.SERV_PACK[1]);
-    printf("DRV_VER    %i.%i.%i\n",userFS.DRV_VER[0], userFS.DRV_VER[1], userFS.DRV_VER[2]);
-    printf("FW_VER     %i.%i.%i\n",userFS.FW_VER[0], userFS.FW_VER[1], userFS.FW_VER[2]);
+    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]);
 }
 
-/** Connect to SSID with security
- *  \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) {
-        printf("Connected\n");
+    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");
+        printf(" Connection timed-out (error). Please restart.\n");
         while(1);
   }
 }
 
-/** 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);
+}
+
+/**
+ *  \brief First time configuration
+ *  \param none
  *  \return none
  */
-void connect_to_ssid(uint8_t *ssid) {
-    wigo.connect_open(ssid);
+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.\n");
+}
+
+/** Start smart config
+ *  \param  none
+ *  \return none
+ */
+void start_smart_config() {
+    wifi.start_smart_config(smartconfigkey);
 }
 
 /** Main function
@@ -95,68 +117,83 @@
  *  \return int
  */
 int main() {
-    // Wi-Go set current to 500mA since we're turning on the Wi-Fi
-    SET_PWR_EN1;
-    SET_PWR_EN2;
-
+    init(); /* board dependent init */
     pc.baud(115200);
 
-    /* KL25 specific code */
-    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;
-
-    GREEN_ON;
-    wigo.start(0);
-    printf("CC3000 Python demo.\n");
+    wifi.start(0);
+    printf("cc3000 Simple socket demo. \r\n");
     print_cc3000_info();
 
-    printf("\n<0> Normal run. SmartConfig will\n    start if no valid connection exists.\n");
-    printf("<1> Connect using fixed SSID : %s\n", SSID);
-    printf("<2> SmartConfig.\n");
+    printf("\n<0> Normal run. SmartConfig will \r\n    start if no valid connection exists. \r\n");
+    printf("<1> Connect using fixed SSID : %s \r\n", SSID);
+    printf("<2> SmartConfig. \r\n");
 
     signed char c = getchar();
     switch (c)
     {
         case '0':
-            if(!userFS.FTC)
+            if(!user_info.FTC)
             {
                 do_FTC();
-                wigo._wlan.stop();
+                wifi._wlan.stop();
             }
             break;
         case '1':
-            printf("Attempting SSID Connection\n");
+            printf("Attempting SSID Connection. \r\n");
 #ifndef CC3000_TINY_DRIVER
     #ifdef AP_KEY
-            connect_to_ssid((uint8_t *)SSID,(uint8_t *)AP_KEY,AP_SECURITY); /* TODO rewrite to const vraiables - NOT MACROS */
+            connect_to_ssid(SSID, AP_KEY, AP_SECURITY); /* TODO rewrite to const vraiables - NOT MACROS */
     #else
-            connect_to_ssid((uint8_t *)SSID);
+            connect_to_ssid(SSID);
     #endif
 #else
-            connect_to_ssid((uint8_t *)SSID);
+            connect_to_ssid(SSID);
 #endif
             break;
         case '2':
-            printf("Starting Smart Config configuration.\n");
+            printf("Starting Smart Config configuration. \r\n");
             start_smart_config();
-            init_dhcp();
+            while (wifi.is_dhcp_configured() == false)
+            {
+                wait_ms(500);
+                printf("Waiting for dhcp to be set. \r\n");
+            }
 
-            printf("Press the reset button on your board and select 0...\n");
+            printf("Press the reset button on your board and select 0... \r\n");
             while(1);
         default:
-            printf("Wrong selection.\n");
-            printf("Reset the board and try again.\n");
+            printf("Wrong selection. \r\n");
+            printf("Reset the board and try again. \r\n");
             break;
     }
-    SmartConfigProfilestored = SMART_CONFIG_SET;
-    RED_OFF;
-    GREEN_OFF;
-    BLUE_OFF;
+
+    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]);
+
+    char python_msg[] = "Hello Python\n";
+    TCPSocketServer server;
 
-    run_tcp_server();    // Run TCP/IP Connection to host
+    server.bind(15000);
+    server.listen();
+    while (1) {
+        TCPSocketConnection client;
+        int32_t status = server.accept(client);
+        if (status >= 0) {
+            client.set_blocking(false, 1500); // Timeout after (1.5)s
+            printf("Connection from: %s \r\n", client.get_address());
+            char buffer[256];
+            client.receive(buffer, sizeof(buffer));
+            printf("Received: %s \r\n",buffer);
+            printf("Sending the message to the server. \r\n");
+            client.send_all(python_msg, sizeof(python_msg));
+            client.close();
+        }
+    }
 }