Correct previous commit error for Jira 896

Commit error:
  Committed files contained code mods for another ticket in
addition to the those for Jira 896.

Author: SidLeung

libraries/CurieBLE/src/BLEDevice.cpp

@@ -247,38 +247,22 @@ bool BLEDevice::startScan(bool withDuplicates)
     }
     else
     {
-        return BLEDeviceManager::instance()->startScanning();
+        return BLEDeviceManager::instance()->startScanningNewPeripherals();
     }
 }
 
-
-void BLEDevice::scan()
-{
-    scan(false);
-}
-
 void BLEDevice::scan(bool withDuplicates)
 {
     BLEDeviceManager::instance()->clearAdvertiseCritical();
     startScan(withDuplicates);
 }
 
-void BLEDevice::scanForName(String name)
-{
-    scanForName(name, false);
-}
-
 void BLEDevice::scanForName(String name, bool withDuplicates)
 {
     BLEDeviceManager::instance()->setAdvertiseCritical(name);
     startScan(withDuplicates);
 }
 
-void BLEDevice::scanForUuid(String uuid)
-{
-    scanForUuid(uuid, false);
-}
-
 void BLEDevice::scanForUuid(String uuid, bool withDuplicates)
 {
     BLEService service_temp(uuid.c_str());

libraries/CurieBLE/src/BLEDevice.h

@@ -361,83 +361,70 @@ class BLEDevice
     //void scanForAddress(String address); // Not include in baseline. Add here as feature for feature release.
 
     /**
-     * @brief   Start scanning for peripherals without filter
+     * @brief   Start scanning for peripherals with the option of accepting all detectable
+     *          Peripherals or just the newly detected.
      *
-     * @param   none
-     *
-     * @return  none
-     *
-     * @note  none
-     */
-    void scan();
-    
-    /**
-     * @brief   Start scanning for peripherals with filter
-     *
-     * @param[in] withDuplicates        true - with duplicate filter
-     *                                  false- without duplicate filter
-     *
-     * @return  none
-     *
-     * @note  option to filter out duplicate addresses for Arduino.
-     *          The current only support fileter duplicate mode.
-     */
-    void scan(bool withDuplicates);
-    
-    /**
-     * @brief   Start scanning for peripherals and filter by device name in ADV
-     *
-     * @param   name    The device's local name.
+     * @param[in] withDuplicates        true - return all detectable Peripherals.
+     *                                  false- return only new Peripherals.
      *
      * @return  none
      *
-     * @note   option to filter out duplicate addresses for Arduino.
-     *          The current only support fileter duplicate mode.
+     * @note  When, withDuplicates = true (default), accept all detectable Peripherals.
+     *        No Peripheral filtering process applied to the scan result.
      */
-    void scanForName(String name);
+    void scan(bool withDuplicates = true);
 
     /**
-     * @brief   Start scanning for peripherals and filter by device name in ADV
+     * @brief   Start scanning for peripherals and filter by device name in ADV and
+     *          the option of accepting all detectable Peripherals or just the
+     *          newly detected.
      *
      * @param[in]   name    The device's local name.
      *
-     * @param[in]   withDuplicates      true - with duplicate filter
-     *                                  false- without duplicate filter
+     * @param[in]   withDuplicates      true - return all detectable Peripherals.
+     *                                  false- return only new Peripherals.
      *
      * @return  none
      *
-     * @note   option to filter out duplicate addresses for Arduino.
-     *          The current only support fileter duplicate mode.
+     * @note   When, withDuplicates = true (default), accept all detectable Peripherals.
+     *        No Peripheral filtering process applied to the scan result.
      */
-    void scanForName(String name, bool withDuplicates);
+    void scanForName(String name, bool withDuplicates = true);
 
     /**
-     * @brief   Start scanning for peripherals and filter by service in ADV
+     * @brief   Start scanning for peripherals and filter by service in ADV and
+     *          the option of accepting all detectable Peripherals or just the
+     *          newly detected.
      *
-     * @param   service    The service
+     * @param[in]   service    The service
+     *
+     * @param[in]   withDuplicates      true - return all detectable Peripherals.
+     *                                  false- return only new Peripherals.
      *
      * @return  none
      *
-     * @note  none
+     * @note   When, withDuplicates = true (default), accept all detectable Peripherals.
+     *        No Peripheral filtering process applied to the scan result.
      */
-    void scanForUuid(String uuid);
+    void scanForUuid(String uuid, bool withDuplicates = true);
 
     /**
-     * @brief   Start scanning for peripherals and filter by service in ADV
+     * @brief   Start scanning for peripherals and filter by MAC address and
+     *          the option of accepting all detectable Peripherals or just the
+     *          newly detected.
      *
-     * @param[in]   service    The service
+     * @param[in]   macaddr     The Peripheral MAC address
      *
-     * @param[in]   withDuplicates      true - with duplicate filter
-     *                                  false- without duplicate filter
+     * @param[in]   withDuplicates      true - return all detectable Peripherals.
+     *                                  false- return only new Peripherals.
      *
      * @return  none
      *
-     * @note   option to filter out duplicate addresses for Arduino.
-     *          The current only support fileter duplicate mode.
+     * @note   When, withDuplicates = true (default), accept all detectable Peripherals.
+     *        No Peripheral filtering process applied to the scan result.
      */
-    void scanForUuid(String uuid, bool withDuplicates);
-    
     void scanForAddress(String macaddr, bool withDuplicates = true);
+
     /**
      * @brief   Stop scanning for peripherals
      *
@@ -679,15 +666,15 @@ class BLEDevice
     void preCheckProfile();
 
     /**
-     * @brief   Start scanning for peripherals with/without duplicate filter
+     * @brief   Start scanning for peripherals with the option of accepting all
+     *          detectable Peripherals or just the newly detected.
      *
      * @param[in] withDuplicates        true - with duplicate filter
      *                                  false- without duplicate filter
      *
      * @return  none
      *
-     * @note  option to filter out duplicate addresses for Arduino.
-     *          The current only support fileter duplicate mode.
+     * @note  When, withDuplicates = true (default), accept all detectable Peripherals.
      */
     bool startScan(bool withDuplicates);
 

libraries/CurieBLE/src/internal/BLEDeviceManager.cpp

@@ -576,10 +576,13 @@ BLEDevice BLEDeviceManager::peripheral()
     return temp;
 }
 
-bool BLEDeviceManager::startScanning()
+bool BLEDeviceManager::startScanningWithDuplicates()
 {
     _adv_duplicate_filter_enabled = false;
     _scan_param.filter_dup   = BT_HCI_LE_SCAN_FILTER_DUP_ENABLE;
+
+    _clearAdvertiseBuffer();
+    
     int err = bt_le_scan_start(&_scan_param, ble_central_device_found);
     if (err)
     {
@@ -589,11 +592,13 @@ bool BLEDeviceManager::startScanning()
     return true;
 }
 
-bool BLEDeviceManager::startScanningWithDuplicates()
+bool BLEDeviceManager::startScanningNewPeripherals()
 {
     _adv_duplicate_filter_enabled = true;
     memset(_peer_duplicate_address_buffer, 0, sizeof(_peer_duplicate_address_buffer));
     _duplicate_filter_header = _duplicate_filter_tail = 0;
+
+    _clearAdvertiseBuffer();
 
     _scan_param.filter_dup   = BT_HCI_LE_SCAN_FILTER_DUP_ENABLE;
     int err = bt_le_scan_start(&_scan_param, ble_central_device_found);
@@ -1074,8 +1079,8 @@ bool BLEDeviceManager::connect(BLEDevice &device)
     _wait_for_connect_peripheral_adv_data_len = _available_for_connect_peripheral_adv_data_len;
     _wait_for_connect_peripheral_scan_rsp_data_len = _available_for_connect_peripheral_scan_rsp_data_len;
     _wait_for_connect_peripheral_adv_rssi = _available_for_connect_peripheral_adv_rssi;
-            
-    startScanning();
+
+    startScanningWithDuplicates();
 
     pr_debug(LOG_MODULE_BLE, "%s-%d", __FUNCTION__, __LINE__);
     // Wait for the connection

libraries/CurieBLE/src/internal/BLEDeviceManager.h

@@ -310,7 +310,7 @@ class BLEDeviceManager
     void setAdvertiseCritical(String name);
     void setAdvertiseCritical(BLEService& service);
     void setAdvertiseCritical(const char* macaddress);
-    bool startScanning(); // start scanning for peripherals
+    bool startScanningNewPeripherals(); // start scanning for new peripherals, don't report the detected ones
     bool startScanningWithDuplicates(); // start scanning for peripherals, and report all duplicates
     bool stopScanning(); // stop scanning for peripherals