Revision 8:e35636d40bd2, committed 2014-09-24

Comitter:

edwardTW

Date:

Wed Sep 24 09:08:28 2014 +0000

Parent:

7:65911c3a3138

Commit message:

-1

Changed in this revision

--- a/main.cpp	Tue Sep 23 15:14:06 2014 +0000
+++ b/main.cpp	Wed Sep 24 09:08:28 2014 +0000
@@ -19,7 +19,7 @@
 
 #include "UARTService.h"
 
-#define NEED_CONSOLE_OUTPUT 0 /* Set this if you need debug messages on the console;
+#define NEED_CONSOLE_OUTPUT 1 /* Set this if you need debug messages on the console;
                                * it will have an impact on code-size and power consumption. */
 
 #if NEED_CONSOLE_OUTPUT
@@ -28,9 +28,24 @@
 #define DEBUG(...) /* nothing */
 #endif /* #if NEED_CONSOLE_OUTPUT */
 
+//=======================================================================================
+typedef unsigned int  uint;
+typedef unsigned char uchar;
+//=======================================================================================
+
+Serial pc(P0_9,P0_11);
 BLEDevice  ble;
+Ticker ticker;
 DigitalOut led1(LED1);
 
+void attime(void); 
+void periodicCallback(void);
+
+uint TSM,TSMp,TSMf;
+uchar timer_second;
+uchar timer_minute;
+uchar timer_hour;
+
 UARTService *uartServicePtr;
 
 void disconnectionCallback(Gap::Handle_t handle, Gap::DisconnectionReason_t reason)
@@ -44,6 +59,7 @@
 {
     if ((uartServicePtr != NULL) && (params->charHandle == uartServicePtr->getTXCharacteristicHandle())) {
         uint16_t bytesRead = params->len;
+        DEBUG("received %s \n\r",params->data);
         DEBUG("received %u bytes\n\r", bytesRead);
         ble.updateCharacteristicValue(uartServicePtr->getRXCharacteristicHandle(), params->data, bytesRead);
     }
@@ -53,13 +69,20 @@
 {
     led1 = !led1;
 }
-
+void attime(void) 
+{
+     TSMp=TSM;
+     TSM++;
+     TSMf|=TSM^TSMp;
+     led1 = !led1;
+}
 int main(void)
 {
     led1 = 1;
-    Ticker ticker;
-    ticker.attach(periodicCallback, 1);
-
+//    Ticker ticker;
+    ticker.attach(periodicCallback, 0.125);
+//    ticker.attach_us(attime, 2440);
+     pc.baud(115200);
     DEBUG("Initialising the nRF51822\n\r");
     ble.init();
     ble.onDisconnection(disconnectionCallback);
@@ -69,11 +92,12 @@
     ble.accumulateAdvertisingPayload(GapAdvertisingData::BREDR_NOT_SUPPORTED);
     ble.setAdvertisingType(GapAdvertisingParams::ADV_CONNECTABLE_UNDIRECTED);
     ble.accumulateAdvertisingPayload(GapAdvertisingData::SHORTENED_LOCAL_NAME,
-                                     (const uint8_t *)"BLE UART", sizeof("BLE UART") - 1);
+                                     (const uint8_t *)"BLE_UART", sizeof("BLE_UART") - 1);
     ble.accumulateAdvertisingPayload(GapAdvertisingData::COMPLETE_LIST_128BIT_SERVICE_IDS,
                                      (const uint8_t *)UARTServiceUUID_reversed, sizeof(UARTServiceUUID_reversed));
 
     ble.setAdvertisingInterval(160); /* 100ms; in multiples of 0.625ms. */
+ //   ble.setAdvertisingInterval(320); /* 100ms; in multiples of 0.625ms. */
     ble.startAdvertising();
 
     UARTService uartService(ble);
@@ -83,3 +107,4 @@
         ble.waitForEvent();
     }
 }
+