Optimize UART data transmission. && Adjust service change notification sending conditions. (#58)

* Optimize UART data transmission.

* Adjust service change notification sending conditions.

Author: lihuanhuan

app/fido.h

@@ -11,8 +11,6 @@ static uint16_t fido_recv_len, fido_recv_offset;
 
 void fido_write_data_to_st(void* data, uint16_t len)
 {
-    static uint16_t count = 0;
-    NRF_LOG_INFO("fido_write_data_to_st %d", count++);
     // usr_spi_write(data, len);
     usr_spi_write(fido_recv_buf, fido_recv_len);
 }

app/main.c

@@ -666,6 +666,11 @@ static void pm_evt_handler(const pm_evt_t* p_evt)
     switch ( p_evt->evt_id )
     {
 
+    case PM_EVT_BONDED_PEER_CONNECTED:
+        NRF_LOG_INFO("%s ---> PM_EVT_BONDED_PEER_CONNECTED", __func__);
+        request_service_changed = true;
+        break;
+
     case PM_EVT_CONN_SEC_CONFIG_REQ:
         NRF_LOG_INFO("%s ---> PM_EVT_CONN_SEC_CONFIG_REQ", __func__);
         {
@@ -729,7 +734,6 @@ static void pm_evt_handler(const pm_evt_t* p_evt)
         break;
     case PM_EVT_LOCAL_DB_CACHE_APPLY_FAILED:
         NRF_LOG_INFO("%s ---> PM_EVT_LOCAL_DB_CACHE_APPLY_FAILED", __func__);
-        request_service_changed = true;
         break;
 
     case PM_EVT_PEER_DATA_UPDATE_SUCCEEDED:
@@ -1894,20 +1898,7 @@ static uint8_t calcXor(uint8_t* buf, uint8_t len)
 }
 static void uart_put_data(uint8_t* pdata, uint8_t lenth)
 {
-    uint32_t err_code;
-
-    while ( lenth-- )
-    {
-        do
-        {
-            err_code = app_uart_put(*pdata++);
-            if ( (err_code != NRF_SUCCESS) && (err_code != NRF_ERROR_BUSY) )
-            {
-                APP_ERROR_CHECK(err_code);
-            }
-        }
-        while ( err_code == NRF_ERROR_BUSY );
-    }
+    app_uart_put_data(pdata, lenth);
 }
 
 static void send_stm_data(uint8_t* pdata, uint8_t lenth)

ble-firmware/components/libraries/uart/app_uart.h

@@ -251,7 +251,7 @@ uint32_t app_uart_flush(void);
  */
 uint32_t app_uart_close(void);
 
-
+uint32_t app_uart_put_data(uint8_t* pdata, uint8_t lenth);
 
 #ifdef __cplusplus
 }

ble-firmware/components/libraries/uart/app_uart_fifo.c

@@ -43,6 +43,7 @@
 #include "app_fifo.h"
 #include "nrf_drv_uart.h"
 #include "nrf_assert.h"
+#include "nrf_delay.h"
 
 static nrf_drv_uart_t app_uart_inst = NRF_DRV_UART_INSTANCE(APP_UART_DRIVER_INSTANCE);
 
@@ -243,6 +244,22 @@ uint32_t app_uart_put(uint8_t byte)
     return err_code;
 }
 
+uint32_t app_uart_put_data(uint8_t* pdata, uint8_t lenth)
+{
+    uint32_t count = 0;
+    while (nrf_drv_uart_tx_in_progress(&app_uart_inst))
+    {
+        nrf_delay_ms(10);
+        count++;
+    }
+    if (count > 50)
+    {
+        return NRF_ERROR_BUSY;
+    }
+    ret_code_t ret =  nrf_drv_uart_tx(&app_uart_inst, pdata, lenth);
+    return ret;
+}
+
 
 uint32_t app_uart_close(void)
 {