Diff: main.cpp

Revision:

12:f86bdebbebe8

Parent:

10:633cec718bf4

--- a/main.cpp	Tue Dec 09 08:55:59 2014 +0000
+++ b/main.cpp	Fri May 22 07:23:32 2015 +0000
@@ -16,8 +16,9 @@
 
 #include "mbed.h"
 #include "BLEDevice.h"
-
 #include "UARTService.h"
+#include "DFUService.h"
+#include "Buffer.h"
 
 #define NEED_CONSOLE_OUTPUT 0 /* Set this if you need debug messages on the console;
                                * it will have an impact on code-size and power consumption. */
@@ -28,15 +29,63 @@
 #define DEBUG(...) /* nothing */
 #endif /* #if NEED_CONSOLE_OUTPUT */
 
+Buffer <char> uartRxBuffer(0x100);
+//Serial uart(p8, p7);
+Serial uart(USBTX, USBRX);
+
 BLEDevice  ble;
-DigitalOut led1(LED1);
+DigitalOut led1(p28);
 
 UARTService *uartServicePtr;
 
+uint8_t bleIsConnected = 0;
+uint8_t bleTxFlag = 0;
+
+bool rxPayloadUpdated = false;
+uint8_t rxPayload[20 + 1] = {0,};
+uint8_t txPayload[20 + 1] = {0,};
+
+void uart2ble(void)
+{
+    uint16_t bytesToWrite = 0;
+    for (int i = 0; i < 20; i++) {
+        if (uartRxBuffer.available()) {
+            txPayload[bytesToWrite] = uartRxBuffer;
+            bytesToWrite++;
+        }
+    }
+
+    if (bytesToWrite != 0) {
+        bleTxFlag = 1;
+
+        ble.updateCharacteristicValue(uartServicePtr->getRXCharacteristicHandle(), txPayload, bytesToWrite);
+    } else {
+        bleTxFlag = 0;
+    }
+}
+
+void resetToRunBootloader()
+{
+    DEBUG("Reset to run bootloader\r\n");
+    NRF_POWER->GPREGRET = 0x02; 
+    NVIC_SystemReset();
+}
+
+void connectionCallback(Gap::Handle_t, Gap::addr_type_t peerAddrType, const Gap::address_t peerAddr, const Gap::ConnectionParams_t *)
+{
+    DEBUG("Connected\r\n");
+    bleIsConnected = 1;
+    bleTxFlag = 0;
+}
+
 void disconnectionCallback(Gap::Handle_t handle, Gap::DisconnectionReason_t reason)
 {
     DEBUG("Disconnected!\n\r");
     DEBUG("Restarting the advertising process\n\r");
+    
+    bleTxFlag = 0;
+    bleIsConnected = 0;
+    
     ble.startAdvertising();
 }
 
@@ -45,10 +94,21 @@
     if ((uartServicePtr != NULL) && (params->charHandle == uartServicePtr->getTXCharacteristicHandle())) {
         uint16_t bytesRead = params->len;
         DEBUG("received %u bytes\n\r", bytesRead);
-        ble.updateCharacteristicValue(uartServicePtr->getRXCharacteristicHandle(), params->data, bytesRead);
+        // ble.updateCharacteristicValue(uartServicePtr->getRXCharacteristicHandle(), params->data, bytesRead);
+        
+        for (int i = 0; i < bytesRead; i++) {
+            uart.putc(params->data[i]);
+        }
     }
 }
 
+void onDataSent(unsigned count)
+{
+    DEBUG("onDataSent\r\n");
+
+    uart2ble();
+}
+
 void periodicCallback(void)
 {
     led1 = !led1;
@@ -58,12 +118,14 @@
 {
     led1 = 1;
     Ticker ticker;
-    ticker.attach(periodicCallback, 1);
+    ticker.attach(periodicCallback, 0.01);
 
     DEBUG("Initialising the nRF51822\n\r");
     ble.init();
+    ble.onConnection(connectionCallback);
     ble.onDisconnection(disconnectionCallback);
     ble.onDataWritten(onDataWritten);
+    ble.onDataSent(onDataSent);
 
     /* setup advertising */
     ble.accumulateAdvertisingPayload(GapAdvertisingData::BREDR_NOT_SUPPORTED);
@@ -76,10 +138,28 @@
     ble.setAdvertisingInterval(Gap::MSEC_TO_ADVERTISEMENT_DURATION_UNITS(1000));
     ble.startAdvertising();
 
+    DFUService dfuService(ble);
     UARTService uartService(ble);
     uartServicePtr = &uartService;
 
     while (true) {
-        ble.waitForEvent();
+        uint32_t timeout = 1000;
+        while (timeout) {
+            timeout--;
+            if (uart.readable()) {
+                uartRxBuffer.put((char)uart.getc());
+                timeout = 1000;
+            }
+        }
+        
+        if (bleIsConnected && bleTxFlag == 0 && uartRxBuffer.available()) {
+            uart2ble();
+            bleTxFlag = 1;
+        }
     }
 }
+
+extern "C" void HardFault_Handler()
+{
+    NVIC_SystemReset();
+}