Make SimpleBLE work again

Fixes: espressif#373

Author: me-no-dev

libraries/SimpleBLE/src/SimpleBLE.cpp

@@ -15,324 +15,113 @@
 #include"SimpleBLE.h"
 #include"esp32-hal-log.h"
 
-/* HCI Command opcode group field(OGF) */
-#defineHCI_GRP_HOST_CONT_BASEBAND_CMDS (0x03 << 10) /* 0x0C00 */
-#defineHCI_GRP_BLE_CMDS (0x08 << 10)
-
-/* HCI Command opcode command field(OCF) */
-#defineHCI_RESET (0x0003 | HCI_GRP_HOST_CONT_BASEBAND_CMDS)
-#defineHCI_BLE_WRITE_ADV_ENABLE (0x000A | HCI_GRP_BLE_CMDS)
-#defineHCI_BLE_WRITE_ADV_PARAMS (0x0006 | HCI_GRP_BLE_CMDS)
-#defineHCI_BLE_WRITE_ADV_DATA (0x0008 | HCI_GRP_BLE_CMDS)
-
-#defineHCI_H4_CMD_PREAMBLE_SIZE (4)
-#defineHCIC_PARAM_SIZE_WRITE_ADV_ENABLE (1)
-#defineHCIC_PARAM_SIZE_BLE_WRITE_ADV_PARAMS (15)
-#defineHCIC_PARAM_SIZE_BLE_WRITE_ADV_DATA (31)
-
-/* EIR/AD data type definitions */
-#defineBT_DATA_FLAGS0x01/* AD flags */
-#defineBT_DATA_UUID16_SOME0x02/* 16-bit UUID, more available */
-#defineBT_DATA_UUID16_ALL0x03/* 16-bit UUID, all listed */
-#defineBT_DATA_UUID32_SOME0x04/* 32-bit UUID, more available */
-#defineBT_DATA_UUID32_ALL0x05/* 32-bit UUID, all listed */
-#defineBT_DATA_UUID128_SOME0x06/* 128-bit UUID, more available */
-#defineBT_DATA_UUID128_ALL0x07/* 128-bit UUID, all listed */
-#defineBT_DATA_NAME_SHORTENED0x08/* Shortened name */
-#defineBT_DATA_NAME_COMPLETE0x09/* Complete name */
-#defineBT_DATA_TX_POWER0x0a/* Tx Power */
-#defineBT_DATA_SOLICIT160x14/* Solicit UUIDs, 16-bit */
-#defineBT_DATA_SOLICIT1280x15/* Solicit UUIDs, 128-bit */
-#defineBT_DATA_SVC_DATA160x16/* Service data, 16-bit UUID */
-#defineBT_DATA_GAP_APPEARANCE0x19/* GAP appearance */
-#defineBT_DATA_SOLICIT320x1f/* Solicit UUIDs, 32-bit */
-#defineBT_DATA_SVC_DATA320x20/* Service data, 32-bit UUID */
-#defineBT_DATA_SVC_DATA1280x21/* Service data, 128-bit UUID */
-#defineBT_DATA_MANUFACTURER_DATA0xff/* Manufacturer Specific Data */
-
-
-/* Advertising types */
-#defineBLE_GAP_ADV_TYPE_ADV_IND0x00
-#defineBLE_GAP_ADV_TYPE_ADV_DIRECT_IND0x01
-#defineBLE_GAP_ADV_TYPE_ADV_SCAN_IND0x02
-#defineBLE_GAP_ADV_TYPE_ADV_NONCONN_IND0x03
-
-
-/* Advertising Discovery Flags */
-#defineBLE_GAP_ADV_FLAG_LE_LIMITED_DISC_MODE (0x01)
-#defineBLE_GAP_ADV_FLAG_LE_GENERAL_DISC_MODE (0x02)
-#defineBLE_GAP_ADV_FLAG_BR_EDR_NOT_SUPPORTED (0x04)
-#defineBLE_GAP_ADV_FLAG_LE_BR_EDR_CONTROLLER (0x08)
-#defineBLE_GAP_ADV_FLAG_LE_BR_EDR_HOST (0x10)
-#defineBLE_GAP_ADV_FLAGS_LE_ONLY_LIMITED_DISC_MODE (BLE_GAP_ADV_FLAG_LE_LIMITED_DISC_MODE | BLE_GAP_ADV_FLAG_BR_EDR_NOT_SUPPORTED)
-#defineBLE_GAP_ADV_FLAGS_LE_ONLY_GENERAL_DISC_MODE (BLE_GAP_ADV_FLAG_LE_GENERAL_DISC_MODE | BLE_GAP_ADV_FLAG_BR_EDR_NOT_SUPPORTED)
-
-
-/* Advertising Filter Policies */
-#defineBLE_GAP_ADV_FP_ANY0x00
-#defineBLE_GAP_ADV_FP_FILTER_SCANREQ0x01
-#defineBLE_GAP_ADV_FP_FILTER_CONNREQ0x02
-#defineBLE_GAP_ADV_FP_FILTER_BOTH0x03
-
-
-/* Advertising Device Address Types */
-#defineBLE_GAP_ADDR_TYPE_PUBLIC0x00
-#defineBLE_GAP_ADDR_TYPE_RANDOM_STATIC0x01
-#defineBLE_GAP_ADDR_TYPE_RANDOM_PRIVATE_RESOLVABLE0x02
-#defineBLE_GAP_ADDR_TYPE_RANDOM_PRIVATE_NON_RESOLVABLE0x03
-
-
-/* GAP Advertising Channel Maps */
-#defineGAP_ADVCHAN_370x01
-#defineGAP_ADVCHAN_380x02
-#defineGAP_ADVCHAN_390x04
-#defineGAP_ADVCHAN_ALL GAP_ADVCHAN_37 | GAP_ADVCHAN_38 | GAP_ADVCHAN_39
-
-
-/* GAP Filter Policies */
-#defineBLE_GAP_ADV_FP_ANY0x00
-#defineBLE_GAP_ADV_FP_FILTER_SCANREQ0x01
-#defineBLE_GAP_ADV_FP_FILTER_CONNREQ0x02
-#defineBLE_GAP_ADV_FP_FILTER_BOTH0x03
-
-#defineBD_ADDR_LEN (6) /* Device address length */
-
-
-/*
- * BLE System
- *
- * */
-
-/* HCI H4 message type definitions */
-enum{
- H4_TYPE_COMMAND = 1,
- H4_TYPE_ACL = 2,
- H4_TYPE_SCO = 3,
- H4_TYPE_EVENT = 4
+#include"bt.h"
+#include"bta_api.h"
+#include"esp_gap_ble_api.h"
+#include"esp_gatts_api.h"
+#include"esp_bt_defs.h"
+#include"esp_bt_main.h"
+
+staticesp_ble_adv_data_t _adv_config ={
+ .set_scan_rsp = false,
+ .include_name = true,
+ .include_txpower = true,
+ .min_interval = 512,
+ .max_interval = 1024,
+ .appearance = 0,
+ .manufacturer_len = 0,
+ .p_manufacturer_data = NULL,
+ .service_data_len = 0,
+ .p_service_data = NULL,
+ .service_uuid_len = 0,
+ .p_service_uuid = NULL,
+ .flag = (ESP_BLE_ADV_FLAG_GEN_DISC|ESP_BLE_ADV_FLAG_BREDR_NOT_SPT)
 };
 
-volatilebool _vhci_host_send_available = false;
-volatilebool _vhci_host_command_running = false;
-staticuint16_t _vhci_host_command = 0x0000;
-staticuint8_t _vhci_host_command_result = 0x00;
+staticesp_ble_adv_params_t _adv_params ={
+ .adv_int_min = 512,
+ .adv_int_max = 1024,
+ .adv_type = ADV_TYPE_NONCONN_IND,
+ .own_addr_type = BLE_ADDR_TYPE_PUBLIC,
+ .peer_addr ={0x00, },
+ .peer_addr_type = BLE_ADDR_TYPE_PUBLIC,
+ .channel_map = ADV_CHNL_ALL,
+ .adv_filter_policy = ADV_FILTER_ALLOW_SCAN_ANY_CON_ANY,
+};
 
-//controller is ready to receive command
-staticvoid_on_tx_ready(void)
-{
- _vhci_host_send_available = true;
-}
-/*
-static void _dump_buf(const char * txt, uint8_t *data, uint16_t len){
- log_printf("%s[%u]:", txt, len);
- for (uint16_t i=0; i<len; i++)
- log_printf(" %02x", data[i]);
- log_printf("\n");
-}
-*/
-//controller has a packet
-staticint_on_rx_data(uint8_t *data, uint16_t len)
-{
-if(len == 7 && *data == 0x04){
-//baseband response
-uint16_t cmd = (((uint16_t)data[5] << 8) | data[4]);
-uint8_t res = data[6];
-if(_vhci_host_command_running && _vhci_host_command == cmd){
-//_dump_buf("BLE: res", data, len);
- _vhci_host_command_result = res;
- _vhci_host_command_running = false;
-return0;
- } elseif(cmd == 0){
-log_e("error %u", res);
- }
+staticvoid_on_gap(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param){
+if(event == ESP_GAP_BLE_ADV_DATA_SET_COMPLETE_EVT){
+esp_ble_gap_start_advertising(&_adv_params);
  }
-
-//_dump_buf("BLE: rx", data, len);
-return0;
 }
 
-
-
-
-staticesp_vhci_host_callback_t vhci_host_cb ={
- _on_tx_ready,
- _on_rx_data
-};
-
-staticbool_esp_ble_start()
-{
-if(btStart()){
-esp_vhci_host_register_callback(&vhci_host_cb);
-uint8_t i = 0;
-while(!esp_vhci_host_check_send_available() && i++ < 100){
-delay(10);
+staticbool_init_gap(constchar * name){
+if(!btStarted() && !btStart()){
+log_e("btStart failed");
+returnfalse;
+ }
+esp_bluedroid_status_t bt_state = esp_bluedroid_get_status();
+if(bt_state == ESP_BLUEDROID_STATUS_UNINITIALIZED){
+if (esp_bluedroid_init()){
+log_e("esp_bluedroid_init failed");
+returnfalse;
  }
-if(i >= 100){
-log_e("esp_vhci_host_check_send_available failed");
+ }
+if(bt_state != ESP_BLUEDROID_STATUS_ENABLED){
+if (esp_bluedroid_enable()){
+log_e("esp_bluedroid_enable failed");
 returnfalse;
  }
- _vhci_host_send_available = true;
- } else
-log_e("BT Failed");
+ }
+if(esp_ble_gap_set_device_name(name)){
+log_e("gap_set_device_name failed");
+returnfalse;
+ }
+if(esp_ble_gap_config_adv_data(&_adv_config)){
+log_e("gap_config_adv_data failed");
+returnfalse;
+ }
+if(esp_ble_gap_register_callback(_on_gap)){
+log_e("gap_register_callback failed");
+returnfalse;
+ }
 returntrue;
 }
 
-staticbool_esp_ble_stop()
+staticbool_stop_gap()
 {
 if(btStarted()){
- _vhci_host_send_available = false;
+esp_bluedroid_disable();
+esp_bluedroid_deinit();
 btStop();
-esp_vhci_host_register_callback(NULL);
  }
 returntrue;
 }
 
-//public
-
-staticuint8_tble_send_cmd(uint16_t cmd, uint8_t * data, uint8_t len){
-staticuint8_t buf[36];
-if(len > 32){
-//too much data
-return2;
- }
-uint16_t i = 0;
-while(!_vhci_host_send_available && i++ < 1000){
-delay(1);
- }
-if(i >= 1000){
-log_e("_vhci_host_send_available failed");
-return1;
- }
-uint8_t outlen = len + HCI_H4_CMD_PREAMBLE_SIZE;
- buf[0] = H4_TYPE_COMMAND;
- buf[1] = (uint8_t)(cmd & 0xFF);
- buf[2] = (uint8_t)(cmd >> 8);
- buf[3] = len;
-if(len){
-memcpy(buf+4, data, len);
- }
- _vhci_host_send_available = false;
- _vhci_host_command_running = true;
- _vhci_host_command = cmd;
-
-//log_printf("BLE: cmd: 0x%04X, data[%u]:", cmd, len);
-//for (uint16_t i=0; i<len; i++) log_printf(" %02x", buf[i+4]);
-//log_printf("\n");
-
-esp_vhci_host_send_packet(buf, outlen);
-while(_vhci_host_command_running);
-int res = _vhci_host_command_result;
-//log_printf("BLE: cmd: 0x%04X, res: %u\n", cmd, res);
-return res;
-}
-
-
 /*
  * BLE Arduino
  *
  * */
 
-enum{
- UNIT_0_625_MS = 625, /* Number of microseconds in 0.625 milliseconds. */
- UNIT_1_25_MS = 1250, /* Number of microseconds in 1.25 milliseconds. */
- UNIT_10_MS = 10000/* Number of microseconds in 10 milliseconds. */
-};
-
-/* BLE Advertising parameters struct */
-typedefstructble_gap_adv_params_s{
-uint8_t type;
-uint8_t own_addr_type;
-uint8_t addr_type;
-uint8_t addr[BD_ADDR_LEN];
-uint8_t fp; // filter policy
-uint16_t interval_min; // minimum advertising interval between 0x0020 and 0x4000 in 0.625 ms units (20ms to 10.24s)
-uint16_t interval_max;
-uint8_t chn_map;
-} ble_adv_params_t;
-
-#defineMSEC_TO_UNITS(TIME, RESOLUTION) (((TIME) * 1000) / (RESOLUTION))
-#defineUINT16_TO_STREAM(p, u16){*(p)++ = (uint8_t)(u16); *(p)++ = (uint8_t)((u16) >> 8)}
-#defineUINT8_TO_STREAM(p, u8){*(p)++ = (uint8_t)(u8)}
-#defineBDADDR_TO_STREAM(p, a){int i; for (i = 0; i < BD_ADDR_LEN; i++) *(p)++ = (uint8_t) a[BD_ADDR_LEN - 1 - i]}
-#defineARRAY_TO_STREAM(p, a, len){int i; for (i = 0; i < len; i++) *(p)++ = (uint8_t) a[i]}
-
 SimpleBLE::SimpleBLE()
 {
-uint8_t peerAddr[BD_ADDR_LEN] ={0x80, 0x81, 0x82, 0x83, 0x84, 0x85};
- _ble_adv_param = (ble_adv_params_t*)malloc(sizeof(ble_adv_params_t));
-memset(_ble_adv_param, 0x00, sizeof(ble_adv_params_t));
- _ble_adv_param->type = BLE_GAP_ADV_TYPE_ADV_NONCONN_IND;//not connectable
- _ble_adv_param->chn_map = GAP_ADVCHAN_ALL; // 37, 38, 39 channels
- _ble_adv_param->fp = 0;//any
- _ble_adv_param->interval_min = 512;
- _ble_adv_param->interval_max = 1024;
- _ble_adv_param->addr_type = 0;//public
-memcpy(_ble_adv_param->addr, peerAddr, BD_ADDR_LEN);
  local_name = "esp32";
 }
 
 SimpleBLE::~SimpleBLE(void)
 {
-free(_ble_adv_param);
-_esp_ble_stop();
+_stop_gap();
 }
 
 boolSimpleBLE::begin(String localName)
 {
-if(!_esp_ble_start()){
-returnfalse;
- }
-ble_send_cmd(HCI_RESET, NULL, 0);
 if(localName.length()){
  local_name = localName;
  }
-_ble_send_adv_param();
-_ble_send_adv_data();
-
-uint8_t adv_enable = 1;
-ble_send_cmd(HCI_BLE_WRITE_ADV_ENABLE, &adv_enable, HCIC_PARAM_SIZE_WRITE_ADV_ENABLE);
-returntrue;
+return_init_gap(local_name.c_str());
 }
 
 voidSimpleBLE::end()
 {
-uint8_t adv_enable = 0;
-ble_send_cmd(HCI_BLE_WRITE_ADV_ENABLE, &adv_enable, HCIC_PARAM_SIZE_WRITE_ADV_ENABLE);
-ble_send_cmd(HCI_RESET, NULL, 0);
-_esp_ble_stop();
-}
-
-voidSimpleBLE::_ble_send_adv_param(void)
-{
-uint8_t dbuf[HCIC_PARAM_SIZE_BLE_WRITE_ADV_PARAMS];
-uint8_t *buf = dbuf;
-UINT16_TO_STREAM (buf, _ble_adv_param->interval_min);
-UINT16_TO_STREAM (buf, _ble_adv_param->interval_max);
-UINT8_TO_STREAM (buf, _ble_adv_param->type);
-UINT8_TO_STREAM (buf, _ble_adv_param->own_addr_type);
-UINT8_TO_STREAM (buf, _ble_adv_param->addr_type);
-ARRAY_TO_STREAM (buf, _ble_adv_param->addr, BD_ADDR_LEN);
-UINT8_TO_STREAM (buf, _ble_adv_param->chn_map);
-UINT8_TO_STREAM (buf, _ble_adv_param->fp);
-ble_send_cmd(HCI_BLE_WRITE_ADV_PARAMS, dbuf, HCIC_PARAM_SIZE_BLE_WRITE_ADV_PARAMS);
-}
-
-voidSimpleBLE::_ble_send_adv_data(void)
-{
-uint8_t adv_data[HCIC_PARAM_SIZE_BLE_WRITE_ADV_DATA + 1] ={
-0x03, 0x02, BT_DATA_FLAGS, BLE_GAP_ADV_FLAGS_LE_ONLY_GENERAL_DISC_MODE
- };
-//zerofill the buffer
-memset(adv_data+4, 0x00, HCIC_PARAM_SIZE_BLE_WRITE_ADV_DATA-4);
-uint8_t adv_data_len = 4;
-
-// Advertising data device local name
-uint8_t name_len = (uint8_t) local_name.length();
- adv_data[adv_data_len++] = name_len + 1;
- adv_data[adv_data_len++] = BT_DATA_NAME_COMPLETE;
-for (int i=0; i<name_len; i++){
- adv_data[adv_data_len++] = (uint8_t) local_name.charAt(i);
- }
-//send data
- adv_data[0] = adv_data_len - 1;
-ble_send_cmd(HCI_BLE_WRITE_ADV_DATA, (uint8_t *)adv_data, HCIC_PARAM_SIZE_BLE_WRITE_ADV_DATA + 1);
+_stop_gap();
 }