xobs/simmel-bootloader
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

usb serial string = device ID

Browse Source
This commit is contained in:
hathach 2018-08-29 12:44:18 +07:00
parent 4ca445c9f5
commit d9209fdcdf
5 changed files with 1523 additions and 1532 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1402
bin/feather_nrf52840_express/6.1.0r0/feather_nrf52840_express_bootloader_s140_6.1.0r0.hex
View File

File diff suppressed because it is too large Load Diff

BIN
bin/feather_nrf52840_express/6.1.0r0/feather_nrf52840_express_bootloader_s140_6.1.0r0.zip
View File

Binary file not shown.

1641
bin/pca10056/6.1.0r0/pca10056_bootloader_s140_6.1.0r0.hex
View File

File diff suppressed because it is too large Load Diff

BIN
bin/pca10056/6.1.0r0/pca10056_bootloader_s140_6.1.0r0.zip
View File

Binary file not shown.

12
src/usb/usb.c
View File

@ -54,11 +54,7 @@
extern tusb_desc_device_t usb_desc_dev; extern tusb_desc_device_t usb_desc_dev;
extern usb_desc_cfg_t usb_desc_cfg; extern usb_desc_cfg_t usb_desc_cfg;
/* Serial should be different for Application mode, DFU with UF2, and DFU with CDC only therefore // Serial string using unique Device ID
* - DeviceID : (Arduino + CircuitPython)
* - DeviceID + 1 : DFU with UF2
* - DeviceID + 2 : DFU with CDC only
*/
extern uint16_t usb_desc_str_serial[1+16]; extern uint16_t usb_desc_str_serial[1+16];
/* tinyusb function that handles power event (detected, ready, removed) /* tinyusb function that handles power event (detected, ready, removed)
@ -107,8 +103,6 @@ void usb_init(bool cdc_only)
tusb_hal_nrf_power_event(NRFX_POWER_USB_EVT_READY); tusb_hal_nrf_power_event(NRFX_POWER_USB_EVT_READY);
} }
uint32_t devid_low = NRF_FICR->DEVICEID[0] + 1; // default uf2
if ( cdc_only ) if ( cdc_only )
{ {
// Change PID to CDC only // Change PID to CDC only
@ -117,13 +111,11 @@ void usb_init(bool cdc_only)
// Remove MSC interface = reduce total interface + adjust config desc length // Remove MSC interface = reduce total interface + adjust config desc length
usb_desc_cfg.config.bNumInterfaces--; usb_desc_cfg.config.bNumInterfaces--;
usb_desc_cfg.config.wTotalLength -= sizeof(usb_desc_cfg.msc); usb_desc_cfg.config.wTotalLength -= sizeof(usb_desc_cfg.msc);
devid_low++;
} }
// Create Serial string descriptor // Create Serial string descriptor
char tmp_serial[17]; char tmp_serial[17];
sprintf(tmp_serial, "%08lX%08lX", NRF_FICR->DEVICEID[1], devid_low); sprintf(tmp_serial, "%08lX%08lX", NRF_FICR->DEVICEID[1], NRF_FICR->DEVICEID[0]);
for(uint8_t i=0; i<16; i++) for(uint8_t i=0; i<16; i++)
{ {