Diff: main.cpp

Revision:

21:f8f44ad15d13

Parent:

20:15fb57ad4f70

Child:

23:9a404e36feaf

--- a/main.cpp	Mon Sep 12 17:24:21 2016 +0000
+++ b/main.cpp	Wed Sep 28 21:53:16 2016 +0000
@@ -20,7 +20,7 @@
 #define CR                              '\r'
 #define LF                              '\n'
 
-#define DEVICE_NAME                     "AKDP D7.009 "
+#define DEVICE_NAME                     "AKDP D7.010 "
 
 BLE                 ble;
 UARTService*        uartService;
@@ -61,6 +61,7 @@
 #define SLAVE_LATENCY                   0                                             /**< Slave latency. */
 #define CONN_SUP_TIMEOUT                MSEC_TO_UNITS(4000, UNIT_10_MS)               /**< Connection supervisory timeout (4 seconds). */
 
+// Command received from BLE
 void WrittenHandler(const GattWriteCallbackParams *Handler)
 {   
     static char command[TXRX_LEN]="";
@@ -94,6 +95,8 @@
     }
 }
 
+
+// Command received from USB
 static void usbUartCallback(void)
 {   
     static char command[TXRX_LEN] = "";
@@ -102,19 +105,20 @@
     if(serial.readable())    
     {
         uint8_t c = serial.getc();
-
+        
         // ignore CR
-        if(c==CR) return;
-        
-        command[len++] = c;
-        if(len>=TXRX_LEN || c == LF)
+        if(c != CR)
         {
-            manager->commandReceived(command);
-            for(int j=0; j<TXRX_LEN; j++){
-                command[j] = 0;
+            command[len++] = c;
+            if(len>=TXRX_LEN || c == LF)
+            {
+                manager->commandReceived(command);
+                for(int j=0; j<TXRX_LEN; j++){
+                    command[j] = 0;
+                }
+                len = 0;
             }
-            len = 0;
-        }
+        }        
     }
 }