1. Fix ADV data error when disable the debug trace.

sgbihu · sgbihu · commit 6888c52e02d9 · 2016-07-29T14:32:20.000+08:00
2. Modify some debug trace.
3. Change the pr_debug with Serial in sketch example.
diff --git a/libraries/CurieBLE/examples/IMUBleCentral/IMUBleCentral.ino b/libraries/CurieBLE/examples/IMUBleCentral/IMUBleCentral.ino
@@ -77,7 +77,10 @@ bool adv_found(uint8_t type,
     bt_addr_le_t *addr = (bt_addr_le_t *)user_data;
     int i;
 
-    pr_debug(LOG_MODULE_APP, "[AD]: %u data_len %u\n", type, data_len);
+    Serial.print("[AD]:");
+    Serial.print(type);
+    Serial.print(" data_len ");
+    Serial.println(data_len);
 
     switch (type)
     {
@@ -86,7 +89,7 @@ bool adv_found(uint8_t type,
         {
             if (data_len % MAX_UUID_SIZE != 0) 
             {
-                pr_debug(LOG_MODULE_APP, "AD malformed\n");
+                Serial.println("AD malformed");
                 return true;
             }
             struct bt_uuid * serviceuuid = bleImuService.uuid();
@@ -100,10 +103,10 @@ bool adv_found(uint8_t type,
                 // Accept the advertisement
                 if (!bleCentral.stopScan()) 
                 {
-                    pr_debug(LOG_MODULE_APP, "Stop LE scan failed\n");
+                    Serial.println("Stop LE scan failed");
                     continue;
                 }
-                pr_debug(LOG_MODULE_APP, "Connecting\n");
+                Serial.println("Connecting");
                 // Connect to peripheral
                 bleCentral.connect(addr, &conn_param);
                 return false;
diff --git a/libraries/CurieBLE/examples/LEDCentral/LEDCentral.ino b/libraries/CurieBLE/examples/LEDCentral/LEDCentral.ino
@@ -75,7 +75,10 @@ bool adv_found(uint8_t type,
     bt_addr_le_t *addr = (bt_addr_le_t *)user_data;
     int i;
 
-    pr_debug(LOG_MODULE_APP, "[AD]: %u data_len %u\n", type, data_len);
+    Serial.print("[AD]:");
+    Serial.print(type);
+    Serial.print(" data_len ");
+    Serial.println(data_len);
 
     switch (type)
     {
@@ -84,7 +87,7 @@ bool adv_found(uint8_t type,
         {
             if (data_len % MAX_UUID_SIZE != 0) 
             {
-                pr_debug(LOG_MODULE_APP, "AD malformed\n");
+                Serial.println("AD malformed");
                 return true;
             }
             struct bt_uuid * serviceuuid = ledService.uuid();
@@ -98,10 +101,10 @@ bool adv_found(uint8_t type,
                 // Accept the advertisement
                 if (!bleCentral.stopScan()) 
                 {
-                    pr_debug(LOG_MODULE_APP, "Stop LE scan failed\n");
+                    Serial.println("Stop LE scan failed");
                     continue;
                 }
-                pr_debug(LOG_MODULE_APP, "Connecting\n");
+                Serial.println("Connecting");
                 // Connect to peripheral
                 bleCentral.connect(addr, &conn_param);
                 return false;
diff --git a/libraries/CurieBLE/src/BLEPeripheralRole.cpp b/libraries/CurieBLE/src/BLEPeripheralRole.cpp
@@ -64,6 +64,7 @@ bool BLEPeripheralRole::begin()
     
     // Register profile
     _peripheral.registerProfile();
+    delay(2); // Temp solution for send data fast will makes ADV data set failed
     return true;
 }
 
@@ -221,7 +222,7 @@ void BLEPeripheralRole::handleDisconnectEvent(struct bt_conn *conn, uint8_t reas
     struct bt_conn *central_conn = bt_conn_lookup_addr_le(_central.bt_le_address());
     if (conn == central_conn)
     {
-        pr_info(LOG_MODULE_BLE, "Disconnect reason: %d", reason);
+        pr_info(LOG_MODULE_BLE, "Peripheral Disconnect reason: %d", reason);
         if (_event_handlers[BLEDisconnected])
             _event_handlers[BLEDisconnected](_central);
     }

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,10 @@ bool adv_found(uint8_t type,`
`77`	`77`	`bt_addr_le_t addr = (bt_addr_le_t )user_data;`
`78`	`78`	`int i;`
`79`	`79`
`80`		`- pr_debug(LOG_MODULE_APP, "[AD]: %u data_len %u\n", type, data_len);`
	`80`	`+ Serial.print("[AD]:");`
	`81`	`+ Serial.print(type);`
	`82`	`+ Serial.print(" data_len ");`
	`83`	`+ Serial.println(data_len);`
`81`	`84`
`82`	`85`	`switch (type)`
`83`	`86`	`{`
`@@ -86,7 +89,7 @@ bool adv_found(uint8_t type,`
`86`	`89`	`{`
`87`	`90`	`if (data_len % MAX_UUID_SIZE != 0)`
`88`	`91`	`{`
`89`		`- pr_debug(LOG_MODULE_APP, "AD malformed\n");`
	`92`	`+ Serial.println("AD malformed");`
`90`	`93`	`return true;`
`91`	`94`	`}`
`92`	`95`	`struct bt_uuid * serviceuuid = bleImuService.uuid();`
`@@ -100,10 +103,10 @@ bool adv_found(uint8_t type,`
`100`	`103`	`// Accept the advertisement`
`101`	`104`	`if (!bleCentral.stopScan())`
`102`	`105`	`{`
`103`		`- pr_debug(LOG_MODULE_APP, "Stop LE scan failed\n");`
	`106`	`+ Serial.println("Stop LE scan failed");`
`104`	`107`	`continue;`
`105`	`108`	`}`
`106`		`- pr_debug(LOG_MODULE_APP, "Connecting\n");`
	`109`	`+ Serial.println("Connecting");`
`107`	`110`	`// Connect to peripheral`
`108`	`111`	`bleCentral.connect(addr, &conn_param);`
`109`	`112`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,10 @@ bool adv_found(uint8_t type,`
`75`	`75`	`bt_addr_le_t addr = (bt_addr_le_t )user_data;`
`76`	`76`	`int i;`
`77`	`77`
`78`		`- pr_debug(LOG_MODULE_APP, "[AD]: %u data_len %u\n", type, data_len);`
	`78`	`+ Serial.print("[AD]:");`
	`79`	`+ Serial.print(type);`
	`80`	`+ Serial.print(" data_len ");`
	`81`	`+ Serial.println(data_len);`
`79`	`82`
`80`	`83`	`switch (type)`
`81`	`84`	`{`
`@@ -84,7 +87,7 @@ bool adv_found(uint8_t type,`
`84`	`87`	`{`
`85`	`88`	`if (data_len % MAX_UUID_SIZE != 0)`
`86`	`89`	`{`
`87`		`- pr_debug(LOG_MODULE_APP, "AD malformed\n");`
	`90`	`+ Serial.println("AD malformed");`
`88`	`91`	`return true;`
`89`	`92`	`}`
`90`	`93`	`struct bt_uuid * serviceuuid = ledService.uuid();`
`@@ -98,10 +101,10 @@ bool adv_found(uint8_t type,`
`98`	`101`	`// Accept the advertisement`
`99`	`102`	`if (!bleCentral.stopScan())`
`100`	`103`	`{`
`101`		`- pr_debug(LOG_MODULE_APP, "Stop LE scan failed\n");`
	`104`	`+ Serial.println("Stop LE scan failed");`
`102`	`105`	`continue;`
`103`	`106`	`}`
`104`		`- pr_debug(LOG_MODULE_APP, "Connecting\n");`
	`107`	`+ Serial.println("Connecting");`
`105`	`108`	`// Connect to peripheral`
`106`	`109`	`bleCentral.connect(addr, &conn_param);`
`107`	`110`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ bool BLEPeripheralRole::begin()`
`64`	`64`
`65`	`65`	`// Register profile`
`66`	`66`	`_peripheral.registerProfile();`
	`67`	`+ delay(2); // Temp solution for send data fast will makes ADV data set failed`
`67`	`68`	`return true;`
`68`	`69`	`}`
`69`	`70`
`@@ -221,7 +222,7 @@ void BLEPeripheralRole::handleDisconnectEvent(struct bt_conn *conn, uint8_t reas`
`221`	`222`	`struct bt_conn *central_conn = bt_conn_lookup_addr_le(_central.bt_le_address());`
`222`	`223`	`if (conn == central_conn)`
`223`	`224`	`{`
`224`		`- pr_info(LOG_MODULE_BLE, "Disconnect reason: %d", reason);`
	`225`	`+ pr_info(LOG_MODULE_BLE, "Peripheral Disconnect reason: %d", reason);`
`225`	`226`	`if (_event_handlers[BLEDisconnected])`
`226`	`227`	`_event_handlers[BLEDisconnected](_central);`
`227`	`228`	`}`