Browse Source

update

master
zhaohe 1 year ago
parent
commit
d76e1d1de7
  1. 50
      ble_app_uart_c_pca10100_s122.uvguix.h_zha
  2. 17
      main.c
  3. 2
      zble_nus_c.c

50
ble_app_uart_c_pca10100_s122.uvguix.h_zha
File diff suppressed because it is too large
View File

17
main.c

@ -226,7 +226,8 @@ static void db_disc_handler(ble_db_discovery_evt_t * p_evt)
* @details This function takes a list of characters of length data_len and prints the characters out on UART.
* If @ref ECHOBACK_BLE_UART_DATA is set, the data is sent back to sender.
*/
static void ble_nus_chars_received_uart_print(uint8_t * p_data, uint16_t data_len)
static void ble_nus_chars_received_uart_print(uint8_t * p_data, uint16_t data_len,bool raw)
{
ret_code_t ret_val;
@ -246,8 +247,11 @@ static void ble_nus_chars_received_uart_print(uint8_t * p_data, uint16_t data_le
}
} while (ret_val == NRF_ERROR_BUSY);
}
if(!raw){
app_uart_put(0x5A);
app_uart_put(0xA5);
}
// if (p_data[data_len-1] == '\r')
// {
// while (app_uart_put('\n') == NRF_ERROR_BUSY);
@ -334,6 +338,7 @@ void uart_event_handle(app_uart_evt_t * p_event)
*/
/**@snippet [Handling events from the ble_nus_c module] */
static int32_t rxcnt;
static void ble_nus_c_evt_handler(ble_nus_c_t * p_ble_nus_c, ble_nus_c_evt_t const * p_ble_nus_evt)
{
ret_code_t err_code;
@ -351,11 +356,13 @@ static void ble_nus_c_evt_handler(ble_nus_c_t * p_ble_nus_c, ble_nus_c_evt_t con
break;
case BLE_NUS_C_EVT_NUS_TX_EVT:
ble_nus_chars_received_uart_print(p_ble_nus_evt->p_data, p_ble_nus_evt->data_len);
ble_nus_chars_received_uart_print(p_ble_nus_evt->p_data, p_ble_nus_evt->data_len,false);
break;
// case BLE_NUS_C_EVT_NUS_TX_BLOCK_EVT:
// ble_nus_chars_received_uart_print(p_ble_nus_evt->p_data, p_ble_nus_evt->data_len);
// break;
case BLE_NUS_C_EVT_NUS_TX_EVT_2:
ble_nus_chars_received_uart_print(p_ble_nus_evt->p_data, p_ble_nus_evt->data_len,true);
rxcnt+=p_ble_nus_evt->data_len;
// printf("data_len:%d %d\n",p_ble_nus_evt->data_len,rxcnt);
break;
case BLE_NUS_C_EVT_DISCONNECTED:
NRF_LOG_INFO("Disconnected.");

2
zble_nus_c.c

@ -127,7 +127,7 @@ static void on_hvx(ble_nus_c_t *p_ble_nus_c, ble_evt_t const *p_ble_evt) {
ble_nus_c_evt_t ble_nus_c_evt;
// ble_nus_c_evt.evt_type = BLE_NUS_C_EVT_NUS_TX_EVT_2;
ble_nus_c_evt.evt_type = BLE_NUS_C_EVT_NUS_TX_EVT;
ble_nus_c_evt.evt_type = BLE_NUS_C_EVT_NUS_TX_EVT_2;
ble_nus_c_evt.p_data = (uint8_t *)p_ble_evt->evt.gattc_evt.params.hvx.data;
ble_nus_c_evt.data_len = p_ble_evt->evt.gattc_evt.params.hvx.len;

Loading…
Cancel
Save