Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Expose DeviceID through USB descriptors in DFU mode, Microsoft WCID support #1001

Merged
merged 56 commits into from
Jun 15, 2016
Merged

Expose DeviceID through USB descriptors in DFU mode, Microsoft WCID support #1001

merged 56 commits into from
Jun 15, 2016

Conversation

avtolstoy
Copy link
Member

@avtolstoy avtolstoy commented May 15, 2016 •
edited by technobly
Loading

Exposes DeviceID and Bootloader Version through USB descriptors while in DFU mode:

    Device Descriptor   
        Descriptor Version Number:   0x0200
        Device Class:   0   (Composite)
        Device Subclass:   0
        Device Protocol:   0
        Device MaxPacketSize:   64
        Device VendorID/ProductID:   0x2B04/0xD00A   (unknown vendor)
        Device Version Number:   0x0008 (Bootloader version)
        Number of Configurations:   1
        Manufacturer String:   1 "Particle"
        Product String:   2 "Electron DFU Mode"
        Serial Number String:   3 "XXXXXXXXXXXXXXXX3132" (Device ID)

Doneness:

  • Contributor has signed CLA
  • Problem and Solution clearly stated
  • Code peer reviewed
  • API tests compiled
  • Run unit/integration/application tests on device
  • Add documentation
  • Add to CHANGELOG.md after merging (add links to docs and issues)

avtolstoy added 30 commits March 10, 2016 11:05
@avtolstoy
HID and CDC drivers with composite device and multi-instancing support
e8b02da
@avtolstoy
Composite USB (CDC + HAL) for STM32F2. WIP
9f88fb6
@avtolstoy
Do not call SOF callbacks in classes until they have been initialized…
69b013e 
…. Remote wakeup feature disabled. Debug messages removed
@avtolstoy
FIXME: UNSIGNED Windows USB drivers with USBSerial1 support
9b62479
@avtolstoy
New USB serial HAL stubs for non-STM32F2 platforms
bd98adc
@avtolstoy
Merge remote-tracking branch 'upstream/develop' into feature/usb-comp…
be2d127 
…osite
@avtolstoy
USBSerial1DebugOutput
0628791
@avtolstoy
Merge remote-tracking branch 'upstream/develop' into feature/usb-comp…
d6c3727 
…osite
@avtolstoy
Electron uses USB FS pins, unlike Photon, which uses USB HS pins in F…
73db84d 
…S mode. Switch back to FS core on Electron, add workarounds
@avtolstoy
USBSerial: DTR/RTS, Electron fixes
8a955af 
- Support for DTR/RTS
- Electron 2x CDC + HID support on Win/Mac/Linux
@avtolstoy
Unused variable in USBD_MCDC_Change_Open_State treated as an error
fdcdba8
@avtolstoy
Declare bytes2hexbuf as extern "C"
0d267ce
@avtolstoy
Do not attach if there are no USB classes registered
c9d83f2
@avtolstoy
Report DeviceId and fw version in USB descriptor. Report interface st…
30f54f5 
…rings for Serial and USBSerial1
@avtolstoy
Call USBD_Composite_Registered_Count with onlyActive=true
bd7aa1a
@avtolstoy
USB HID interface string
0e05a9b
@avtolstoy
Merge remote-tracking branch 'upstream/develop' into feature/usb-comp…
cc44e63 
…osite
@avtolstoy
Increase maximum USB classes count
3829ead
@avtolstoy
Move USB HAL to a separate dynalib hal_usb
66296c1
@avtolstoy
add usbSerialEvent1 for USBSerial1
2c6fefc
@avtolstoy
acquireSerialBuffer() and acquireUSBSerial1Buffer() to override USB S…
4e9c074 
…erial buffer allocation
@avtolstoy
Convenient macro USBSERIAL1_ENABLE() to enable USBSerial1 on startup …
1b838f7 
…without the need to perform a reattach
@avtolstoy
Comment out DEBUG lines in USB MCDC driver as this might cause a dead…
ffaabfe 
…lock
@avtolstoy
Compatibility with old Windows drivers
e36dc71
@avtolstoy
Added Wiring_Mouse and Wiring_Keyboard to platform header. wiring/api…
86bdf59 
… tests updated
@avtolstoy
Merge remote-tracking branch 'upstream/develop' into feature/usb-comp…
308c4cb 
…osite
@avtolstoy
ISR safety-checks in HAL_USB_USART_Flush_Data and HAL_USB_USART_Send_…
ac11452 
…Data, commented out DEBUG in usbd_composite.c
@avtolstoy
Outdated USB functions used to detach when entering STOP mode. Replac…
9a8b787 
…ing with HAL_USB_Attach/Detach
@avtolstoy
USBSerial1 log handlers
8ff4970
@avtolstoy
Pre-register Serial and USBSerial1 in HAL_USB_Init
26ef73e
@avtolstoy avtolstoy force-pushed the feature/usb-descriptors-dfu branch from 0686040 to db8a6ab Compare June 11, 2016 19:15
@avtolstoy avtolstoy changed the title Expose DeviceID and Bootloader Version through USB descriptors in DFU mode Expose DeviceID through USB descriptors in DFU mode, Microsoft WCID support Jun 11, 2016
avtolstoy added 4 commits June 12, 2016 05:14
@avtolstoy
Minor optimizations
8145505
@avtolstoy
Merge branch 'feature/usb-composite' into feature/usb-vendor-requests
ec844c1 
Conflicts:
	hal/src/stm32f2xx/usb_hal.c
	platform/MCU/STM32F2xx/SPARK_Firmware_Driver/inc/usbd_composite.h
	platform/MCU/STM32F2xx/SPARK_Firmware_Driver/src/usbd_composite.c
@avtolstoy
Basic SystemControlInterface implementation for handling the followin…
23351e4 
…g requests:

- REQUEST_GET_DEVICE_ID
- REQUEST_GET_SYSTEM_VERSION
- REQUEST_RESET
- REQUEST_ENTER_DFU_MODE
- REQUEST_ENTER_LISTENING_MODE
@avtolstoy
Rename 'Particle Control Interface' -> 'PRODUCT_STRING Control Interf…
e3e9658 
…ace'
@avtolstoy avtolstoy force-pushed the feature/usb-descriptors-dfu branch from db8a6ab to 780dd67 Compare June 12, 2016 18:11
@avtolstoy avtolstoy force-pushed the feature/usb-descriptors-dfu branch from 9c1d485 to 7c14217 Compare June 13, 2016 10:57
@avtolstoy avtolstoy force-pushed the feature/usb-descriptors-dfu branch from 7c14217 to 63db95f Compare June 13, 2016 16:04
@technobly technobly merged commit c9d6416 into develop Jun 15, 2016
@technobly technobly deleted the feature/usb-descriptors-dfu branch October 27, 2016 17:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
0.6.x
Development

Successfully merging this pull request may close these issues.
3 participants
@avtolstoy @m-mcgowan @technobly