Merge remote-tracking branch 'upstream/master'

[kiibohd-controller.git] / Output / usbMuxUart / output_com.c

diff --git a/Output/usbMuxUart/output_com.c b/Output/usbMuxUart/output_com.c
index 5c883e7e982213199868751fdd155a718adb42cb..ae27e255b9ceebe3884e95f097720b3a9b91f526 100644 (file)
--- a/Output/usbMuxUart/output_com.c
+++ b/Output/usbMuxUart/output_com.c
@@ -33,10 +33,10 @@
 // USB Includes
 #if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_)
 #elif defined(_mk20dx128_) || defined(_mk20dx128vlf5_) || defined(_mk20dx256_) || defined(_mk20dx256vlh7_)
-#include <uartOut/arm/uart_serial.h>
-#include <pjrcUSB/arm/usb_dev.h>
-#include <pjrcUSB/arm/usb_keyboard.h>
-#include <pjrcUSB/arm/usb_serial.h>
+#include <arm/uart_serial.h>
+#include <arm/usb_dev.h>
+#include <arm/usb_keyboard.h>
+#include <arm/usb_serial.h>
 #endif
 
 // Local Includes
@@ -48,13 +48,13 @@
 
 // Used to build a bitmap lookup table from a byte addressable array
 #define byteLookup( byte ) case (( byte ) * ( 8 )):         bytePosition = byte; byteShift = 0; break; \
-                           case (( byte ) * ( 8 ) + ( 1 )): bytePosition = byte; byteShift = 1; break; \
-                           case (( byte ) * ( 8 ) + ( 2 )): bytePosition = byte; byteShift = 2; break; \
-                           case (( byte ) * ( 8 ) + ( 3 )): bytePosition = byte; byteShift = 3; break; \
-                           case (( byte ) * ( 8 ) + ( 4 )): bytePosition = byte; byteShift = 4; break; \
-                           case (( byte ) * ( 8 ) + ( 5 )): bytePosition = byte; byteShift = 5; break; \
-                           case (( byte ) * ( 8 ) + ( 6 )): bytePosition = byte; byteShift = 6; break; \
-                           case (( byte ) * ( 8 ) + ( 7 )): bytePosition = byte; byteShift = 7; break
+                          case (( byte ) * ( 8 ) + ( 1 )): bytePosition = byte; byteShift = 1; break; \
+                          case (( byte ) * ( 8 ) + ( 2 )): bytePosition = byte; byteShift = 2; break; \
+                          case (( byte ) * ( 8 ) + ( 3 )): bytePosition = byte; byteShift = 3; break; \
+                          case (( byte ) * ( 8 ) + ( 4 )): bytePosition = byte; byteShift = 4; break; \
+                          case (( byte ) * ( 8 ) + ( 5 )): bytePosition = byte; byteShift = 5; break; \
+                          case (( byte ) * ( 8 ) + ( 6 )): bytePosition = byte; byteShift = 6; break; \
+                          case (( byte ) * ( 8 ) + ( 7 )): bytePosition = byte; byteShift = 7; break
 
 
 
@@ -96,20 +96,20 @@ CLIDict_Def( outputCLIDict, "USB Module Commands" ) = {
 // Which modifier keys are currently pressed
 // 1=left ctrl,    2=left shift,   4=left alt,    8=left gui
 // 16=right ctrl, 32=right shift, 64=right alt, 128=right gui
-         uint8_t  USBKeys_Modifiers    = 0;
-         uint8_t  USBKeys_ModifiersCLI = 0; // Separate CLI send buffer
+       uint8_t  USBKeys_Modifiers    = 0;
+       uint8_t  USBKeys_ModifiersCLI = 0; // Separate CLI send buffer
 
 // Currently pressed keys, max is defined by USB_MAX_KEY_SEND
-         uint8_t  USBKeys_Keys   [USB_NKRO_BITFIELD_SIZE_KEYS];
-         uint8_t  USBKeys_KeysCLI[USB_NKRO_BITFIELD_SIZE_KEYS]; // Separate CLI send buffer
+       uint8_t  USBKeys_Keys   [USB_NKRO_BITFIELD_SIZE_KEYS];
+       uint8_t  USBKeys_KeysCLI[USB_NKRO_BITFIELD_SIZE_KEYS]; // Separate CLI send buffer
 
 // System Control and Consumer Control 1KRO containers
-         uint8_t  USBKeys_SysCtrl;
-         uint16_t USBKeys_ConsCtrl;
+       uint8_t  USBKeys_SysCtrl;
+       uint16_t USBKeys_ConsCtrl;
 
 // The number of keys sent to the usb in the array
-         uint8_t  USBKeys_Sent    = 0;
-         uint8_t  USBKeys_SentCLI = 0;
+       uint8_t  USBKeys_Sent    = 0;
+       uint8_t  USBKeys_SentCLI = 0;
 
 // 1=num lock, 2=caps lock, 4=scroll lock, 8=compose, 16=kana
 volatile uint8_t  USBKeys_LEDs = 0;
@@ -125,20 +125,79 @@ USBKeyChangeState USBKeys_Changed = USBKeyChangeState_None;
 
 // the idle configuration, how often we send the report to the
 // host (ms * 4) even when it hasn't changed
-         uint8_t  USBKeys_Idle_Config = 125;
+       uint8_t  USBKeys_Idle_Config = 125;
 
 // count until idle timeout
-         uint8_t  USBKeys_Idle_Count = 0;
+       uint8_t  USBKeys_Idle_Count = 0;
 
 // Indicates whether the Output module is fully functional
 // 0 - Not fully functional, 1 - Fully functional
 // 0 is often used to show that a USB cable is not plugged in (but has power)
-         uint8_t  Output_Available = 0;
+       uint8_t  Output_Available = 0;
+
+// Debug control variable for Output modules
+// 0 - Debug disabled (default)
+// 1 - Debug enabled
+         uint8_t  Output_DebugMode = 0;
 
 
 
 // ----- Capabilities -----
 
+// Set Boot Keyboard Protocol
+void Output_kbdProtocolBoot_capability( uint8_t state, uint8_t stateType, uint8_t *args )
+{
+       // Display capability name
+       if ( stateType == 0xFF && state == 0xFF )
+       {
+               print("Output_kbdProtocolBoot()");
+               return;
+       }
+
+       // Only set if necessary
+       if ( USBKeys_Protocol == 0 )
+               return;
+
+       // TODO Analog inputs
+       // Only set on key press
+       if ( stateType != 0x01 )
+               return;
+
+       // Flush the key buffers
+       Output_flushBuffers();
+
+       // Set the keyboard protocol to Boot Mode
+       USBKeys_Protocol = 0;
+}
+
+
+// Set NKRO Keyboard Protocol
+void Output_kbdProtocolNKRO_capability( uint8_t state, uint8_t stateType, uint8_t *args )
+{
+       // Display capability name
+       if ( stateType == 0xFF && state == 0xFF )
+       {
+               print("Output_kbdProtocolNKRO()");
+               return;
+       }
+
+       // Only set if necessary
+       if ( USBKeys_Protocol == 1 )
+               return;
+
+       // TODO Analog inputs
+       // Only set on key press
+       if ( stateType != 0x01 )
+               return;
+
+       // Flush the key buffers
+       Output_flushBuffers();
+
+       // Set the keyboard protocol to NKRO Mode
+       USBKeys_Protocol = 1;
+}
+
+
 // Sends a Consumer Control code to the USB Output buffer
 void Output_consCtrlSend_capability( uint8_t state, uint8_t stateType, uint8_t *args )
 {
@@ -374,6 +433,20 @@ void Output_usbCodeSend_capability( uint8_t state, uint8_t stateType, uint8_t *a
 
 // ----- Functions -----
 
+// Flush Key buffers
+void Output_flushBuffers()
+{
+       // Zero out USBKeys_Keys array
+       for ( uint8_t c = 0; c < USB_NKRO_BITFIELD_SIZE_KEYS; c++ )
+               USBKeys_Keys[ c ] = 0;
+
+       // Zero out other key buffers
+       USBKeys_ConsCtrl = 0;
+       USBKeys_Modifiers = 0;
+       USBKeys_SysCtrl = 0;
+}
+
+
 // USB Module Setup
 inline void Output_setup()
 {