Fix advertising data after host reset.

Update examples.

Author: h2zero

examples/NimBLE_Client/NimBLE_Client.ino

@@ -27,9 +27,9 @@ class ClientCallbacks : public NimBLEClientCallbacks {
          *  These settings are 150ms interval, 0 latency, 450ms timout. 
          *  Timeout should be a multiple of the interval, minimum is 100ms.
          *  I find a multiple of 3-5 * the interval works best for quick response/reconnect.
-         *  Min interval: 120 * 1.25ms = 150, Max interval: 120 * 1.25ms = 150, 0 latency, 45 * 10ms = 450ms timeout 
+         *  Min interval: 120 * 1.25ms = 150, Max interval: 120 * 1.25ms = 150, 0 latency, 60 * 10ms = 600ms timeout 
          */
-        pClient->updateConnParams(120,120,0,45);
+        pClient->updateConnParams(120,120,0,60);
     };
 
     void onDisconnect(NimBLEClient* pClient) {
@@ -38,19 +38,23 @@ class ClientCallbacks : public NimBLEClientCallbacks {
         NimBLEDevice::getScan()->start(scanTime, scanEndedCB);
     };
 
-	bool onConnParamsUpdateRequest(NimBLEClient* pClient, const ble_gap_upd_params* params) {
-		if(params->itvl_min < 24) {
-			return false;
-		} else if(params->itvl_max > 40) {
-			return false;
-		} else if(params->latency > 2) {
-			return false;
-		} else if(params->supervision_timeout > 100) {
-			return false;
-		}
+    /** Called when the peripheral requests a change to the connection parameters.
+     *  Return true to accept and apply them or false to reject and keep 
+     *  the currently used parameters. Default will return true.
+     */
+    bool onConnParamsUpdateRequest(NimBLEClient* pClient, const ble_gap_upd_params* params) {
+        if(params->itvl_min < 24) { /** 1.25ms units */
+            return false;
+        } else if(params->itvl_max > 40) { /** 1.25ms units */
+            return false;
+        } else if(params->latency > 2) { /** Number of intervals allowed to skip */
+            return false;
+        } else if(params->supervision_timeout > 100) { /** 10ms units */
+            return false;
+        }
 
-		return true;
-	};
+        return true;
+    };
 
     /********************* Security handled here **********************
     ****** Note: these are the same return values as defaults ********/
@@ -161,9 +165,9 @@ bool connectToServer() {
         /** Set initial connection parameters: These settings are 15ms interval, 0 latency, 120ms timout. 
          *  These settings are safe for 3 clients to connect reliably, can go faster if you have less 
          *  connections. Timeout should be a multiple of the interval, minimum is 100ms.
-         *  Min interval: 12 * 1.25ms = 15, Max interval: 12 * 1.25ms = 15, 0 latency, 12 * 10ms = 120ms timeout 
+         *  Min interval: 12 * 1.25ms = 15, Max interval: 12 * 1.25ms = 15, 0 latency, 51 * 10ms = 510ms timeout 
          */
-        pClient->setConnectionParams(12,12,0,12);
+        pClient->setConnectionParams(12,12,0,51);
         /** Set how long we are willing to wait for the connection to complete (seconds), default is 30. */
         pClient->setConnectTimeout(5);
 
@@ -333,8 +337,8 @@ void setup (){
     //NimBLEDevice::setSecurityAuth(false, false, true); 
     NimBLEDevice::setSecurityAuth(/*BLE_SM_PAIR_AUTHREQ_BOND | BLE_SM_PAIR_AUTHREQ_MITM |*/ BLE_SM_PAIR_AUTHREQ_SC);
 
-    /** Optional: set the transmit power, default is -3db */
-    NimBLEDevice::setPower(ESP_PWR_LVL_P9); /** 12db */
+    /** Optional: set the transmit power, default is 3db */
+    NimBLEDevice::setPower(ESP_PWR_LVL_P9); /** +9db */
 
     /** Optional: set any devices you don't want to get advertisments from */
     // NimBLEDevice::addIgnored(NimBLEAddress ("aa:bb:cc:dd:ee:ff")); 
@@ -346,8 +350,8 @@ void setup (){
     pScan->setAdvertisedDeviceCallbacks(new AdvertisedDeviceCallbacks());
 
     /** Set scan interval (how often) and window (how long) in milliseconds */
-    pScan->setInterval(400);
-    pScan->setWindow(100);
+    pScan->setInterval(45);
+    pScan->setWindow(15);
 
     /** Active scan will gather scan response data from advertisers
      *  but will use more energy from both devices

examples/NimBLE_Server/NimBLE_Server.ino

@@ -142,6 +142,9 @@ void setup() {
     /** sets device name */
     NimBLEDevice::init("NimBLE-Arduino");
 
+    /** Optional: set the transmit power, default is 3db */
+    NimBLEDevice::setPower(ESP_PWR_LVL_P9); /** +9db */
+    
     /** Set the IO capabilities of the device, each option will trigger a different pairing method.
      *  BLE_HS_IO_DISPLAY_ONLY    - Passkey pairing
      *  BLE_HS_IO_DISPLAY_YESNO   - Numeric comparison pairing

src/NimBLEAdvertising.cpp

@@ -34,43 +34,12 @@ NimBLEAdvertising::NimBLEAdvertising() {
 	memset(&m_scanData, 0, sizeof m_scanData);
 	memset(&m_advParams, 0, sizeof m_advParams);
     const char *name = ble_svc_gap_device_name();
-	/*
-	int pwr;
-	switch(esp_ble_tx_power_get(ESP_BLE_PWR_TYPE_DEFAULT)) {
-		case ESP_PWR_LVL_N12:
-			pwr = -12;
-			break;
-		case ESP_PWR_LVL_N9:
-			pwr = -9;
-			break;
-		case ESP_PWR_LVL_N6:
-			pwr = -6;
-			break;
-		case ESP_PWR_LVL_N3:
-			pwr = -6;
-			break;
-		case ESP_PWR_LVL_N0:
-			pwr = 0;
-			break;
-		case ESP_PWR_LVL_P3:
-			pwr = 3;
-			break;
-		case ESP_PWR_LVL_P6:
-			pwr = 6;
-			break;
-		case ESP_PWR_LVL_P9:
-			pwr = 9;
-			break;
-		default:
-			pwr = BLE_HS_ADV_TX_PWR_LVL_AUTO;
-			break;
-	}
-   */ 
+
 	m_advData.name                   = (uint8_t *)name;
     m_advData.name_len               = strlen(name);
     m_advData.name_is_complete       = 1;
     m_scanData.tx_pwr_lvl_is_present = 1;
-    m_scanData.tx_pwr_lvl            = NimBLEDevice::getPower(ESP_BLE_PWR_TYPE_DEFAULT);//pwr;
+    m_scanData.tx_pwr_lvl            = NimBLEDevice::getPower();
     m_advData.flags                  = (BLE_HS_ADV_F_DISC_GEN | BLE_HS_ADV_F_BREDR_UNSUP);
 	m_advData.appearance             = 0;
 	m_advData.appearance_is_present  = 0;
@@ -259,11 +228,6 @@ void NimBLEAdvertising::start() {
                             &m_serviceUUIDs[i].getNative()->u16.value, sizeof(uint16_t));
 
                 m_advData.uuids16[m_advData.num_uuids16].u.type = BLE_UUID_TYPE_16;
-      /*          
-				char buf[BLE_UUID_STR_LEN];
-				ble_uuid_to_str(&m_advData.uuids16[m_advData.num_uuids16].u, buf);
-				NIMBLE_LOGI(LOG_TAG, "Advertising UUID: %s", buf);
-      */         
                 m_advData.uuids16_is_complete = 1;
                 m_advData.num_uuids16++;
 			}
@@ -284,12 +248,7 @@ void NimBLEAdvertising::start() {
                 memcpy(&m_advData.uuids32[m_advData.num_uuids32].value, 
                             &m_serviceUUIDs[i].getNative()->u32.value, sizeof(uint32_t));
 
-                m_advData.uuids32[m_advData.num_uuids32].u.type = BLE_UUID_TYPE_32;
-      /*           
-				char buf[BLE_UUID_STR_LEN];
-				ble_uuid_to_str(&m_advData.uuids32[m_advData.num_uuids32].u, buf);
-				NIMBLE_LOGI(LOG_TAG, "Advertising UUID: %s", buf);
-      */         
+                m_advData.uuids32[m_advData.num_uuids32].u.type = BLE_UUID_TYPE_32;     
                 m_advData.uuids32_is_complete = 1;
                 m_advData.num_uuids32++;
 			}
@@ -309,12 +268,7 @@ void NimBLEAdvertising::start() {
                 memcpy(&m_advData.uuids128[m_advData.num_uuids128].value, 
                             &m_serviceUUIDs[i].getNative()->u128.value, 16);
 
-                m_advData.uuids128[m_advData.num_uuids128].u.type = BLE_UUID_TYPE_128;
-      /*          
-				char buf[BLE_UUID_STR_LEN];
-				ble_uuid_to_str(&m_advData.uuids128[m_advData.num_uuids128].u, buf);
-				NIMBLE_LOGI(LOG_TAG, "Advertising UUID: %s", buf);
-      */         
+                m_advData.uuids128[m_advData.num_uuids128].u.type = BLE_UUID_TYPE_128; 
                 m_advData.uuids128_is_complete = 1;
                 m_advData.num_uuids128++;
 			}
@@ -362,7 +316,7 @@ void NimBLEAdvertising::start() {
 		// throw the tx power data into the advertisment
         } else if (payloadLen < 29) {
 			m_advData.tx_pwr_lvl_is_present = 1;
-			m_advData.tx_pwr_lvl = BLE_HS_ADV_TX_PWR_LVL_AUTO;
+			m_advData.tx_pwr_lvl = NimBLEDevice::getPower();
 		}
 
         rc = ble_gap_adv_set_fields(&m_advData);
@@ -425,11 +379,15 @@ void NimBLEAdvertising::stop() {
 	NIMBLE_LOGD(LOG_TAG, "<< stop");
 } // stop
 
-/*
+
+/**
+ * Host reset seems to clear advertising data, 
+ * we need clear the flag so it reloads it.
+ */ 
 void NimBLEAdvertising::onHostReset() {
- //   m_advSvcsSet = false;
+    m_advSvcsSet = false;
 }
- */   
+  
 
 /**
  * @brief Add data to the payload to be advertised.

src/NimBLEAdvertising.h

@@ -90,7 +90,7 @@ class NimBLEAdvertising {
 
 private:
     friend class NimBLEDevice;
-   // void                 onHostReset();
+    void                 onHostReset();
 	ble_hs_adv_fields    m_advData;
 	ble_hs_adv_fields    m_scanData;
 	ble_gap_adv_params   m_advParams;

src/NimBLEDevice.cpp

@@ -351,11 +351,11 @@ void NimBLEDevice::stopAdvertising() {
     for(auto it = m_cList.cbegin(); it != m_cList.cend(); ++it) {
         (*it)->onHostReset();
     }
-    
+*/    
     if(m_bleAdvertising != nullptr) {
         m_bleAdvertising->onHostReset();
     }
-*/    
+    
     NIMBLE_LOGC(LOG_TAG, "Resetting state; reason=%d, %s", reason, 
                         NimBLEUtils::returnCodeToString(reason));
 } // onReset

src/NimBLEDevice.h

@@ -86,7 +86,7 @@ class NimBLEDevice {
 	static NimBLEServer*    createServer();
     static bool             deleteClient(NimBLEClient* pClient);
     static void             setPower(esp_power_level_t powerLevel);
-	static int              getPower(esp_ble_power_type_t powerType);
+	static int              getPower(esp_ble_power_type_t powerType=ESP_BLE_PWR_TYPE_DEFAULT);
     static void             setCustomGapHandler(gap_event_handler handler);
     static void             setSecurityAuth(bool bonding, bool mitm, bool sc);
     static void             setSecurityAuth(uint8_t auth_req);