20190916 - connect would use resolved address as preference and remove now redundant _remote_address

Author: Victor Tchistiak

libraries/BluetoothSerial/examples/SerialToSerialBTM/SerialToSerialBTM.ino

@@ -14,6 +14,7 @@ BluetoothSerial SerialBT;
 
 String MACadd = "AA:BB:CC:11:22:33";
 uint8_t address[6]  = {0xAA, 0xBB, 0xCC, 0x11, 0x22, 0x33};
+//uint8_t address[6]  = {0x00, 0x1D, 0xA5, 0x02, 0xC3, 0x22};
 String name = "OBDII";
 char *pin = "1234"; //<- standard pin would be provided by default
 
@@ -25,7 +26,11 @@ void setup() {
   Serial.println("The device started in master mode, make sure remote BT device is on!");
   //delay(2000);
   SerialBT.connect(address); 
-  //SerialBT.connect(name);
+  //SerialBT.connect(name); //slow as it needs to resolve name to address first, but allows to connect to different devices with the same name
+  while(!SerialBT.connected()) {delay(1000); }
+  SerialBT.disconnect();
+  while(SerialBT.connected()) {delay(1000); }
+  SerialBT.connect();
 }
 
 void loop() {

libraries/BluetoothSerial/src/BluetoothSerial.cpp

@@ -669,7 +669,8 @@ bool BluetoothSerial::connect(String remoteName)
     strncpy(_remote_name, remoteName.c_str(), ESP_BT_GAP_MAX_BDNAME_LEN);
     _remote_name[ESP_BT_GAP_MAX_BDNAME_LEN] = 0;
     log_i("master : remoteName");
-    return (esp_bt_gap_start_discovery(inq_mode, inq_len, inq_num_rsps) == ESP_OK);
+    // will first resolve name to address
+    return (esp_bt_gap_start_discovery(inq_mode, inq_len, inq_num_rsps) == ESP_OK); 
 }
 
 bool BluetoothSerial::connect(uint8_t remoteAddress[])
@@ -681,30 +682,32 @@ bool BluetoothSerial::connect(uint8_t remoteAddress[])
     }
     _remote_name[0] = 0;
     _isRemoteAddressSet = true;
-    memcpy(_remote_address, remoteAddress, ESP_BD_ADDR_LEN);
-    memcpy(_peer_bd_addr, _remote_address, ESP_BD_ADDR_LEN);
+    memcpy(_peer_bd_addr, remoteAddress, ESP_BD_ADDR_LEN);
     log_i("master : remoteAddress");
     return ( esp_spp_start_discovery(_peer_bd_addr) == ESP_OK);
 }
 
 bool BluetoothSerial::connect()
 {
     if (!isReady(true)) return false;
-    if (_remote_name[0]) {
-        log_i("master : remoteName");
-        return (esp_bt_gap_start_discovery(inq_mode, inq_len, inq_num_rsps) == ESP_OK);
-    } else if (_isRemoteAddressSet){
+    if (_isRemoteAddressSet){
+        // use resolved or set address first
         log_i("master : remoteAddress");
-        memcpy(_peer_bd_addr, _remote_address, ESP_BD_ADDR_LEN);
         return (esp_spp_start_discovery(_peer_bd_addr) == ESP_OK);
-    } else {
+    } else if (_remote_name[0]) {
+        log_i("master : remoteName");
+        // will resolve name to address first - it may take a while
+        return (esp_bt_gap_start_discovery(inq_mode, inq_len, inq_num_rsps) == ESP_OK);
+    } else  {
         log_e("Neither Remote name nor address was provided");
     }
     return false;           
 }
 
 bool BluetoothSerial::disconnect() {
     if (_spp_client) {
+        flush();
+        log_i("disconnecting");
         return (esp_spp_disconnect(_spp_client) == ESP_OK);
     }
     return false;