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

Merge ChibiOS and LUFA descriptor support #2362

Merged
merged 31 commits into from
Feb 8, 2018

Conversation

fredizzimo
Copy link
Contributor

@fredizzimo fredizzimo commented Feb 8, 2018

This enables (at least) the following features on ChibiOS

  • Midi
  • Virtual Serial Port and Steno
  • Raw HID

It also fixes some keyboard descriptor fixes that were applied to LUFA, but not ChibiOS

Additionally the USB code now mostly uses a slightly patched CDC driver, so it's much more simple to follow and efficient.

The console output also uses that, which means that it's no longger dropping characters or even whole lines.

There's also some minor code cleanup and re-organization for the Midi support, so that the code can be shared.

Lufa USB descriptors for ChibiOS
Use the default lufa header files
This is completely untested
It didn't work properly when both Midi and Virtual serial port was enabled.
This makes the initialization much more simple and eliminates a lot of
the code duplication.
To include the usb data toggle synchronization fixes
@wilba
Copy link
Contributor

wilba commented Feb 8, 2018

Maybe I'm reading the diffs wrong, but it seems that this bit I added has been lost:

/* index of interface */
#define KEYBOARD_INTERFACE          0

// It is important that the Raw HID interface is at a constant
// interface number, to support Linux/OSX platforms and chrome.hid
// If Raw HID is enabled, let it be always 1.
#ifdef RAW_ENABLE
#   define RAW_INTERFACE        	(KEYBOARD_INTERFACE + 1)
#else
#   define RAW_INTERFACE        	KEYBOARD_INTERFACE
#endif

Comments explain why it should be kept.

@fredizzimo
Copy link
Contributor Author

fredizzimo commented Feb 8, 2018

@Wilba6582, that part is still there, unchanged https://github.com/qmk/qmk_firmware/pull/2362/files#diff-66e939c937b5f0ef05ea673404726a34R138

The link didn't work, but it's collapsed by default, row 138 of the changed descriptor.h

@wilba
Copy link
Contributor

wilba commented Feb 8, 2018

OK so I was reading diffs wrong. Nevermind.

@jackhumbert jackhumbert merged commit 53ff8a3 into qmk:master Feb 8, 2018
@jackhumbert
Copy link
Member

Awesome! Thanks :)

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

Successfully merging this pull request may close these issues.

3 participants