di0ib/controller
Archived
1
0
Fork 0
Code Releases Activity

Merge pull request #120 from jlsalvador/feature-toggle-keyboard-protocol

Browse Source 
Adding toggleKbdProtocol capability
This commit is contained in:
Jacob Alexander 2016-05-26 11:13:35 -07:00
commit 9a7364b14a
3 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Output/pjrcUSB/capabilities.kll
View File

@ -17,6 +17,7 @@ mouseOut => Output_usbMouse_capability( mouseCode : 2, relative_x : 2, relati
# Configuration capabilities # Configuration capabilities
kbdProtocolBoot => Output_kbdProtocolBoot_capability(); kbdProtocolBoot => Output_kbdProtocolBoot_capability();
kbdProtocolNKRO => Output_kbdProtocolNKRO_capability(); kbdProtocolNKRO => Output_kbdProtocolNKRO_capability();
toggleKbdProtocol => Output_toggleKbdProtocol_capability();
# Locale Settings # Locale Settings
keyboardLocale => KeyboardLocale_define; keyboardLocale => KeyboardLocale_define;

22
Output/pjrcUSB/output_com.c
View File

@ -218,6 +218,28 @@ void Output_kbdProtocolNKRO_capability( uint8_t state, uint8_t stateType, uint8_
} }
// Toggle Keyboard Protocol
void Output_toggleKbdProtocol_capability( uint8_t state, uint8_t stateType, uint8_t *args )
{
// Display capability name
if ( stateType == 0xFF && state == 0xFF )
{
print("Output_toggleKbdProtocol()");
return;
}
// Only toggle protocol if release state
if ( stateType == 0x00 && state == 0x03 )
{
// Flush the key buffers
Output_flushBuffers();
// Toggle the keyboard protocol Mode
USBKeys_Protocol = !USBKeys_Protocol;
}
}
// Sends a Consumer Control code to the USB Output buffer // Sends a Consumer Control code to the USB Output buffer
void Output_consCtrlSend_capability( uint8_t state, uint8_t stateType, uint8_t *args ) void Output_consCtrlSend_capability( uint8_t state, uint8_t stateType, uint8_t *args )
{ {

22
Output/usbMuxUart/output_com.c
View File

@ -222,6 +222,28 @@ void Output_kbdProtocolNKRO_capability( uint8_t state, uint8_t stateType, uint8_
} }
// Toggle Keyboard Protocol
void Output_toggleKbdProtocol_capability( uint8_t state, uint8_t stateType, uint8_t *args )
{
// Display capability name
if ( stateType == 0xFF && state == 0xFF )
{
print("Output_toggleKbdProtocol()");
return;
}
// Only toggle protocol if release state
if ( stateType == 0x00 && state == 0x03 )
{
// Flush the key buffers
Output_flushBuffers();
// Toggle the keyboard protocol Mode
USBKeys_Protocol = !USBKeys_Protocol;
}
}
// Sends a Consumer Control code to the USB Output buffer // Sends a Consumer Control code to the USB Output buffer
void Output_consCtrlSend_capability( uint8_t state, uint8_t stateType, uint8_t *args ) void Output_consCtrlSend_capability( uint8_t state, uint8_t stateType, uint8_t *args )
{ {