Merge pull request #45 in SA/ble_examples from feature/spp_ble_fixes to ble_examples-2.2-develop

Squashed commit of the following:

commit b228a7454d5be82bd26c0f8c24b052c825b0e2cc
Author: Haq <[email protected]>
Date:   Fri May 19 12:42:06 2017 -0700

    updated with some enhancements

Author: Thomas Kopriva

docs/spp_ble.md

@@ -51,7 +51,7 @@ Running the demo is as simple and compiling and loading the code, then hooking u
  - You can use the terminal to send data from your PC to the LaunchPad, and also display the info sent from one device to another.
  - You will need to open two instances of the terminal program to, one to communicate with each board.
  - Follow the steps from our [FAQ](faq.md) to connect to the LaunchPad boards
- - **Please note that the SPP project uses a baud rate of 921600 not 115200**
+ - **Please note that the SPP project uses the default baud rate of 115200**
 
 2. Power the boards inividually and verify they are initialized
  - The client will blink the green LED twice at initialzation. It will also display `Auto connecting...` on the terminal

examples/cc2650lp/spp_ble_client/iar/config/iar_boundary.bdef

@@ -1,10 +1,10 @@
 /*
-** Stack Frontier Generator 1.1.0 (2016-11-02 11:47:45.467000)
+** Stack Frontier Generator 1.1.0 (2017-05-19 12:28:56.481000)
 **
 ** WARNING - Auto-generated file. Modifications could be lost!
 */
 
--D ICALL_STACK0_ADDR=0x0000e2f5
--D ICALL_STACK0_START=0x0000e2f4
+-D ICALL_STACK0_ADDR=0x0000e2f9
+-D ICALL_STACK0_START=0x0000e2f8
 -D ICALL_RAM0_START=0x20004320
 

examples/cc2650lp/spp_ble_client/iar/config/iar_boundary.xcl

@@ -1,10 +1,10 @@
 /*
-** Stack Frontier Generator 1.1.0 (2016-11-02 11:47:45.467000)
+** Stack Frontier Generator 1.1.0 (2017-05-19 12:28:56.481000)
 **
 ** WARNING - Auto-generated file. Modifications could be lost!
 */
 
 --config_def ICALL_RAM0_START=0x20004320
---config_def ICALL_STACK0_START=0x0000e2f4
---config_def ICALL_STACK0_ADDR=0x0000e2f5
+--config_def ICALL_STACK0_START=0x0000e2f8
+--config_def ICALL_STACK0_ADDR=0x0000e2f9
 

examples/cc2650lp/spp_ble_server/iar/config/iar_boundary.bdef

@@ -1,10 +1,10 @@
 /*
-** Stack Frontier Generator 1.1.0 (2016-11-02 14:24:42.407000)
+** Stack Frontier Generator 1.1.0 (2017-05-19 12:13:41.482000)
 **
 ** WARNING - Auto-generated file. Modifications could be lost!
 */
 
--D ICALL_STACK0_ADDR=0x0000f811
--D ICALL_STACK0_START=0x0000f810
+-D ICALL_STACK0_ADDR=0x0000f815
+-D ICALL_STACK0_START=0x0000f814
 -D ICALL_RAM0_START=0x20004320
 

examples/cc2650lp/spp_ble_server/iar/config/iar_boundary.xcl

@@ -1,10 +1,10 @@
 /*
-** Stack Frontier Generator 1.1.0 (2016-11-02 14:24:42.407000)
+** Stack Frontier Generator 1.1.0 (2017-05-19 12:13:41.482000)
 **
 ** WARNING - Auto-generated file. Modifications could be lost!
 */
 
 --config_def ICALL_RAM0_START=0x20004320
---config_def ICALL_STACK0_START=0x0000f810
---config_def ICALL_STACK0_ADDR=0x0000f811
+--config_def ICALL_STACK0_START=0x0000f814
+--config_def ICALL_STACK0_ADDR=0x0000f815
 

src/components/sdi/inc/sdi_task.h

@@ -115,6 +115,15 @@ extern void SDITask_registerIncomingRXEventAppCB(sdiIncomingEventCBack_t appRxCB
 // -----------------------------------------------------------------------------
 extern void SDITask_sendToUART(uint8_t *pMsg, uint16_t length);
 
+// -----------------------------------------------------------------------------
+//! \brief      API for application task to set packet data size to send over the air.
+//!
+//! \param[in]  mtuSize    GATT MTU size.
+//!
+//! \return     void
+// -----------------------------------------------------------------------------
+extern void SDITask_setAppDataSize(uint16_t mtuSize);
+
 #ifdef __cplusplus
 {
 #endif // extern "C"

src/components/sdi/sdi_task.c

@@ -87,7 +87,7 @@
 #define SDITASK_PRIORITY 2
 
 //! \brief Max bytes received from UART send to App
-#define MAX_UART_LENGTH 128
+#define DEFAULT_APP_DATA_LENGTH 20
 
 // ****************************************************************************
 // typedefs
@@ -144,6 +144,7 @@ ICall_EntityID sdiAppEntityID = 0;
 //!        rerouting of messages to application.
 //!
 static sdiIncomingEventCBack_t incomingRXEventAppCBFunc = NULL;
+static uint16 maxAppDataSize = DEFAULT_APP_DATA_LENGTH;
 
 //*****************************************************************************
 // function prototypes
@@ -169,6 +170,15 @@ static void SDITask_MRDYEventCB(int size);
 //!
 static void SDITask_ProcessTXQ(void);
 
+// -----------------------------------------------------------------------------
+//! \brief      Initialization for the SDI Thread
+//!
+//! \return     void
+// -----------------------------------------------------------------------------
+void SDITask_setAppDataSize(uint16 mtuSize)
+{
+  maxAppDataSize = mtuSize - 3; //subtract GATT Notification overhead: 1 byte opcode, 2 bytes conn. handle
+}
 
 // -----------------------------------------------------------------------------
 //! \brief      Initialization for the SDI Thread
@@ -249,9 +259,9 @@ static void SDITask_process(void)
             {
                 length = SDIRxBuf_GetRxBufLen();
 
-                if(length > MAX_UART_LENGTH)
+                if(length > maxAppDataSize)
                 {
-                  lengthRead = MAX_UART_LENGTH;
+                  lengthRead = (maxAppDataSize & 0xFF);
                 }else
                 {
                   lengthRead = (length & 0xFF);
@@ -269,8 +279,8 @@ static void SDITask_process(void)
                 {
                   incomingRXEventAppCBFunc( UART_DATA_EVT , buf, lengthRead);
                 }
-                
-                if(length > MAX_UART_LENGTH)
+
+                if(length > maxAppDataSize)
                 {
                     // Additional bytes to collect, preserve the flag and repost
                     // to the semaphore

src/examples/spp_ble_client/cc26xx/app/spp_ble_client.c

@@ -219,7 +219,7 @@ typedef struct
 // App event passed from profiles.
 typedef struct
 {
-  uint8_t data[SERIALPORTSERVICE_DATA_LEN];  // New data
+  uint8_t *pData;  // New data
   uint8_t length; // New status
 } sbcUARTEvt_t;
 
@@ -323,6 +323,9 @@ static bool procedureInProgress = FALSE;
 // Maximum PDU size (default = 27 octets)
 static uint16 maxPduSize;
 
+// Maximum MTU size (default = 23 octets)
+static uint16 currentMTUSize;
+
 // Pins that are actively used by the application
 static PIN_Config SPPBLEAppPinTable[] =
 {
@@ -644,26 +647,26 @@ static void SPPBLEClient_taskFxn(UArg a0, UArg a1)
           // Process message.
           bStatus_t retVal = FAILURE;
 
-          // Do a write
-          attWriteReq_t req;
-          
-          //Allocate data bytes to send over the air
-          req.pValue = GATT_bm_alloc(connHandle, ATT_WRITE_REQ, pMsg->length, NULL);
-          
-          if ( (req.pValue != NULL) && charDataHdl)
-          {
-            req.handle = charDataHdl; //handle for Value of Data characteristic found during service discovery   
-            req.len = pMsg->length;
-            memcpy(req.pValue, pMsg->data, pMsg->length);
-            req.sig = FALSE;
-            req.cmd = TRUE;
+            // Do a write
+            attWriteReq_t req;
+
+            //Allocate data bytes to send over the air
+            req.pValue = GATT_bm_alloc(connHandle, ATT_WRITE_REQ, pMsg->length, NULL);
+
+            if ( (req.pValue != NULL) && charDataHdl)
+            {
+              req.handle = charDataHdl; //handle for Value of Data characteristic found during service discovery
+              req.len = pMsg->length;
+              memcpy(req.pValue, pMsg->pData, pMsg->length);
+              req.sig = FALSE;
+              req.cmd = TRUE;
 
             retVal = GATT_WriteNoRsp(connHandle, &req);
 
             if ( retVal != SUCCESS )
             {
               GATT_bm_free((gattMsg_t *)&req, ATT_WRITE_REQ);
-              DEBUG("FAIL FROM CLIENT");
+                DEBUG("FAIL FROM CLIENT: "); DEBUG((uint8_t*)convInt32ToText((int)retVal)); DEBUG_NEWLINE();
             }else
             {
               //Remove from the queue
@@ -672,6 +675,7 @@ static void SPPBLEClient_taskFxn(UArg a0, UArg a1)
               //Toggle LED to indicate data received from UART terminal and sent over the air
               //SPPBLEClient_toggleLed(Board_GLED, Board_LED_TOGGLE);
 
+                ICall_freeMsg(pMsg->pData);
               // Free the space from the message.
               ICall_free(pMsg);
 
@@ -1203,6 +1207,11 @@ static void SPPBLEClient_processGATTMsg(gattMsgEvent_t *pMsg)
     }
     else if (pMsg->method == ATT_MTU_UPDATED_EVENT)
     {
+      currentMTUSize = pMsg->msg.mtuEvt.MTU;
+      SDITask_setAppDataSize(currentMTUSize);
+
+      DEBUG("MTU Size: "); DEBUG((uint8_t*)convInt32ToText((int)currentMTUSize)); DEBUG_NEWLINE();
+
       // MTU size updated
       Display_print1(dispHandle, 4, 0, "MTU Size: %d", pMsg->msg.mtuEvt.MTU);
     }
@@ -1538,14 +1547,11 @@ static void SPPBLEClient_processGATTDiscEvent(gattMsgEvent_t *pMsg)
     if (pMsg->method == ATT_EXCHANGE_MTU_RSP)
     {
       uint8_t uuid[ATT_UUID_SIZE] = { TI_BASE_UUID_128(SERIALPORTSERVICE_SERV_UUID) };
-      
-      DEBUG("Server receive MTU: "); 
-      DEBUG((uint8_t*)convInt32ToText((int)pMsg->msg.exchangeMTURsp.serverRxMTU)); DEBUG_NEWLINE();
-      
+
       discState = BLE_DISC_STATE_SVC;
-      
-      DEBUG("Discovering services...");
-      
+
+      DEBUG("Discovering services..."); DEBUG_NEWLINE();
+
       // Discovery simple BLE service
       VOID GATT_DiscPrimaryServiceByUUID(connHandle, uuid, ATT_UUID_SIZE,
                                          selfEntity);
@@ -1900,7 +1906,13 @@ void SPPBLEClient_enqueueUARTMsg(uint8_t event, uint8_t *data, uint8_t len)
     // Create dynamic pointer to message.
     if (pMsg = ICall_malloc(sizeof(sbcUARTEvt_t)))
     {
-      memcpy(pMsg->data , data, len);
+
+      pMsg->pData = (uint8 *)ICall_allocMsg(len);
+      if(pMsg->pData)
+      {
+        //payload
+        memcpy(pMsg->pData , data, len);
+      }
       pMsg->length = len;
 
       // Enqueue the message.

src/examples/spp_ble_server/cc26xx/app/spp_ble_server.c

@@ -173,9 +173,9 @@ typedef struct
 typedef struct
 {
   uint8_t event;  // Type of event
-  uint8_t data[SERIALPORTSERVICE_DATA_LEN];  // New data
+  uint8_t *pData;  // New data
   uint8_t length; // New status
-} sbpUARTEvt_t; //size = 22 bytes
+} sbpUARTEvt_t;
 /*********************************************************************
  * GLOBAL VARIABLES
  */
@@ -186,6 +186,9 @@ typedef struct
 // Global pin resources
 PIN_State pinGpioState;
 PIN_Handle hGpioPin;
+
+uint16 currentMTUSize;
+
 /*********************************************************************
  * LOCAL VARIABLES
  */
@@ -304,7 +307,7 @@ static uint8_t rspTxRetry = 0;
 static PIN_Config SPPBLEAppPinTable[] =
 {
     Board_RLED       | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,     /* LED initially off             */
-    Board_LED2       | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,     /* LED initially off             */
+    Board_GLED       | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,     /* LED initially off             */
 
     PIN_TERMINATE
 };
@@ -708,7 +711,7 @@ static void SPPBLEServer_taskFxn(UArg a0, UArg a1)
               case SBP_UART_DATA_EVT:
               {
                 //Send the notification
-                retVal = SerialPortService_SetParameter(SERIALPORTSERVICE_CHAR_DATA, pMsg->length, pMsg->data); 
+                retVal = SerialPortService_SetParameter(SERIALPORTSERVICE_CHAR_DATA, pMsg->length, pMsg->pData);
 
                 if(retVal != SUCCESS)
                 {
@@ -724,8 +727,10 @@ static void SPPBLEServer_taskFxn(UArg a0, UArg a1)
                   Util_dequeueMsg(appUARTMsgQueue);
 
                   //Toggle LED to indicate data received from UART terminal and sent over the air
-                  //SPPBLEServer_toggleLed(Board_LED2, Board_LED_TOGGLE);
-                    
+                  //SPPBLEServer_toggleLed(Board_GLED, Board_LED_TOGGLE);
+
+                  //Deallocate data payload being transmitted.
+                  ICall_freeMsg(pMsg->pData);
                   // Free the space from the message.
                   ICall_free(pMsg);
                 }
@@ -875,9 +880,10 @@ static uint8_t SPPBLEServer_processGATTMsg(gattMsgEvent_t *pMsg)
   else if (pMsg->method == ATT_MTU_UPDATED_EVENT)
   {
     // MTU size updated
-    Display_print1(dispHandle, 5, 0, "MTU Size: $d", pMsg->msg.mtuEvt.MTU);
-    DEBUG("MTU Updated: "); 
-    DEBUG((uint8_t*)convInt32ToText((int)pMsg->msg.mtuEvt.MTU)); DEBUG_NEWLINE();
+    currentMTUSize = pMsg->msg.mtuEvt.MTU;
+    SDITask_setAppDataSize(currentMTUSize);
+    Display_print1(dispHandle, 5, 0, "MTU Size: %d", currentMTUSize);
+    DEBUG("MTU Size: "); DEBUG((uint8_t*)convInt32ToText((int)currentMTUSize)); DEBUG_NEWLINE();
   }
 
   // Free message payload. Needed only for ATT Protocol messages
@@ -1103,6 +1109,7 @@ static void SPPBLEServer_processStateChangeEvt(gaprole_States_t newState)
         {
           Display_print1(dispHandle, 2, 0, "Num Conns: %d", (uint16_t)numActive);
           Display_print0(dispHandle, 3, 0, Util_convertBdAddr2Str(linkInfo.addr));
+          DEBUG("CONNECTED..."); DEBUG_NEWLINE();
         }
         else
         {
@@ -1151,6 +1158,7 @@ static void SPPBLEServer_processStateChangeEvt(gaprole_States_t newState)
 
       Display_print0(dispHandle, 2, 0, "Disconnected");
 
+      DEBUG("DISCONNECTED..."); DEBUG_NEWLINE();
       // Clear remaining lines
       //Display_clearLines(dispHandle, 3, 5);
       break;
@@ -1159,7 +1167,7 @@ static void SPPBLEServer_processStateChangeEvt(gaprole_States_t newState)
       SPPBLEServer_freeAttRsp(bleNotConnected);
 
       Display_print0(dispHandle, 2, 0, "Timed Out");
-
+      DEBUG("DISCONNECTED AFTER TIMEOUT..."); DEBUG_NEWLINE();
       // Clear remaining lines
       //Display_clearLines(dispHandle, 3, 5);
 
@@ -1314,7 +1322,12 @@ void SPPBLEServer_enqueueUARTMsg(uint8_t event, uint8_t *data, uint8_t len)
     { 
 
       pMsg->event = event;
-      memcpy(pMsg->data , data, len);
+      pMsg->pData = (uint8 *)ICall_allocMsg(len);
+      if(pMsg->pData)
+      {
+        //payload
+        memcpy(pMsg->pData , data, len);
+      }
       pMsg->length = len;
 
       // Enqueue the message.