Merge pull request #25 from smasher816/master

[kiibohd-controller.git] / Output / pjrcUSB / arm / usb_keyboard.c

diff --git a/Output/pjrcUSB/arm/usb_keyboard.c b/Output/pjrcUSB/arm/usb_keyboard.c
index 07ef394c2e157604b9439ccc2e66f4dba69c63eb..b42507365245a5c6d8f931a08efbcf5ee2084f16 100644 (file)
--- a/Output/pjrcUSB/arm/usb_keyboard.c
+++ b/Output/pjrcUSB/arm/usb_keyboard.c
@@ -1,7 +1,7 @@
 /* Teensyduino Core Library
  * http://www.pjrc.com/teensy/
  * Copyright (c) 2013 PJRC.COM, LLC.
- * Modifications by Jacob Alexander 2013-2014
+ * Modifications by Jacob Alexander 2013-2015
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -76,6 +76,7 @@ void usb_keyboard_send()
        uint32_t wait_count = 0;
        usb_packet_t *tx_packet;
 
+       // Wait till ready
        while ( 1 )
        {
                if ( !usb_configuration )
@@ -83,12 +84,26 @@ void usb_keyboard_send()
                        erro_print("USB not configured...");
                        return;
                }
-               if ( usb_tx_packet_count(KEYBOARD_ENDPOINT) < TX_PACKET_LIMIT )
+
+               if ( USBKeys_Protocol == 0 ) // Boot Mode
+               {
+                       if ( usb_tx_packet_count( NKRO_KEYBOARD_ENDPOINT ) < TX_PACKET_LIMIT )
+                       {
+                               tx_packet = usb_malloc();
+                               if ( tx_packet )
+                                       break;
+                       }
+               }
+               else if ( USBKeys_Protocol == 1 ) // NKRO Mode
                {
-                       tx_packet = usb_malloc();
-                       if ( tx_packet )
-                               break;
+                       if ( usb_tx_packet_count( KEYBOARD_ENDPOINT ) < TX_PACKET_LIMIT )
+                       {
+                               tx_packet = usb_malloc();
+                               if ( tx_packet )
+                                       break;
+                       }
                }
+
                if ( ++wait_count > TX_TIMEOUT || transmit_previous_timeout )
                {
                        transmit_previous_timeout = 1;
@@ -98,15 +113,141 @@ void usb_keyboard_send()
                yield();
        }
 
-       // Boot Mode
-       *(tx_packet->buf) = USBKeys_Modifiers;
-       *(tx_packet->buf + 1) = 0;
-       memcpy( tx_packet->buf + 2, USBKeys_Keys, USB_BOOT_MAX_KEYS );
-       tx_packet->len = 8;
+       // Pointer to USB tx packet buffer
+       uint8_t *tx_buf = tx_packet->buf;
+
+       switch ( USBKeys_Protocol )
+       {
+       // Send boot keyboard interrupt packet(s)
+       case 0:
+               // USB Boot Mode debug output
+               if ( Output_DebugMode )
+               {
+                       dbug_msg("Boot USB: ");
+                       printHex_op( USBKeys_Modifiers, 2 );
+                       print(" ");
+                       printHex( 0 );
+                       print(" ");
+                       printHex_op( USBKeys_Keys[0], 2 );
+                       printHex_op( USBKeys_Keys[1], 2 );
+                       printHex_op( USBKeys_Keys[2], 2 );
+                       printHex_op( USBKeys_Keys[3], 2 );
+                       printHex_op( USBKeys_Keys[4], 2 );
+                       printHex_op( USBKeys_Keys[5], 2 );
+                       print( NL );
+               }
+
+               // Boot Mode
+               *tx_buf++ = USBKeys_Modifiers;
+               *tx_buf++ = 0;
+               memcpy( tx_buf, USBKeys_Keys, USB_BOOT_MAX_KEYS );
+               tx_packet->len = 8;
 
-       // Send USB Packet
-       usb_tx( KEYBOARD_ENDPOINT, tx_packet );
-       USBKeys_Changed = USBKeyChangeState_None;
+               // Send USB Packet
+               usb_tx( KEYBOARD_ENDPOINT, tx_packet );
+               USBKeys_Changed = USBKeyChangeState_None;
+               break;
+
+       // Send NKRO keyboard interrupts packet(s)
+       case 1:
+               if ( Output_DebugMode )
+               {
+                       dbug_msg("NKRO USB: ");
+               }
+
+               // Check system control keys
+               if ( USBKeys_Changed & USBKeyChangeState_System )
+               {
+                       if ( Output_DebugMode )
+                       {
+                               print("SysCtrl[");
+                               printHex_op( USBKeys_SysCtrl, 2 );
+                               print( "] " NL );
+                       }
+
+                       *tx_buf++ = 0x02; // ID
+                       *tx_buf   = USBKeys_SysCtrl;
+                       tx_packet->len = 2;
+
+                       // Send USB Packet
+                       usb_tx( NKRO_KEYBOARD_ENDPOINT, tx_packet );
+                       USBKeys_Changed &= ~USBKeyChangeState_System; // Mark sent
+               }
+
+               // Check consumer control keys
+               if ( USBKeys_Changed & USBKeyChangeState_Consumer )
+               {
+                       if ( Output_DebugMode )
+                       {
+                               print("ConsCtrl[");
+                               printHex_op( USBKeys_ConsCtrl, 2 );
+                               print( "] " NL );
+                       }
+
+                       *tx_buf++ = 0x03; // ID
+                       *tx_buf++ = (uint8_t)(USBKeys_ConsCtrl & 0x00FF);
+                       *tx_buf   = (uint8_t)(USBKeys_ConsCtrl >> 8);
+                       tx_packet->len = 3;
+
+                       // Send USB Packet
+                       usb_tx( NKRO_KEYBOARD_ENDPOINT, tx_packet );
+                       USBKeys_Changed &= ~USBKeyChangeState_Consumer; // Mark sent
+               }
+
+               // Standard HID Keyboard
+               if ( USBKeys_Changed )
+               {
+                       // USB NKRO Debug output
+                       if ( Output_DebugMode )
+                       {
+                               printHex_op( USBKeys_Modifiers, 2 );
+                               print(" ");
+                               for ( uint8_t c = 0; c < 6; c++ )
+                                       printHex_op( USBKeys_Keys[ c ], 2 );
+                               print(" ");
+                               for ( uint8_t c = 6; c < 20; c++ )
+                                       printHex_op( USBKeys_Keys[ c ], 2 );
+                               print(" ");
+                               printHex_op( USBKeys_Keys[20], 2 );
+                               print(" ");
+                               for ( uint8_t c = 21; c < 27; c++ )
+                                       printHex_op( USBKeys_Keys[ c ], 2 );
+                               print( NL );
+                       }
+
+                       tx_packet->len = 0;
+
+                       // Modifiers
+                       *tx_buf++ = 0x01; // ID
+                       *tx_buf++ = USBKeys_Modifiers;
+                       tx_packet->len += 2;
+
+                       // 4-49 (first 6 bytes)
+                       memcpy( tx_buf, USBKeys_Keys, 6 );
+                       tx_buf += 6;
+                       tx_packet->len += 6;
+
+                       // 51-155 (Middle 14 bytes)
+                       memcpy( tx_buf, USBKeys_Keys + 6, 14 );
+                       tx_buf += 14;
+                       tx_packet->len += 14;
+
+                       // 157-164 (Next byte)
+                       memcpy( tx_buf, USBKeys_Keys + 20, 1 );
+                       tx_buf += 1;
+                       tx_packet->len += 1;
+
+                       // 176-221 (last 6 bytes)
+                       memcpy( tx_buf, USBKeys_Keys + 21, 6 );
+                       tx_packet->len += 6;
+
+                       // Send USB Packet
+                       usb_tx( NKRO_KEYBOARD_ENDPOINT, tx_packet );
+                       USBKeys_Changed = USBKeyChangeState_None; // Mark sent
+               }
+
+               break;
+       }
 
        return;
 }