jacob.eva/arduino-esp32
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement BTSerial onData to dynamically receive packets from SPP (#3649)

Browse Source
This commit is contained in:
Me No Dev 2020-01-20 19:43:52 +02:00 committed by GitHub
parent 32d5654aa6
commit 307b1368dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libraries/BluetoothSerial/src/BluetoothSerial.cpp
View File

@ -36,9 +36,7 @@
#include "esp_spp_api.h" #include "esp_spp_api.h"
#include <esp_log.h> #include <esp_log.h>
#ifdef ARDUINO_ARCH_ESP32
#include "esp32-hal-log.h" #include "esp32-hal-log.h"
#endif
const char * _spp_server_name = "ESP32SPP"; const char * _spp_server_name = "ESP32SPP";
@ -52,6 +50,7 @@ static TaskHandle_t _spp_task_handle = NULL;
static EventGroupHandle_t _spp_event_group = NULL; static EventGroupHandle_t _spp_event_group = NULL;
static boolean secondConnectionAttempt; static boolean secondConnectionAttempt;
static esp_spp_cb_t * custom_spp_callback = NULL; static esp_spp_cb_t * custom_spp_callback = NULL;
static BluetoothSerialDataCb custom_data_callback = NULL;
#define INQ_LEN 0x10 #define INQ_LEN 0x10
#define INQ_NUM_RSPS 20 #define INQ_NUM_RSPS 20
@ -218,7 +217,6 @@ static void _spp_tx_task(void * arg){
_spp_task_handle = NULL; _spp_task_handle = NULL;
} }
static void esp_spp_cb(esp_spp_cb_event_t event, esp_spp_cb_param_t *param) static void esp_spp_cb(esp_spp_cb_event_t event, esp_spp_cb_param_t *param)
{ {
switch (event) switch (event)
@ -278,7 +276,9 @@ static void esp_spp_cb(esp_spp_cb_event_t event, esp_spp_cb_param_t *param)
//esp_log_buffer_hex("",param->data_ind.data,param->data_ind.len); //for low level debug //esp_log_buffer_hex("",param->data_ind.data,param->data_ind.len); //for low level debug
//ets_printf("r:%u\n", param->data_ind.len); //ets_printf("r:%u\n", param->data_ind.len);
if (_spp_rx_queue != NULL){ if(custom_data_callback){
custom_data_callback(param->data_ind.data, param->data_ind.len);
} else if (_spp_rx_queue != NULL){
for (int i = 0; i < param->data_ind.len; i++){ for (int i = 0; i < param->data_ind.len; i++){
if(xQueueSend(_spp_rx_queue, param->data_ind.data + i, (TickType_t)0) != pdTRUE){ if(xQueueSend(_spp_rx_queue, param->data_ind.data + i, (TickType_t)0) != pdTRUE){
log_e("RX Full! Discarding %u bytes", param->data_ind.len - i); log_e("RX Full! Discarding %u bytes", param->data_ind.len - i);
@ -322,6 +322,10 @@ static void esp_spp_cb(esp_spp_cb_event_t event, esp_spp_cb_param_t *param)
if(custom_spp_callback)(*custom_spp_callback)(event, param); if(custom_spp_callback)(*custom_spp_callback)(event, param);
} }
void BluetoothSerial::onData(BluetoothSerialDataCb cb){
custom_data_callback = cb;
}
static void esp_bt_gap_cb(esp_bt_gap_cb_event_t event, esp_bt_gap_cb_param_t *param) static void esp_bt_gap_cb(esp_bt_gap_cb_event_t event, esp_bt_gap_cb_param_t *param)
{ {
switch(event){ switch(event){
@ -469,7 +473,7 @@ static bool _init_bt(const char *deviceName)
} }
if(!_spp_task_handle){ if(!_spp_task_handle){
xTaskCreate(_spp_tx_task, "spp_tx", 4096, NULL, 2, &_spp_task_handle); xTaskCreatePinnedToCore(_spp_tx_task, "spp_tx", 4096, NULL, 2, &_spp_task_handle, 0);
if(!_spp_task_handle){ if(!_spp_task_handle){
log_e("Network Event Task Start Failed!"); log_e("Network Event Task Start Failed!");
return false; return false;
@ -511,6 +515,10 @@ static bool _init_bt(const char *deviceName)
return false; return false;
} }
if (esp_bt_sleep_disable() != ESP_OK){
log_e("esp_bt_sleep_disable failed");
}
log_i("device name set"); log_i("device name set");
esp_bt_dev_set_device_name(deviceName); esp_bt_dev_set_device_name(deviceName);

4
libraries/BluetoothSerial/src/BluetoothSerial.h
View File

@ -22,6 +22,9 @@
#include "Arduino.h" #include "Arduino.h"
#include "Stream.h" #include "Stream.h"
#include <esp_spp_api.h> #include <esp_spp_api.h>
#include <functional>
typedef std::function<void(const uint8_t *buffer, size_t size)> BluetoothSerialDataCb;
class BluetoothSerial: public Stream class BluetoothSerial: public Stream
{ {
@ -39,6 +42,7 @@ class BluetoothSerial: public Stream
size_t write(const uint8_t *buffer, size_t size); size_t write(const uint8_t *buffer, size_t size);
void flush(); void flush();
void end(void); void end(void);
void onData(BluetoothSerialDataCb cb);
esp_err_t register_callback(esp_spp_cb_t * callback); esp_err_t register_callback(esp_spp_cb_t * callback);
void enableSSP(); void enableSSP();