X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Output%2FpjrcUSB%2Farm%2Fusb_keyboard.c;h=d362bb34ed66ed897e8e993e1a6b6e6e17a9dcd7;hb=20b62afb9a05a64b1f15c6329866600913775eea;hp=24c60bf5fa422a2e22f978bf05f24093c6e436ef;hpb=c939059c7f65e8f4156ff8b9316f7300f958a1c6;p=kiibohd-controller.git

diff --git a/Output/pjrcUSB/arm/usb_keyboard.c b/Output/pjrcUSB/arm/usb_keyboard.c
index 24c60bf..d362bb3 100644
--- 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
@@ -52,12 +52,20 @@
 // When the PC isn't listening, how long do we wait before discarding data?
 #define TX_TIMEOUT_MSEC 50
 
-#if F_CPU == 96000000
-  #define TX_TIMEOUT (TX_TIMEOUT_MSEC * 596)
+#if F_CPU == 168000000
+	#define TX_TIMEOUT (TX_TIMEOUT_MSEC * 1100)
+#elif F_CPU == 144000000
+	#define TX_TIMEOUT (TX_TIMEOUT_MSEC * 932)
+#elif F_CPU == 120000000
+	#define TX_TIMEOUT (TX_TIMEOUT_MSEC * 764)
+#elif F_CPU == 96000000
+	#define TX_TIMEOUT (TX_TIMEOUT_MSEC * 596)
+#elif F_CPU == 72000000
+	#define TX_TIMEOUT (TX_TIMEOUT_MSEC * 512)
 #elif F_CPU == 48000000
-  #define TX_TIMEOUT (TX_TIMEOUT_MSEC * 428)
+	#define TX_TIMEOUT (TX_TIMEOUT_MSEC * 428)
 #elif F_CPU == 24000000
-  #define TX_TIMEOUT (TX_TIMEOUT_MSEC * 262)
+	#define TX_TIMEOUT (TX_TIMEOUT_MSEC * 262)
 #endif
 
 
@@ -87,7 +95,7 @@ void usb_keyboard_send()
 
 		if ( USBKeys_Protocol == 0 ) // Boot Mode
 		{
-			if ( usb_tx_packet_count( NKRO_KEYBOARD_ENDPOINT ) < TX_PACKET_LIMIT )
+			if ( usb_tx_packet_count( KEYBOARD_ENDPOINT ) < TX_PACKET_LIMIT )
 			{
 				tx_packet = usb_malloc();
 				if ( tx_packet )
@@ -96,7 +104,18 @@ void usb_keyboard_send()
 		}
 		else if ( USBKeys_Protocol == 1 ) // NKRO Mode
 		{
-			if ( usb_tx_packet_count( KEYBOARD_ENDPOINT ) < TX_PACKET_LIMIT )
+			if ( usb_tx_packet_count( NKRO_KEYBOARD_ENDPOINT ) < TX_PACKET_LIMIT )
+			{
+				tx_packet = usb_malloc();
+				if ( tx_packet )
+					break;
+			}
+		}
+		else if ( USBKeys_Changed &
+			( USBKeyChangeState_System | USBKeyChangeState_Consumer )
+		)
+		{
+			if ( usb_tx_packet_count( SYS_CTRL_ENDPOINT ) < TX_PACKET_LIMIT )
 			{
 				tx_packet = usb_malloc();
 				if ( tx_packet )
@@ -116,10 +135,68 @@ void usb_keyboard_send()
 	// Pointer to USB tx packet buffer
 	uint8_t *tx_buf = tx_packet->buf;
 
+	// 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( SYS_CTRL_ENDPOINT, tx_packet );
+		USBKeys_Changed &= ~USBKeyChangeState_System; // Mark sent
+		return;
+	}
+
+	// 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( SYS_CTRL_ENDPOINT, tx_packet );
+		USBKeys_Changed &= ~USBKeyChangeState_Consumer; // Mark sent
+		return;
+	}
+
 	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;
@@ -133,34 +210,32 @@ void usb_keyboard_send()
 
 	// Send NKRO keyboard interrupts packet(s)
 	case 1:
-		// Check system control keys
-		if ( USBKeys_Changed & USBKeyChangeState_System )
+		if ( Output_DebugMode )
 		{
-			*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 )
-		{
-			*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
+			dbug_msg("NKRO USB: ");
 		}
 
 		// 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