Bluefruit.setName() from example to use default board name from USB_PRODUCT

hathach · hathach · commit 10f51fbc1bae · 2021-06-04T16:18:55.000+07:00
diff --git a/libraries/Bluefruit52Lib/examples/DualRoles/dual_bleuart/dual_bleuart.ino b/libraries/Bluefruit52Lib/examples/DualRoles/dual_bleuart/dual_bleuart.ino
@@ -42,7 +42,6 @@ void setup()
   // SRAM usage required by SoftDevice will increase with number of connections
   Bluefruit.begin(1, 1);
   Bluefruit.setTxPower(4);    // Check bluefruit.h for supported values
-  Bluefruit.setName("Bluefruit52 duo");
 
   // Callbacks for Peripheral
   Bluefruit.Periph.setConnectCallback(prph_connect_callback);
diff --git a/libraries/Bluefruit52Lib/examples/Peripheral/StandardFirmataBLE/StandardFirmataBLE.ino b/libraries/Bluefruit52Lib/examples/Peripheral/StandardFirmataBLE/StandardFirmataBLE.ino
@@ -790,7 +790,6 @@ void setup()
   Bluefruit.configPrphBandwidth(BANDWIDTH_MAX);
   
   Bluefruit.begin();
-  Bluefruit.setName("Bluefruit52");
   Bluefruit.setTxPower(4);    // Check bluefruit.h for supported values
   
   // try to go as fast as possible, could be rejected by some central, increase it if needed
diff --git a/libraries/Bluefruit52Lib/examples/Peripheral/adv_AdafruitColor/adv_AdafruitColor.ino b/libraries/Bluefruit52Lib/examples/Peripheral/adv_AdafruitColor/adv_AdafruitColor.ino
@@ -40,8 +40,8 @@ char nibble_to_hex(uint8_t nibble) {  // convert a 4-bit nibble to a hexadecimal
 
 void setup() 
 {
-  Serial.begin(115200);
-  while ( !Serial ) delay(10);   // for nrf52840 with native usb
+//  Serial.begin(115200);
+//  while ( !Serial ) delay(10);
 
   Serial.println("Bluefruit52 Color Advertising Example");
   Serial.println("----------------------------------------\n");
diff --git a/libraries/Bluefruit52Lib/examples/Peripheral/adv_advanced/adv_advanced.ino b/libraries/Bluefruit52Lib/examples/Peripheral/adv_advanced/adv_advanced.ino
@@ -36,7 +36,6 @@ void setup()
 
   Bluefruit.begin();
   Bluefruit.setTxPower(4);    // Check bluefruit.h for supported values
-  Bluefruit.setName("Bluefruit52");
 
   // Set up and start advertising
   startAdv();
diff --git a/libraries/Bluefruit52Lib/examples/Peripheral/beacon/beacon.ino b/libraries/Bluefruit52Lib/examples/Peripheral/beacon/beacon.ino
@@ -48,7 +48,6 @@ void setup()
   // off Blue LED for lowest power consumption
   Bluefruit.autoConnLed(false);
   Bluefruit.setTxPower(0);    // Check bluefruit.h for supported values
-  Bluefruit.setName("Bluefruit52");
 
   // Manufacturer ID is required for Manufacturer Specific Data
   beacon.setManufacturer(MANUFACTURER_ID);
diff --git a/libraries/Bluefruit52Lib/examples/Peripheral/blemidi/blemidi.ino b/libraries/Bluefruit52Lib/examples/Peripheral/blemidi/blemidi.ino
@@ -50,7 +50,6 @@ void setup()
   Bluefruit.configPrphBandwidth(BANDWIDTH_MAX);  
 
   Bluefruit.begin();
-  Bluefruit.setName("Bluefruit52 MIDI");
   Bluefruit.setTxPower(4);    // Check bluefruit.h for supported values
 
   // Setup the on board blue LED to be enabled on CONNECT
diff --git a/libraries/Bluefruit52Lib/examples/Peripheral/bleuart/bleuart.ino b/libraries/Bluefruit52Lib/examples/Peripheral/bleuart/bleuart.ino
@@ -45,7 +45,6 @@ void setup()
 
   Bluefruit.begin();
   Bluefruit.setTxPower(4);    // Check bluefruit.h for supported values
-  Bluefruit.setName("Bluefruit52");
   //Bluefruit.setName(getMcuUniqueID()); // useful testing with multiple central connections
   Bluefruit.Periph.setConnectCallback(connect_callback);
   Bluefruit.Periph.setDisconnectCallback(disconnect_callback);
diff --git a/libraries/Bluefruit52Lib/examples/Peripheral/bleuart_multi/bleuart_multi.ino b/libraries/Bluefruit52Lib/examples/Peripheral/bleuart_multi/bleuart_multi.ino
@@ -37,7 +37,7 @@ void setup()
   // Initialize Bluefruit with max concurrent connections as Peripheral = 2, Central = 0
   Bluefruit.begin(MAX_PRPH_CONNECTION, 0);
   Bluefruit.setTxPower(4);    // Check bluefruit.h for supported values
-  Bluefruit.setName("Bluefruit52");
+
   Bluefruit.Periph.setConnectCallback(connect_callback);
   Bluefruit.Periph.setDisconnectCallback(disconnect_callback);
 
diff --git a/libraries/Bluefruit52Lib/examples/Peripheral/blinky_ota/blinky_ota.ino b/libraries/Bluefruit52Lib/examples/Peripheral/blinky_ota/blinky_ota.ino
@@ -27,7 +27,6 @@ void setup()
 
   Bluefruit.begin();
   Bluefruit.setTxPower(4);    // Check bluefruit.h for supported values
-  Bluefruit.setName("Bluefruit52");
 
   // To be consistent OTA DFU should be added first if it exists
   bledfu.begin();
diff --git a/libraries/Bluefruit52Lib/examples/Peripheral/bluefruit_playground/bluefruit_playground.ino b/libraries/Bluefruit52Lib/examples/Peripheral/bluefruit_playground/bluefruit_playground.ino
@@ -331,7 +331,6 @@ void setup()
   Bluefruit.begin();
   Bluefruit.setTxPower(8);    // Check bluefruit.h for supported values
   Bluefruit.setName(DEVICE_NAME);
-  //Bluefruit.setName(getMcuUniqueID()); // useful testing with multiple central connections
   Bluefruit.Periph.setConnectCallback(connect_callback);
   Bluefruit.Periph.setDisconnectCallback(disconnect_callback);
 
diff --git a/libraries/Bluefruit52Lib/examples/Peripheral/controller/controller.ino b/libraries/Bluefruit52Lib/examples/Peripheral/controller/controller.ino
@@ -38,7 +38,6 @@ void setup(void)
 
   Bluefruit.begin();
   Bluefruit.setTxPower(4);    // Check bluefruit.h for supported values
-  Bluefruit.setName("Bluefruit52");
 
   // To be consistent OTA DFU should be added first if it exists
   bledfu.begin();
diff --git a/libraries/Bluefruit52Lib/examples/Peripheral/custom_hrm/custom_hrm.ino b/libraries/Bluefruit52Lib/examples/Peripheral/custom_hrm/custom_hrm.ino
@@ -39,10 +39,6 @@ void setup()
   Serial.println("Initialise the Bluefruit nRF52 module");
   Bluefruit.begin();
 
-  // Set the advertised device name (keep it short!)
-  Serial.println("Setting Device Name to 'Feather52 HRM'");
-  Bluefruit.setName("Bluefruit52 HRM");
-
   // Set the connect/disconnect callback handlers
   Bluefruit.Periph.setConnectCallback(connect_callback);
   Bluefruit.Periph.setDisconnectCallback(disconnect_callback);
diff --git a/libraries/Bluefruit52Lib/examples/Peripheral/custom_htm/custom_htm.ino b/libraries/Bluefruit52Lib/examples/Peripheral/custom_htm/custom_htm.ino
@@ -42,7 +42,6 @@ void setup()
   // Initialise the Bluefruit module
   Serial.println("Initialise the Bluefruit nRF52 module");
   Bluefruit.begin();
-  Bluefruit.setName("Bluefruit52");
 
   // Set the connect/disconnect callback handlers
   Bluefruit.Periph.setConnectCallback(connect_callback);
diff --git a/libraries/Bluefruit52Lib/examples/Peripheral/eddystone_url/eddystone_url.ino b/libraries/Bluefruit52Lib/examples/Peripheral/eddystone_url/eddystone_url.ino
@@ -28,7 +28,6 @@ void setup()
 
   Bluefruit.begin();
   Bluefruit.setTxPower(4);    // Check bluefruit.h for supported values
-  Bluefruit.setName("Bluefruit52");
 
   // Setup the advertising packet
   startAdv();
diff --git a/libraries/Bluefruit52Lib/examples/Peripheral/hid_camerashutter/hid_camerashutter.ino b/libraries/Bluefruit52Lib/examples/Peripheral/hid_camerashutter/hid_camerashutter.ino
@@ -49,7 +49,6 @@ void setup()
 
   Bluefruit.begin();
   Bluefruit.setTxPower(4);    // Check bluefruit.h for supported values
-  Bluefruit.setName("Bluefruit52");
 
   // Configure and start DIS (Device Information Service)
   bledis.setManufacturer("Adafruit Industries");
diff --git a/libraries/Bluefruit52Lib/examples/Peripheral/hid_keyboard/hid_keyboard.ino b/libraries/Bluefruit52Lib/examples/Peripheral/hid_keyboard/hid_keyboard.ino
@@ -36,7 +36,6 @@ void setup()
 
   Bluefruit.begin();
   Bluefruit.setTxPower(4);    // Check bluefruit.h for supported values
-  Bluefruit.setName("Bluefruit52");
 
   // Configure and Start Device Information Service
   bledis.setManufacturer("Adafruit Industries");
diff --git a/libraries/Bluefruit52Lib/examples/Peripheral/hid_keyscan/hid_keyscan.ino b/libraries/Bluefruit52Lib/examples/Peripheral/hid_keyscan/hid_keyscan.ino
@@ -54,7 +54,6 @@ void setup()
 
   Bluefruit.begin();
   Bluefruit.setTxPower(4);    // Check bluefruit.h for supported values
-  Bluefruit.setName("Bluefruit52");
 
   // Configure and Start Device Information Service
   bledis.setManufacturer("Adafruit Industries");
diff --git a/libraries/Bluefruit52Lib/examples/Peripheral/hid_mouse/hid_mouse.ino b/libraries/Bluefruit52Lib/examples/Peripheral/hid_mouse/hid_mouse.ino
@@ -38,7 +38,6 @@ void setup()
   // HID Device can have a min connection interval of 9*1.25 = 11.25 ms
   Bluefruit.Periph.setConnInterval(9, 16); // min = 9*1.25=11.25 ms, max = 16*1.25=20ms
   Bluefruit.setTxPower(4);    // Check bluefruit.h for supported values
-  Bluefruit.setName("Bluefruit52");
 
   // Configure and Start Device Information Service
   bledis.setManufacturer("Adafruit Industries");
diff --git a/libraries/Bluefruit52Lib/examples/Peripheral/image_eink_transfer/image_eink_transfer.ino b/libraries/Bluefruit52Lib/examples/Peripheral/image_eink_transfer/image_eink_transfer.ino
@@ -85,7 +85,7 @@ void setup()
 
   Bluefruit.begin();
   Bluefruit.setTxPower(4);    // Check bluefruit.h for supported values
-  Bluefruit.setName("Bluefruit52");
+
   Bluefruit.Periph.setConnectCallback(connect_callback);
   Bluefruit.Periph.setDisconnectCallback(disconnect_callback);
   Bluefruit.Periph.setConnInterval(6, 12); // 7.5 - 15 ms
diff --git a/libraries/Bluefruit52Lib/examples/Peripheral/image_transfer/image_transfer.ino b/libraries/Bluefruit52Lib/examples/Peripheral/image_transfer/image_transfer.ino
@@ -152,7 +152,7 @@ void setup()
 
   Bluefruit.begin();
   Bluefruit.setTxPower(4);    // Check bluefruit.h for supported values
-  Bluefruit.setName("Bluefruit52");
+
   Bluefruit.Periph.setConnectCallback(connect_callback);
   Bluefruit.Periph.setDisconnectCallback(disconnect_callback);
   Bluefruit.Periph.setConnInterval(6, 12); // 7.5 - 15 ms
diff --git a/libraries/Bluefruit52Lib/examples/Peripheral/neomatrix/neomatrix.ino b/libraries/Bluefruit52Lib/examples/Peripheral/neomatrix/neomatrix.ino
@@ -87,7 +87,7 @@ void setup()
   // Init Bluefruit
   Bluefruit.begin();
   Bluefruit.setTxPower(4);    // Check bluefruit.h for supported values
-  Bluefruit.setName("Bluefruit52");
+
   Bluefruit.Periph.setConnectCallback(connect_callback);
 
   // Configure and Start Device Information Service
diff --git a/libraries/Bluefruit52Lib/examples/Peripheral/neopixel/neopixel.ino b/libraries/Bluefruit52Lib/examples/Peripheral/neopixel/neopixel.ino
@@ -72,7 +72,7 @@ void setup()
   // Init Bluefruit
   Bluefruit.begin();
   Bluefruit.setTxPower(4);    // Check bluefruit.h for supported values
-  Bluefruit.setName("Bluefruit52");
+
   Bluefruit.Periph.setConnectCallback(connect_callback);
 
   // To be consistent OTA DFU should be added first if it exists
diff --git a/libraries/Bluefruit52Lib/examples/Peripheral/pairing_pin/pairing_pin.ino b/libraries/Bluefruit52Lib/examples/Peripheral/pairing_pin/pairing_pin.ino
@@ -48,7 +48,6 @@ void setup()
 
   Bluefruit.begin();
   Bluefruit.setTxPower(4);    // Check bluefruit.h for supported values
-  Bluefruit.setName("Bluefruit52");
 
   Serial.println("Setting pairing PIN to: " PAIRING_PIN);
   Bluefruit.Security.setPIN(PAIRING_PIN);
diff --git a/libraries/Bluefruit52Lib/examples/Peripheral/rssi_callback/rssi_callback.ino b/libraries/Bluefruit52Lib/examples/Peripheral/rssi_callback/rssi_callback.ino
@@ -35,7 +35,6 @@ void setup()
 
   Bluefruit.begin();
   Bluefruit.setTxPower(4);    // Check bluefruit.h for supported values
-  Bluefruit.setName("Bluefruit52");
   Bluefruit.Periph.setConnectCallback(connect_callback);
   Bluefruit.Periph.setDisconnectCallback(disconnect_callback);  
   
diff --git a/libraries/Bluefruit52Lib/examples/Peripheral/rssi_poll/rssi_poll.ino b/libraries/Bluefruit52Lib/examples/Peripheral/rssi_poll/rssi_poll.ino
@@ -35,7 +35,6 @@ void setup()
 
   Bluefruit.begin();
   Bluefruit.setTxPower(4);    // Check bluefruit.h for supported values
-  Bluefruit.setName("Bluefruit52");
   Bluefruit.Periph.setConnectCallback(connect_callback);
   Bluefruit.Periph.setDisconnectCallback(disconnect_callback);  
   
diff --git a/libraries/Bluefruit52Lib/examples/Peripheral/throughput/throughput.ino b/libraries/Bluefruit52Lib/examples/Peripheral/throughput/throughput.ino
@@ -60,7 +60,6 @@ void setup(void)
 
   Bluefruit.begin();
   Bluefruit.setTxPower(4);    // Check bluefruit.h for supported values
-  Bluefruit.setName("Bluefruit52");
   Bluefruit.Periph.setConnectCallback(connect_callback);
   Bluefruit.Periph.setDisconnectCallback(disconnect_callback);
   Bluefruit.Periph.setConnInterval(6, 12); // 7.5 - 15 ms
diff --git a/libraries/Bluefruit52Lib/examples/Projects/homekit/homekit_lightbulb/homekit_lightbulb.ino b/libraries/Bluefruit52Lib/examples/Projects/homekit/homekit_lightbulb/homekit_lightbulb.ino
@@ -121,7 +121,6 @@ void setup()
 
   Bluefruit.begin();
   Bluefruit.setTxPower(4);    // Check bluefruit.h for supported values
-  Bluefruit.setName("Bluefruit52");
 
   //InternalFS.remove(CRYPTO_KEYFILE);
   //File file(CRYPTO_KEYFILE, FILE_O_WRITE, InternalFS);
diff --git a/libraries/Bluefruit52Lib/examples/Projects/rssi_proximity/rssi_proximity_central/rssi_proximity_central.ino b/libraries/Bluefruit52Lib/examples/Projects/rssi_proximity/rssi_proximity_central/rssi_proximity_central.ino
@@ -186,9 +186,6 @@ void setup()
   
   Bluefruit.setTxPower(4);    // Check bluefruit.h for supported values
 
-  /* Set the device name */
-  Bluefruit.setName("Bluefruit52");
-
   /* Set the LED interval for blinky pattern on BLUE LED */
   Bluefruit.setConnLedInterval(250);
 
diff --git a/libraries/Bluefruit52Lib/examples/Projects/rssi_proximity/rssi_proximity_peripheral/rssi_proximity_peripheral.ino b/libraries/Bluefruit52Lib/examples/Projects/rssi_proximity/rssi_proximity_peripheral/rssi_proximity_peripheral.ino
@@ -75,7 +75,6 @@ void setup()
   }
 
   Bluefruit.setTxPower(4);    // Check bluefruit.h for supported values
-  Bluefruit.setName("Bluefruit52");
 
   // Set up and start advertising
   startAdv();

Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,8 @@ char nibble_to_hex(uint8_t nibble) { // convert a 4-bit nibble to a hexadecimal`
`40`	`40`
`41`	`41`	`void setup()`
`42`	`42`	`{`
`43`		`- Serial.begin(115200);`
`44`		`- while ( !Serial ) delay(10); // for nrf52840 with native usb`
	`43`	`+// Serial.begin(115200);`
	`44`	`+// while ( !Serial ) delay(10);`
`45`	`45`
`46`	`46`	`Serial.println("Bluefruit52 Color Advertising Example");`
`47`	`47`	`Serial.println("----------------------------------------\n");`