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.

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

Composite CDC+HID for F4 Hotfix #5512

Merged
merged 1 commit into from
Mar 23, 2018
Merged

Conversation

conkerkh
Copy link
Contributor

No description provided.

 - For now disables Composite (it can be enabled, with USB_CDC_HID define)
- Modified descriptors so they are properly recognized
- Changed PID for Composite device (otherwise it doesn't work probably due to windows feature - automatically finding drivers based on those values)
@conkerkh
Copy link
Contributor Author

Fixes #5496

@etracer65
Copy link
Member

@conkerkh Tested on current an several old OS X versions and this change fixes the problems. Thanks for the quick work.

@@ -51,7 +51,6 @@
#define USE_GYRO_DATA_ANALYSE
#define USE_ADC
#define USE_ADC_INTERNAL
#define USB_CDC_HID
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the quick fix, @conkerkh. This looks like it also disables HID for all targets that do not explicitly enable it, which is not what we want for a permanent solution (and before the permanent solution we don't want it so that users can test / provide feedback). What is your take on making this configurable at runtime?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like this idea. I can do PG for this.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added in #5525

@mikeller mikeller added this to the Betaflight v3.4 milestone Mar 23, 2018
@mikeller mikeller merged commit a539bd6 into betaflight:master Mar 23, 2018
@DieHertz
Copy link
Member

Good job

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants