Mercurial > louis > kiibohd-controller

changeset 285:1495b4504a59

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adding outputDebug command - Displays all of the bytes sent via USB - Different display mode for NKRO and Boot modes
author Jacob Alexander <haata@kiibohd.com>
date Sat, 21 Feb 2015 13:06:28 -0800
parents 5fc9fa7419b4
children 772e8990b637
files Output/pjrcUSB/arm/usb_keyboard.c Output/pjrcUSB/output_com.c Output/pjrcUSB/output_com.h
diffstat 3 files changed, 83 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Output/pjrcUSB/arm/usb_keyboard.c	Fri Feb 20 21:01:33 2015 -0800
+++ b/Output/pjrcUSB/arm/usb_keyboard.c	Sat Feb 21 13:06:28 2015 -0800
@@ -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
@@ -120,6 +120,23 @@
 	{
 	// 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,9 +150,21 @@
 
 	// 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("] ");
+			}
+
 			*tx_buf++ = 0x02; // ID
 			*tx_buf   = USBKeys_SysCtrl;
 			tx_packet->len = 2;
@@ -148,6 +177,13 @@
 		// Check consumer control keys
 		if ( USBKeys_Changed & USBKeyChangeState_Consumer )
 		{
+			if ( Output_DebugMode )
+			{
+				print("ConsCtrl[");
+				printHex_op( USBKeys_ConsCtrl, 2 );
+				print("] ");
+			}
+
 			*tx_buf++ = 0x03; // ID
 			*tx_buf++ = (uint8_t)(USBKeys_ConsCtrl & 0x00FF);
 			*tx_buf   = (uint8_t)(USBKeys_ConsCtrl >> 8);
@@ -161,6 +197,24 @@
 		// 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
--- a/Output/pjrcUSB/output_com.c	Fri Feb 20 21:01:33 2015 -0800
+++ b/Output/pjrcUSB/output_com.c	Sat Feb 21 13:06:28 2015 -0800
@@ -61,6 +61,7 @@
 // ----- Function Declarations -----
 
 void cliFunc_kbdProtocol( char* args );
+void cliFunc_outputDebug( char* args );
 void cliFunc_readLEDs   ( char* args );
 void cliFunc_sendKeys   ( char* args );
 void cliFunc_setKeys    ( char* args );
@@ -72,6 +73,7 @@
 
 // Output Module command dictionary
 CLIDict_Entry( kbdProtocol, "Keyboard Protocol Mode: 0 - Boot, 1 - OS/NKRO Mode" );
+CLIDict_Entry( outputDebug, "Toggle Output Debug mode." );
 CLIDict_Entry( readLEDs,    "Read LED byte:" NL "\t\t1 NumLck, 2 CapsLck, 4 ScrlLck, 16 Kana, etc." );
 CLIDict_Entry( sendKeys,    "Send the prepared list of USB codes and modifier byte." );
 CLIDict_Entry( setKeys,     "Prepare a space separated list of USB codes (decimal). Waits until \033[35msendKeys\033[0m." );
@@ -79,6 +81,7 @@
 
 CLIDict_Def( outputCLIDict, "USB Module Commands" ) = {
 	CLIDict_Item( kbdProtocol ),
+	CLIDict_Item( outputDebug ),
 	CLIDict_Item( readLEDs ),
 	CLIDict_Item( sendKeys ),
 	CLIDict_Item( setKeys ),
@@ -129,6 +132,11 @@
 // 0 is often used to show that a USB cable is not plugged in (but has power)
          uint8_t  Output_Available = 0;
 
+// Debug control variable for Output modules
+// 0 - Debug disabled (default)
+// 1 - Debug enabled
+         uint8_t  Output_DebugMode = 0;
+
 
 
 // ----- Capabilities -----
@@ -584,6 +592,24 @@
 }
 
 
+void cliFunc_outputDebug( char* args )
+{
+	// Parse number from argument
+	//  NOTE: Only first argument is used
+	char* arg1Ptr;
+	char* arg2Ptr;
+	CLI_argumentIsolation( args, &arg1Ptr, &arg2Ptr );
+
+	// Default to 1 if no argument is given
+	Output_DebugMode = 1;
+
+	if ( arg1Ptr[0] != '\0' )
+	{
+		Output_DebugMode = (uint16_t)numToInt( arg1Ptr );
+	}
+}
+
+
 void cliFunc_readLEDs( char* args )
 {
 	print( NL );
--- a/Output/pjrcUSB/output_com.h	Fri Feb 20 21:01:33 2015 -0800
+++ b/Output/pjrcUSB/output_com.h	Sat Feb 21 13:06:28 2015 -0800
@@ -81,6 +81,8 @@
 
 extern          uint8_t  Output_Available; // 0 - Output module not fully functional, 1 - Output module working
 
+extern          uint8_t  Output_DebugMode; // 0 - Debug disabled, 1 - Debug enabled
+
 
 
 // ----- Capabilities -----