Merge ChibiOS and LUFA descriptor support (#2362)
* Move lufa descriptor to protocol/usb_descriptor * Try to compile usb_descriptor on ChibiOS * Add lufa_utils for ChibiOS Lufa USB descriptors for ChibiOS * More lufa_util compatibility fixes * First compiling version of shared USB descriptor * Send the usb descriptors * Fix the CONSOLE output on ChibiOS * Add errors for unsupported interfaces * Enable support for vitual serial port USB descriptors * Implement virtual serial port for ChibiOS * Cleanup the lufa_utils Use the default lufa header files * Add raw hid support for ChibiOS This is completely untested * Enable midi compilation on ChibiOS * Move midi functionality out of lufa.c * Don't register sysex callback when not needed * ChibiOS compilation fixes * Update ChibiOS submodule * Fix the Midi USB descriptor It didn't work properly when both Midi and Virtual serial port was enabled. * Add MIDI support for ChibiOS * Fix USB descriptor strings on ChibiOS * Use serial usb driver for raw hid * Generalize the ChibiOS stream like drivers This makes the initialization much more simple and eliminates a lot of the code duplication. * Convert console output to chibios stream driver * Fixes for ChibiOS update * Update the ChibiOS contrib submodule To include the usb data toggle synchronization fixes * Fix duplicate reset enumeration on ChibiOS * Add missing include * Add number of endpoints check for ChibiOS * Enable serial USB driver on all keyboards * Add missing includes when API is enabled withot midi * Add another missing inlcude
This commit is contained in:
parent
63c16f4b63
commit
53ff8a31b6
38 changed files with 761 additions and 1237 deletions
|
@ -73,22 +73,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
|
||||
|
||||
/* key report size(NKRO or boot mode) */
|
||||
#if defined(PROTOCOL_PJRC) && defined(NKRO_ENABLE)
|
||||
# include "usb.h"
|
||||
# define KEYBOARD_REPORT_SIZE KBD2_SIZE
|
||||
# define KEYBOARD_REPORT_KEYS (KBD2_SIZE - 2)
|
||||
# define KEYBOARD_REPORT_BITS (KBD2_SIZE - 1)
|
||||
|
||||
#elif defined(PROTOCOL_LUFA) && defined(NKRO_ENABLE)
|
||||
# include "protocol/lufa/descriptor.h"
|
||||
# define KEYBOARD_REPORT_SIZE NKRO_EPSIZE
|
||||
# define KEYBOARD_REPORT_KEYS (NKRO_EPSIZE - 2)
|
||||
# define KEYBOARD_REPORT_BITS (NKRO_EPSIZE - 1)
|
||||
#elif defined(PROTOCOL_CHIBIOS) && defined(NKRO_ENABLE)
|
||||
# include "protocol/chibios/usb_main.h"
|
||||
# define KEYBOARD_REPORT_SIZE NKRO_EPSIZE
|
||||
# define KEYBOARD_REPORT_KEYS (NKRO_EPSIZE - 2)
|
||||
# define KEYBOARD_REPORT_BITS (NKRO_EPSIZE - 1)
|
||||
#if defined(NKRO_ENABLE)
|
||||
#if defined(PROTOCOL_PJRC)
|
||||
#include "usb.h"
|
||||
#define KEYBOARD_REPORT_SIZE KBD2_SIZE
|
||||
#define KEYBOARD_REPORT_KEYS (KBD2_SIZE - 2)
|
||||
#define KEYBOARD_REPORT_BITS (KBD2_SIZE - 1)
|
||||
#elif defined(PROTOCOL_LUFA) || defined(PROTOCOL_CHIBIOS)
|
||||
#include "protocol/usb_descriptor.h"
|
||||
#define KEYBOARD_REPORT_SIZE NKRO_EPSIZE
|
||||
#define KEYBOARD_REPORT_KEYS (NKRO_EPSIZE - 2)
|
||||
#define KEYBOARD_REPORT_BITS (NKRO_EPSIZE - 1)
|
||||
#else
|
||||
#error "NKRO not supported with this protocol"
|
||||
#endif
|
||||
|
||||
#else
|
||||
# define KEYBOARD_REPORT_SIZE 8
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue