Revision 3:4a2dfa38a61e, committed 2013-10-03

Comitter:

Kojto

Date:

Thu Oct 03 17:32:27 2013 +0200

Parent:

2:f163731f852a

Child:

4:580582a7ce1a

Commit message:

line ending - unix, init function, printf \r\n\

Changed in this revision

--- a/init.cpp	Thu Oct 03 14:46:22 2013 +0000
+++ b/init.cpp	Thu Oct 03 17:32:27 2013 +0200
@@ -1,54 +1,70 @@
-#include "main.h"
-
-#if (MY_BOARD == WIGO)
-
-#include "NVIC_set_all_priorities.h"
-
-/**
- *  \brief Wi-Go initialization
- *  \param none
- *  \return none
- */
-void init() {
-    DigitalOut PWR_EN1(PTB2);
-    DigitalOut PWR_EN2(PTB3);
-
-    // Wi-Go set current to 500mA since we're turning on the Wi-Fi
-    PWR_EN1 = 0;
-    PWR_EN2 = 1;
-
-    NVIC_set_all_irq_priorities(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
-    PORTA->PCR[16] |=PORT_PCR_ISF_MASK;
-    PORTA->ISFR |= (1 << 16);
-}
-
-#elif (MY_BOARD == WIFI_DIPCORTEX)
-
-/**
- *  \brief Wifi DipCortex initialization
- *  \param none
- *  \return none
- */
-void init() {
-    NVIC_SetPriority(SSP1_IRQn, 0x0);
-    NVIC_SetPriority(PIN_INT0_IRQn, 0x1);
-
-    // SysTick set to lower priority than Wi-Fi SPI bus interrupt
-    NVIC_SetPriority(SysTick_IRQn, 0x2);
-}
-
-#else
-
-/**
- *  \brief Place here init routine for your board
- *  \param none
- *  \return none
- */
-void init() {
-
-}
-
-#endif
+/* mbed Microcontroller Library
+ * Copyright (c) 2006-2013 ARM Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "main.h"
+#include "mbed.h"
+
+#if (MY_BOARD == WIGO)
+
+#include "NVIC_set_all_priorities.h"
+
+/**
+ *  \brief Wi-Go initialization
+ *  \param none
+ *  \return none
+ */
+void init() {
+    DigitalOut PWR_EN1(PTB2);
+    DigitalOut PWR_EN2(PTB3);
+
+    // Wi-Go set current to 500mA since we're turning on the Wi-Fi
+    PWR_EN1 = 0;
+    PWR_EN2 = 1;
+
+    NVIC_set_all_irq_priorities(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
+    PORTA->PCR[16] |=PORT_PCR_ISF_MASK;
+    PORTA->ISFR |= (1 << 16);
+}
+
+#elif (MY_BOARD == WIFI_DIPCORTEX)
+
+/**
+ *  \brief Wifi DipCortex initialization
+ *  \param none
+ *  \return none
+ */
+void init() {
+    NVIC_SetPriority(SSP1_IRQn, 0x0);
+    NVIC_SetPriority(PIN_INT0_IRQn, 0x1);
+
+    // SysTick set to lower priority than Wi-Fi SPI bus interrupt
+    NVIC_SetPriority(SysTick_IRQn, 0x2);
+}
+
+#else
+
+/**
+ *  \brief Place here init routine for your board
+ *  \param none
+ *  \return none
+ */
+void init() {
+
+}
+
+#endif

--- 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();
 }

--- a/main.h	Thu Oct 03 14:46:22 2013 +0000
+++ b/main.h	Thu Oct 03 17:32:27 2013 +0200
@@ -1,41 +1,41 @@
-/* mbed Microcontroller Library
- * Copyright (c) 2006-2013 ARM Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef MAIN_H
-#define MAIN_H
-
-#define WIGO           1
-#define WIFI_DIPCORTEX 2
-#define UNDEFINED      3
-
-#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       "zxcvbnm,./"
-#define AP_SECURITY  WPA2            // WPA2 must be enabled for use with iPhone or Android phone hotspot!
-#define SSID         "SSID"
-
-void init();
-
-#endif
+/* mbed Microcontroller Library
+ * Copyright (c) 2006-2013 ARM Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef MAIN_H
+#define MAIN_H
+
+#define WIGO           1
+#define WIFI_DIPCORTEX 2
+#define UNDEFINED      3
+
+#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