use USB_PRODUCT string for default bledis model

Author: hathach

boards.txt

@@ -144,7 +144,7 @@ feather52840sense.build.board=NRF52840_FEATHER_SENSE
 feather52840sense.build.core=nRF5
 feather52840sense.build.variant=feather_nrf52840_sense
 feather52840sense.build.usb_manufacturer="Adafruit LLC"
-feather52840sense.build.usb_product="Feather Bluefruit Sense"
+feather52840sense.build.usb_product="Feather nRF52840 Sense"
 feather52840sense.build.extra_flags=-DNRF52840_XXAA {build.flags.usb}
 feather52840sense.build.ldscript=nrf52840_s140_v6.ld
 feather52840sense.build.vid=0x239A
@@ -251,7 +251,7 @@ cplaynrf52840.build.board=NRF52840_CIRCUITPLAY
 cplaynrf52840.build.core=nRF5
 cplaynrf52840.build.variant=circuitplayground_nrf52840
 cplaynrf52840.build.usb_manufacturer="Adafruit LLC"
-cplaynrf52840.build.usb_product="Adafruit Circuit Playground Bluefruit"
+cplaynrf52840.build.usb_product="Circuit Playground Bluefruit"
 cplaynrf52840.build.extra_flags=-DNRF52840_XXAA {build.flags.usb}
 cplaynrf52840.build.ldscript=nrf52840_s140_v6.ld
 cplaynrf52840.build.vid=0x239A
@@ -305,7 +305,7 @@ cluenrf52840.build.board=NRF52840_CLUE
 cluenrf52840.build.core=nRF5
 cluenrf52840.build.variant=clue_nrf52840
 cluenrf52840.build.usb_manufacturer="Adafruit LLC"
-cluenrf52840.build.usb_product="Adafruit Clue"
+cluenrf52840.build.usb_product="CLUE"
 cluenrf52840.build.extra_flags=-DNRF52840_XXAA {build.flags.usb}
 cluenrf52840.build.ldscript=nrf52840_s140_v6.ld
 cluenrf52840.build.vid=0x239A

libraries/Bluefruit52Lib/examples/Peripheral/bluefruit_playground/bluefruit_playground.ino

@@ -197,7 +197,6 @@ void setup()
 
   // Configure and Start Device Information Service
   bledis.setManufacturer("Adafruit Industries");
-  bledis.setModel("Bluefruit Feather52");
   bledis.begin();
 
   // Configure and Start BLE Uart Service

libraries/Bluefruit52Lib/src/services/BLEDis.cpp

@@ -43,10 +43,10 @@ BLEDis::BLEDis(void)
   memclr(_strarr, sizeof(_strarr));
   memclr(_strarr_length, sizeof(_strarr_length));
 
-#ifdef NRF52840_XXAA
-  this->setModel("Bluefruit Feather nRF52840");
+#ifdef USB_PRODUCT
+  this->setModel(USB_PRODUCT);
 #else
-  this->setModel("Bluefruit Feather nRF52832");
+  this->setModel("Feather nRF52832");
 #endif
 
   this->setSoftwareRev(ARDUINO_BSP_VERSION);