louis/kiibohd-controller: Output/usbMuxUart/output

annotate Output/usbMuxUart/output_com.c @ 445:380e1f0123d0

Adding toggleKbdProtocol capability

author	José Luis Salvador Rufo <salvador.joseluis@gmail.com>
date	Thu, 26 May 2016 13:06:12 +0200
parents	68e19d7c953e
children	56237ba5da6f

rev	line source
420 23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	1 /* Copyright (C) 2014-2016 by Jacob Alexander
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	2 *
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	3 * Permission is hereby granted, free of charge, to any person obtaining a copy
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	4 * of this software and associated documentation files (the "Software"), to deal
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	5 * in the Software without restriction, including without limitation the rights
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	6 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	7 * copies of the Software, and to permit persons to whom the Software is
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	8 * furnished to do so, subject to the following conditions:
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	9 *
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	10 * The above copyright notice and this permission notice shall be included in
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	11 * all copies or substantial portions of the Software.
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	12 *
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	13 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	14 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	15 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	16 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	17 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	18 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	19 * THE SOFTWARE.
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	20 */
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	21
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	22 // ----- Includes -----
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	23
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	24 // Compiler Includes
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	25 #include <Lib/OutputLib.h>
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	26
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	27 // Project Includes
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	28 #include <cli.h>
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	29 #include <led.h>
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	30 #include <print.h>
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	31 #include <scan_loop.h>
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	32
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	33 // USB Includes
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	34 #if defined(_at90usb162_) \|\| defined(_atmega32u4_) \|\| defined(_at90usb646_) \|\| defined(_at90usb1286_)
263 9afed592bcb5 Preparing for mk20dx256vlh7 Jacob Alexander <haata@kiibohd.com> parents: 239 diff changeset	35 #elif defined(_mk20dx128_) \|\| defined(_mk20dx128vlf5_) \|\| defined(_mk20dx256_) \|\| defined(_mk20dx256vlh7_)
300 7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	36 #include <arm/uart_serial.h>
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	37 #include <arm/usb_dev.h>
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	38 #include <arm/usb_keyboard.h>
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	39 #include <arm/usb_serial.h>
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	40 #endif
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	41
438 f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	42 // KLL
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	43 #include <kll_defs.h>
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	44
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	45 // Local Includes
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	46 #include "output_com.h"
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	47
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	48
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	49
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	50 // ----- Macros -----
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	51
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	52 // Used to build a bitmap lookup table from a byte addressable array
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	53 #define byteLookup( byte ) case (( byte ) * ( 8 )): bytePosition = byte; byteShift = 0; break; \
310 a6bafeb5fecf Fix whitespace pt2 Rowan Decker <Smasher816@gmail.com> parents: 309 diff changeset	54 case (( byte ) * ( 8 ) + ( 1 )): bytePosition = byte; byteShift = 1; break; \
a6bafeb5fecf Fix whitespace pt2 Rowan Decker <Smasher816@gmail.com> parents: 309 diff changeset	55 case (( byte ) * ( 8 ) + ( 2 )): bytePosition = byte; byteShift = 2; break; \
a6bafeb5fecf Fix whitespace pt2 Rowan Decker <Smasher816@gmail.com> parents: 309 diff changeset	56 case (( byte ) * ( 8 ) + ( 3 )): bytePosition = byte; byteShift = 3; break; \
a6bafeb5fecf Fix whitespace pt2 Rowan Decker <Smasher816@gmail.com> parents: 309 diff changeset	57 case (( byte ) * ( 8 ) + ( 4 )): bytePosition = byte; byteShift = 4; break; \
a6bafeb5fecf Fix whitespace pt2 Rowan Decker <Smasher816@gmail.com> parents: 309 diff changeset	58 case (( byte ) * ( 8 ) + ( 5 )): bytePosition = byte; byteShift = 5; break; \
a6bafeb5fecf Fix whitespace pt2 Rowan Decker <Smasher816@gmail.com> parents: 309 diff changeset	59 case (( byte ) * ( 8 ) + ( 6 )): bytePosition = byte; byteShift = 6; break; \
a6bafeb5fecf Fix whitespace pt2 Rowan Decker <Smasher816@gmail.com> parents: 309 diff changeset	60 case (( byte ) * ( 8 ) + ( 7 )): bytePosition = byte; byteShift = 7; break
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	61
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	62
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	63
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	64 // ----- Function Declarations -----
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	65
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	66 void cliFunc_kbdProtocol( char* args );
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	67 void cliFunc_outputDebug( char* args );
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	68 void cliFunc_readLEDs ( char* args );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	69 void cliFunc_readUART ( char* args );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	70 void cliFunc_sendKeys ( char* args );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	71 void cliFunc_sendUART ( char* args );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	72 void cliFunc_setKeys ( char* args );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	73 void cliFunc_setMod ( char* args );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	74
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	75
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	76
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	77 // ----- Variables -----
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	78
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	79 // Output Module command dictionary
239 2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 230 diff changeset	80 CLIDict_Entry( kbdProtocol, "Keyboard Protocol Mode: 0 - Boot, 1 - OS/NKRO Mode" );
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	81 CLIDict_Entry( outputDebug, "Toggle Output Debug mode." );
239 2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 230 diff changeset	82 CLIDict_Entry( readLEDs, "Read LED byte:" NL "\t\t1 NumLck, 2 CapsLck, 4 ScrlLck, 16 Kana, etc." );
2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 230 diff changeset	83 CLIDict_Entry( readUART, "Read UART buffer until empty." );
2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 230 diff changeset	84 CLIDict_Entry( sendKeys, "Send the prepared list of USB codes and modifier byte." );
2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 230 diff changeset	85 CLIDict_Entry( sendUART, "Send characters over UART0." );
2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 230 diff changeset	86 CLIDict_Entry( setKeys, "Prepare a space separated list of USB codes (decimal). Waits until \033[35msendKeys\033[0m." );
2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 230 diff changeset	87 CLIDict_Entry( setMod, "Set the modfier byte:" NL "\t\t1 LCtrl, 2 LShft, 4 LAlt, 8 LGUI, 16 RCtrl, 32 RShft, 64 RAlt, 128 RGUI" );
2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 230 diff changeset	88
2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 230 diff changeset	89 CLIDict_Def( outputCLIDict, "USB Module Commands" ) = {
2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 230 diff changeset	90 CLIDict_Item( kbdProtocol ),
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	91 CLIDict_Item( outputDebug ),
239 2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 230 diff changeset	92 CLIDict_Item( readLEDs ),
2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 230 diff changeset	93 CLIDict_Item( readUART ),
2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 230 diff changeset	94 CLIDict_Item( sendKeys ),
2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 230 diff changeset	95 CLIDict_Item( sendUART ),
2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 230 diff changeset	96 CLIDict_Item( setKeys ),
2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 230 diff changeset	97 CLIDict_Item( setMod ),
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	98 { 0, 0, 0 } // Null entry for dictionary end
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	99 };
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	100
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	101
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	102 // Which modifier keys are currently pressed
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	103 // 1=left ctrl, 2=left shift, 4=left alt, 8=left gui
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	104 // 16=right ctrl, 32=right shift, 64=right alt, 128=right gui
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	105 uint8_t USBKeys_Modifiers = 0;
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	106 uint8_t USBKeys_ModifiersCLI = 0; // Separate CLI send buffer
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	107
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	108 // Currently pressed keys, max is defined by USB_MAX_KEY_SEND
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	109 uint8_t USBKeys_Keys [USB_NKRO_BITFIELD_SIZE_KEYS];
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	110 uint8_t USBKeys_KeysCLI[USB_NKRO_BITFIELD_SIZE_KEYS]; // Separate CLI send buffer
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	111
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	112 // System Control and Consumer Control 1KRO containers
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	113 uint8_t USBKeys_SysCtrl;
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	114 uint16_t USBKeys_ConsCtrl;
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	115
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	116 // The number of keys sent to the usb in the array
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	117 uint8_t USBKeys_Sent = 0;
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	118 uint8_t USBKeys_SentCLI = 0;
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	119
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	120 // 1=num lock, 2=caps lock, 4=scroll lock, 8=compose, 16=kana
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	121 volatile uint8_t USBKeys_LEDs = 0;
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	122
438 f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	123 // Currently pressed mouse buttons, bitmask, 0 represents no buttons pressed
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	124 volatile uint16_t USBMouse_Buttons = 0;
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	125
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	126 // Relative mouse axis movement, stores pending movement
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	127 volatile uint16_t USBMouse_Relative_x = 0;
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	128 volatile uint16_t USBMouse_Relative_y = 0;
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	129
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	130 // Protocol setting from the host.
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	131 // 0 - Boot Mode
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	132 // 1 - NKRO Mode (Default, unless set by a BIOS or boot interface)
438 f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	133 volatile uint8_t USBKeys_Protocol = USBProtocol_define;
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	134
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	135 // Indicate if USB should send update
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	136 // OS only needs update if there has been a change in state
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	137 USBKeyChangeState USBKeys_Changed = USBKeyChangeState_None;
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	138
438 f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	139 // Indicate if USB should send update
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	140 USBMouseChangeState USBMouse_Changed = 0;
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	141
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	142 // the idle configuration, how often we send the report to the
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	143 // host (ms * 4) even when it hasn't changed
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	144 uint8_t USBKeys_Idle_Config = 125;
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	145
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	146 // count until idle timeout
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	147 uint8_t USBKeys_Idle_Count = 0;
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	148
275 d5bf41d7f7ef Initial code for USB cable detection Jacob Alexander <haata@kiibohd.com> parents: 263 diff changeset	149 // Indicates whether the Output module is fully functional
d5bf41d7f7ef Initial code for USB cable detection Jacob Alexander <haata@kiibohd.com> parents: 263 diff changeset	150 // 0 - Not fully functional, 1 - Fully functional
d5bf41d7f7ef Initial code for USB cable detection Jacob Alexander <haata@kiibohd.com> parents: 263 diff changeset	151 // 0 is often used to show that a USB cable is not plugged in (but has power)
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	152 volatile uint8_t Output_Available = 0;
275 d5bf41d7f7ef Initial code for USB cable detection Jacob Alexander <haata@kiibohd.com> parents: 263 diff changeset	153
300 7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	154 // Debug control variable for Output modules
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	155 // 0 - Debug disabled (default)
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	156 // 1 - Debug enabled
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	157 uint8_t Output_DebugMode = 0;
300 7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	158
420 23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	159 // mA - Set by outside module if not using USB (i.e. Interconnect)
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	160 // Generally set to 100 mA (low power) or 500 mA (high power)
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	161 uint16_t Output_ExtCurrent_Available = 0;
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	162
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	163 // mA - Set by USB module (if exists)
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	164 // Initially 100 mA, but may be negotiated higher (e.g. 500 mA)
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	165 uint16_t Output_USBCurrent_Available = 0;
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	166
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	167
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	168
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	169 // ----- Capabilities -----
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	170
300 7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	171 // Set Boot Keyboard Protocol
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	172 void Output_kbdProtocolBoot_capability( uint8_t state, uint8_t stateType, uint8_t *args )
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	173 {
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	174 // Display capability name
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	175 if ( stateType == 0xFF && state == 0xFF )
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	176 {
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	177 print("Output_kbdProtocolBoot()");
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	178 return;
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	179 }
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	180
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	181 // Only set if necessary
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	182 if ( USBKeys_Protocol == 0 )
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	183 return;
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	184
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	185 // TODO Analog inputs
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	186 // Only set on key press
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	187 if ( stateType != 0x01 )
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	188 return;
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	189
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	190 // Flush the key buffers
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	191 Output_flushBuffers();
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	192
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	193 // Set the keyboard protocol to Boot Mode
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	194 USBKeys_Protocol = 0;
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	195 }
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	196
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	197
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	198 // Set NKRO Keyboard Protocol
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	199 void Output_kbdProtocolNKRO_capability( uint8_t state, uint8_t stateType, uint8_t *args )
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	200 {
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	201 // Display capability name
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	202 if ( stateType == 0xFF && state == 0xFF )
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	203 {
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	204 print("Output_kbdProtocolNKRO()");
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	205 return;
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	206 }
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	207
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	208 // Only set if necessary
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	209 if ( USBKeys_Protocol == 1 )
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	210 return;
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	211
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	212 // TODO Analog inputs
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	213 // Only set on key press
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	214 if ( stateType != 0x01 )
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	215 return;
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	216
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	217 // Flush the key buffers
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	218 Output_flushBuffers();
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	219
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	220 // Set the keyboard protocol to NKRO Mode
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	221 USBKeys_Protocol = 1;
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	222 }
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	223
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	224
445 380e1f0123d0 Adding toggleKbdProtocol capability José Luis Salvador Rufo <salvador.joseluis@gmail.com> parents: 439 diff changeset	225 // Toggle Keyboard Protocol
380e1f0123d0 Adding toggleKbdProtocol capability José Luis Salvador Rufo <salvador.joseluis@gmail.com> parents: 439 diff changeset	226 void Output_toggleKbdProtocol_capability( uint8_t state, uint8_t stateType, uint8_t *args )
380e1f0123d0 Adding toggleKbdProtocol capability José Luis Salvador Rufo <salvador.joseluis@gmail.com> parents: 439 diff changeset	227 {
380e1f0123d0 Adding toggleKbdProtocol capability José Luis Salvador Rufo <salvador.joseluis@gmail.com> parents: 439 diff changeset	228 // Display capability name
380e1f0123d0 Adding toggleKbdProtocol capability José Luis Salvador Rufo <salvador.joseluis@gmail.com> parents: 439 diff changeset	229 if ( stateType == 0xFF && state == 0xFF )
380e1f0123d0 Adding toggleKbdProtocol capability José Luis Salvador Rufo <salvador.joseluis@gmail.com> parents: 439 diff changeset	230 {
380e1f0123d0 Adding toggleKbdProtocol capability José Luis Salvador Rufo <salvador.joseluis@gmail.com> parents: 439 diff changeset	231 print("Output_toggleKbdProtocol()");
380e1f0123d0 Adding toggleKbdProtocol capability José Luis Salvador Rufo <salvador.joseluis@gmail.com> parents: 439 diff changeset	232 return;
380e1f0123d0 Adding toggleKbdProtocol capability José Luis Salvador Rufo <salvador.joseluis@gmail.com> parents: 439 diff changeset	233 }
380e1f0123d0 Adding toggleKbdProtocol capability José Luis Salvador Rufo <salvador.joseluis@gmail.com> parents: 439 diff changeset	234
380e1f0123d0 Adding toggleKbdProtocol capability José Luis Salvador Rufo <salvador.joseluis@gmail.com> parents: 439 diff changeset	235 // Only toggle protocol if release state
380e1f0123d0 Adding toggleKbdProtocol capability José Luis Salvador Rufo <salvador.joseluis@gmail.com> parents: 439 diff changeset	236 if ( stateType == 0x00 && state == 0x03 )
380e1f0123d0 Adding toggleKbdProtocol capability José Luis Salvador Rufo <salvador.joseluis@gmail.com> parents: 439 diff changeset	237 {
380e1f0123d0 Adding toggleKbdProtocol capability José Luis Salvador Rufo <salvador.joseluis@gmail.com> parents: 439 diff changeset	238 // Flush the key buffers
380e1f0123d0 Adding toggleKbdProtocol capability José Luis Salvador Rufo <salvador.joseluis@gmail.com> parents: 439 diff changeset	239 Output_flushBuffers();
380e1f0123d0 Adding toggleKbdProtocol capability José Luis Salvador Rufo <salvador.joseluis@gmail.com> parents: 439 diff changeset	240
380e1f0123d0 Adding toggleKbdProtocol capability José Luis Salvador Rufo <salvador.joseluis@gmail.com> parents: 439 diff changeset	241 // Toggle the keyboard protocol Mode
380e1f0123d0 Adding toggleKbdProtocol capability José Luis Salvador Rufo <salvador.joseluis@gmail.com> parents: 439 diff changeset	242 USBKeys_Protocol = !USBKeys_Protocol;
380e1f0123d0 Adding toggleKbdProtocol capability José Luis Salvador Rufo <salvador.joseluis@gmail.com> parents: 439 diff changeset	243 }
380e1f0123d0 Adding toggleKbdProtocol capability José Luis Salvador Rufo <salvador.joseluis@gmail.com> parents: 439 diff changeset	244 }
380e1f0123d0 Adding toggleKbdProtocol capability José Luis Salvador Rufo <salvador.joseluis@gmail.com> parents: 439 diff changeset	245
380e1f0123d0 Adding toggleKbdProtocol capability José Luis Salvador Rufo <salvador.joseluis@gmail.com> parents: 439 diff changeset	246
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	247 // Sends a Consumer Control code to the USB Output buffer
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	248 void Output_consCtrlSend_capability( uint8_t state, uint8_t stateType, uint8_t *args )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	249 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	250 // Display capability name
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	251 if ( stateType == 0xFF && state == 0xFF )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	252 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	253 print("Output_consCtrlSend(consCode)");
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	254 return;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	255 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	256
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	257 // Not implemented in Boot Mode
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	258 if ( USBKeys_Protocol == 0 )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	259 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	260 warn_print("Consumer Control is not implemented for Boot Mode");
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	261 return;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	262 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	263
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	264 // TODO Analog inputs
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	265 // Only indicate USB has changed if either a press or release has occured
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	266 if ( state == 0x01 \|\| state == 0x03 )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	267 USBKeys_Changed \|= USBKeyChangeState_Consumer;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	268
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	269 // Only send keypresses if press or hold state
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	270 if ( stateType == 0x00 && state == 0x03 ) // Release state
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	271 {
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	272 USBKeys_ConsCtrl = 0;
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	273 return;
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	274 }
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	275
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	276 // Set consumer control code
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	277 USBKeys_ConsCtrl = (uint16_t)(&args[0]);
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	278 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	279
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	280
340 e8841d3c6db5 mk20dx256vlh7 working! Jacob Alexander <haata@kiibohd.com> parents: 310 diff changeset	281 // Ignores the given key status update
e8841d3c6db5 mk20dx256vlh7 working! Jacob Alexander <haata@kiibohd.com> parents: 310 diff changeset	282 // Used to prevent fall-through, this is the None keyword in KLL
e8841d3c6db5 mk20dx256vlh7 working! Jacob Alexander <haata@kiibohd.com> parents: 310 diff changeset	283 void Output_noneSend_capability( uint8_t state, uint8_t stateType, uint8_t *args )
e8841d3c6db5 mk20dx256vlh7 working! Jacob Alexander <haata@kiibohd.com> parents: 310 diff changeset	284 {
e8841d3c6db5 mk20dx256vlh7 working! Jacob Alexander <haata@kiibohd.com> parents: 310 diff changeset	285 // Display capability name
e8841d3c6db5 mk20dx256vlh7 working! Jacob Alexander <haata@kiibohd.com> parents: 310 diff changeset	286 if ( stateType == 0xFF && state == 0xFF )
e8841d3c6db5 mk20dx256vlh7 working! Jacob Alexander <haata@kiibohd.com> parents: 310 diff changeset	287 {
e8841d3c6db5 mk20dx256vlh7 working! Jacob Alexander <haata@kiibohd.com> parents: 310 diff changeset	288 print("Output_noneSend()");
e8841d3c6db5 mk20dx256vlh7 working! Jacob Alexander <haata@kiibohd.com> parents: 310 diff changeset	289 return;
e8841d3c6db5 mk20dx256vlh7 working! Jacob Alexander <haata@kiibohd.com> parents: 310 diff changeset	290 }
e8841d3c6db5 mk20dx256vlh7 working! Jacob Alexander <haata@kiibohd.com> parents: 310 diff changeset	291
e8841d3c6db5 mk20dx256vlh7 working! Jacob Alexander <haata@kiibohd.com> parents: 310 diff changeset	292 // Nothing to do, because that's the point :P
e8841d3c6db5 mk20dx256vlh7 working! Jacob Alexander <haata@kiibohd.com> parents: 310 diff changeset	293 }
e8841d3c6db5 mk20dx256vlh7 working! Jacob Alexander <haata@kiibohd.com> parents: 310 diff changeset	294
e8841d3c6db5 mk20dx256vlh7 working! Jacob Alexander <haata@kiibohd.com> parents: 310 diff changeset	295
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	296 // Sends a System Control code to the USB Output buffer
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	297 void Output_sysCtrlSend_capability( uint8_t state, uint8_t stateType, uint8_t *args )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	298 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	299 // Display capability name
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	300 if ( stateType == 0xFF && state == 0xFF )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	301 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	302 print("Output_sysCtrlSend(sysCode)");
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	303 return;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	304 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	305
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	306 // Not implemented in Boot Mode
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	307 if ( USBKeys_Protocol == 0 )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	308 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	309 warn_print("System Control is not implemented for Boot Mode");
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	310 return;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	311 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	312
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	313 // TODO Analog inputs
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	314 // Only indicate USB has changed if either a press or release has occured
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	315 if ( state == 0x01 \|\| state == 0x03 )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	316 USBKeys_Changed \|= USBKeyChangeState_System;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	317
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	318 // Only send keypresses if press or hold state
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	319 if ( stateType == 0x00 && state == 0x03 ) // Release state
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	320 {
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	321 USBKeys_SysCtrl = 0;
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	322 return;
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	323 }
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	324
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	325 // Set system control code
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	326 USBKeys_SysCtrl = args[0];
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	327 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	328
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	329
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	330 // Adds a single USB Code to the USB Output buffer
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	331 // Argument #1: USB Code
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	332 void Output_usbCodeSend_capability( uint8_t state, uint8_t stateType, uint8_t *args )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	333 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	334 // Display capability name
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	335 if ( stateType == 0xFF && state == 0xFF )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	336 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	337 print("Output_usbCodeSend(usbCode)");
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	338 return;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	339 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	340
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	341 // Depending on which mode the keyboard is in the USB needs Press/Hold/Release events
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	342 uint8_t keyPress = 0; // Default to key release, only used for NKRO
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	343 switch ( USBKeys_Protocol )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	344 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	345 case 0: // Boot Mode
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	346 // TODO Analog inputs
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	347 // Only indicate USB has changed if either a press or release has occured
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	348 if ( state == 0x01 \|\| state == 0x03 )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	349 USBKeys_Changed = USBKeyChangeState_MainKeys;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	350
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	351 // Only send keypresses if press or hold state
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	352 if ( stateType == 0x00 && state == 0x03 ) // Release state
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	353 return;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	354 break;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	355 case 1: // NKRO Mode
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	356 // Only send press and release events
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	357 if ( stateType == 0x00 && state == 0x02 ) // Hold state
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	358 return;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	359
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	360 // Determine if setting or unsetting the bitfield (press == set)
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	361 if ( stateType == 0x00 && state == 0x01 ) // Press state
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	362 keyPress = 1;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	363 break;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	364 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	365
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	366 // Get the keycode from arguments
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	367 uint8_t key = args[0];
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	368
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	369 // Depending on which mode the keyboard is in, USBKeys_Keys array is used differently
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	370 // Boot mode - Maximum of 6 byte codes
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	371 // NKRO mode - Each bit of the 26 byte corresponds to a key
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	372 // Bits 0 - 45 (bytes 0 - 5) correspond to USB Codes 4 - 49 (Main)
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	373 // Bits 48 - 161 (bytes 6 - 20) correspond to USB Codes 51 - 164 (Secondary)
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	374 // Bits 168 - 213 (bytes 21 - 26) correspond to USB Codes 176 - 221 (Tertiary)
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	375 // Bits 214 - 216 unused
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	376 uint8_t bytePosition = 0;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	377 uint8_t byteShift = 0;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	378 switch ( USBKeys_Protocol )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	379 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	380 case 0: // Boot Mode
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	381 // Set the modifier bit if this key is a modifier
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	382 if ( (key & 0xE0) == 0xE0 ) // AND with 0xE0 (Left Ctrl, first modifier)
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	383 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	384 USBKeys_Modifiers \|= 1 << (key ^ 0xE0); // Left shift 1 by key XOR 0xE0
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	385 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	386 // Normal USB Code
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	387 else
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	388 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	389 // USB Key limit reached
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	390 if ( USBKeys_Sent >= USB_BOOT_MAX_KEYS )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	391 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	392 warn_print("USB Key limit reached");
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	393 return;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	394 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	395
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	396 // Make sure key is within the USB HID range
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	397 if ( key <= 104 )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	398 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	399 USBKeys_Keys[USBKeys_Sent++] = key;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	400 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	401 // Invalid key
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	402 else
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	403 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	404 warn_msg("USB Code above 104/0x68 in Boot Mode: ");
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	405 printHex( key );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	406 print( NL );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	407 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	408 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	409 break;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	410
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	411 case 1: // NKRO Mode
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	412 // Set the modifier bit if this key is a modifier
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	413 if ( (key & 0xE0) == 0xE0 ) // AND with 0xE0 (Left Ctrl, first modifier)
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	414 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	415 if ( keyPress )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	416 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	417 USBKeys_Modifiers \|= 1 << (key ^ 0xE0); // Left shift 1 by key XOR 0xE0
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	418 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	419 else // Release
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	420 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	421 USBKeys_Modifiers &= ~(1 << (key ^ 0xE0)); // Left shift 1 by key XOR 0xE0
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	422 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	423
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	424 USBKeys_Changed \|= USBKeyChangeState_Modifiers;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	425 break;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	426 }
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	427 // First 6 bytes
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	428 else if ( key >= 4 && key <= 49 )
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	429 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	430 // Lookup (otherwise division or multiple checks are needed to do alignment)
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	431 // Starting at 0th position, each byte has 8 bits, starting at 4th bit
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	432 uint8_t keyPos = key + (0 * 8 - 4); // Starting position in array, Ignoring 4 keys
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	433 switch ( keyPos )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	434 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	435 byteLookup( 0 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	436 byteLookup( 1 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	437 byteLookup( 2 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	438 byteLookup( 3 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	439 byteLookup( 4 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	440 byteLookup( 5 );
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	441 }
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	442
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	443 USBKeys_Changed \|= USBKeyChangeState_MainKeys;
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	444 }
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	445 // Next 14 bytes
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	446 else if ( key >= 51 && key <= 155 )
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	447 {
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	448 // Lookup (otherwise division or multiple checks are needed to do alignment)
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	449 // Starting at 6th byte position, each byte has 8 bits, starting at 51st bit
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	450 uint8_t keyPos = key + (6 * 8 - 51); // Starting position in array
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	451 switch ( keyPos )
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	452 {
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	453 byteLookup( 6 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	454 byteLookup( 7 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	455 byteLookup( 8 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	456 byteLookup( 9 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	457 byteLookup( 10 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	458 byteLookup( 11 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	459 byteLookup( 12 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	460 byteLookup( 13 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	461 byteLookup( 14 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	462 byteLookup( 15 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	463 byteLookup( 16 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	464 byteLookup( 17 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	465 byteLookup( 18 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	466 byteLookup( 19 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	467 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	468
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	469 USBKeys_Changed \|= USBKeyChangeState_SecondaryKeys;
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	470 }
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	471 // Next byte
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	472 else if ( key >= 157 && key <= 164 )
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	473 {
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	474 // Lookup (otherwise division or multiple checks are needed to do alignment)
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	475 uint8_t keyPos = key + (20 * 8 - 157); // Starting position in array, Ignoring 6 keys
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	476 switch ( keyPos )
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	477 {
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	478 byteLookup( 20 );
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	479 }
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	480
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	481 USBKeys_Changed \|= USBKeyChangeState_TertiaryKeys;
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	482 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	483 // Last 6 bytes
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	484 else if ( key >= 176 && key <= 221 )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	485 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	486 // Lookup (otherwise division or multiple checks are needed to do alignment)
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	487 uint8_t keyPos = key + (21 * 8 - 176); // Starting position in array
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	488 switch ( keyPos )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	489 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	490 byteLookup( 21 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	491 byteLookup( 22 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	492 byteLookup( 23 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	493 byteLookup( 24 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	494 byteLookup( 25 );
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	495 byteLookup( 26 );
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	496 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	497
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	498 USBKeys_Changed \|= USBKeyChangeState_QuartiaryKeys;
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	499 }
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	500 // Received 0x00
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	501 // This is a special USB Code that internally indicates a "break"
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	502 // It is used to send "nothing" in order to break up sequences of USB Codes
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	503 else if ( key == 0x00 )
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	504 {
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	505 USBKeys_Changed \|= USBKeyChangeState_MainKeys;
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	506
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	507 // Also flush out buffers just in case
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	508 Output_flushBuffers();
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	509 break;
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	510 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	511 // Invalid key
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	512 else
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	513 {
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	514 warn_msg("USB Code not within 4-49 (0x4-0x31), 51-155 (0x33-0x9B), 157-164 (0x9D-0xA4), 176-221 (0xB0-0xDD) or 224-231 (0xE0-0xE7) NKRO Mode: ");
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	515 printHex( key );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	516 print( NL );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	517 break;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	518 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	519
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	520 // Set/Unset
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	521 if ( keyPress )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	522 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	523 USBKeys_Keys[bytePosition] \|= (1 << byteShift);
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	524 USBKeys_Sent++;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	525 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	526 else // Release
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	527 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	528 USBKeys_Keys[bytePosition] &= ~(1 << byteShift);
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	529 USBKeys_Sent++;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	530 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	531
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	532 break;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	533 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	534 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	535
370 39e338a6733d Fixing default ErgoDox layout and adding FlashMode button Jacob Alexander <haata@kiibohd.com> parents: 347 diff changeset	536 void Output_flashMode_capability( uint8_t state, uint8_t stateType, uint8_t *args )
39e338a6733d Fixing default ErgoDox layout and adding FlashMode button Jacob Alexander <haata@kiibohd.com> parents: 347 diff changeset	537 {
39e338a6733d Fixing default ErgoDox layout and adding FlashMode button Jacob Alexander <haata@kiibohd.com> parents: 347 diff changeset	538 // Display capability name
39e338a6733d Fixing default ErgoDox layout and adding FlashMode button Jacob Alexander <haata@kiibohd.com> parents: 347 diff changeset	539 if ( stateType == 0xFF && state == 0xFF )
39e338a6733d Fixing default ErgoDox layout and adding FlashMode button Jacob Alexander <haata@kiibohd.com> parents: 347 diff changeset	540 {
385 d8f61e15aca1 Adding jump to bootloader key Jacob Alexander <haata@kiibohd.com> parents: 370 diff changeset	541 print("Output_flashMode()");
370 39e338a6733d Fixing default ErgoDox layout and adding FlashMode button Jacob Alexander <haata@kiibohd.com> parents: 347 diff changeset	542 return;
39e338a6733d Fixing default ErgoDox layout and adding FlashMode button Jacob Alexander <haata@kiibohd.com> parents: 347 diff changeset	543 }
39e338a6733d Fixing default ErgoDox layout and adding FlashMode button Jacob Alexander <haata@kiibohd.com> parents: 347 diff changeset	544
39e338a6733d Fixing default ErgoDox layout and adding FlashMode button Jacob Alexander <haata@kiibohd.com> parents: 347 diff changeset	545 // Start flash mode
39e338a6733d Fixing default ErgoDox layout and adding FlashMode button Jacob Alexander <haata@kiibohd.com> parents: 347 diff changeset	546 Output_firmwareReload();
39e338a6733d Fixing default ErgoDox layout and adding FlashMode button Jacob Alexander <haata@kiibohd.com> parents: 347 diff changeset	547 }
39e338a6733d Fixing default ErgoDox layout and adding FlashMode button Jacob Alexander <haata@kiibohd.com> parents: 347 diff changeset	548
438 f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	549 // Sends a mouse command over the USB Output buffer
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	550 // XXX This function will be changing in the future
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	551 // If you use it, be prepared that your .kll files will break in the future (post KLL 0.5)
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	552 // Argument #1: USB Mouse Button (16 bit)
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	553 // Argument #2: USB X Axis (16 bit) relative
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	554 // Argument #3: USB Y Axis (16 bit) relative
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	555 void Output_usbMouse_capability( uint8_t state, uint8_t stateType, uint8_t *args )
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	556 {
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	557 // Display capability name
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	558 if ( stateType == 0xFF && state == 0xFF )
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	559 {
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	560 print("Output_usbMouse(mouseButton,relX,relY)");
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	561 return;
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	562 }
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	563
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	564 // Determine which mouse button was sent
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	565 // The USB spec defines up to a max of 0xFFFF buttons
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	566 // The usual are:
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	567 // 1 - Button 1 - (Primary)
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	568 // 2 - Button 2 - (Secondary)
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	569 // 3 - Button 3 - (Tertiary)
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	570 uint16_t mouse_button = (uint16_t)(&args[0]);
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	571
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	572 // X/Y Relative Axis
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	573 uint16_t mouse_x = (uint16_t)(&args[2]);
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	574 uint16_t mouse_y = (uint16_t)(&args[4]);
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	575
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	576 // Adjust for bit shift
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	577 uint16_t mouse_button_shift = mouse_button - 1;
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	578
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	579 // Only send mouse button if in press or hold state
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	580 if ( stateType == 0x00 && state == 0x03 ) // Release state
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	581 {
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	582 // Release
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	583 if ( mouse_button )
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	584 USBMouse_Buttons &= ~(1 << mouse_button_shift);
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	585 }
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	586 else
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	587 {
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	588 // Press or hold
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	589 if ( mouse_button )
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	590 USBMouse_Buttons \|= (1 << mouse_button_shift);
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	591
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	592 if ( mouse_x )
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	593 USBMouse_Relative_x = mouse_x;
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	594 if ( mouse_y )
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	595 USBMouse_Relative_y = mouse_y;
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	596 }
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	597
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	598 // Trigger updates
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	599 if ( mouse_button )
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	600 USBMouse_Changed \|= USBMouseChangeState_Buttons;
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	601
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	602 if ( mouse_x \|\| mouse_y )
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	603 USBMouse_Changed \|= USBMouseChangeState_Relative;
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	604 }
f10c2dad7f55 Adding missing GET_PROTOCOL handling Jacob Alexander <haata@kiibohd.com> parents: 420 diff changeset	605
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	606
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	607
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	608 // ----- Functions -----
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	609
300 7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	610 // Flush Key buffers
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	611 void Output_flushBuffers()
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	612 {
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	613 // Zero out USBKeys_Keys array
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	614 for ( uint8_t c = 0; c < USB_NKRO_BITFIELD_SIZE_KEYS; c++ )
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	615 USBKeys_Keys[ c ] = 0;
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	616
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	617 // Zero out other key buffers
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	618 USBKeys_ConsCtrl = 0;
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	619 USBKeys_Modifiers = 0;
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	620 USBKeys_SysCtrl = 0;
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	621 }
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	622
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	623
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	624 // USB Module Setup
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	625 inline void Output_setup()
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	626 {
230 d81ad399c14f Adding clear screen before usb initializes Jacob Alexander <haata@kiibohd.com> parents: 227 diff changeset	627 // Setup UART
d81ad399c14f Adding clear screen before usb initializes Jacob Alexander <haata@kiibohd.com> parents: 227 diff changeset	628 uart_serial_setup();
d81ad399c14f Adding clear screen before usb initializes Jacob Alexander <haata@kiibohd.com> parents: 227 diff changeset	629
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	630 // Initialize the USB
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	631 // If a USB connection does not exist, just ignore it
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	632 // All usb related functions will non-fatally fail if called
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	633 // If the USB initialization is delayed, then functionality will just be delayed
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	634 usb_init();
175 c70f641581b5 McHCK USB WORKS!! Jacob Alexander <haata@kiibohd.com> parents: 173 diff changeset	635
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	636 // Register USB Output CLI dictionary
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	637 CLI_registerDictionary( outputCLIDict, outputCLIDictName );
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	638
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	639 // Flush key buffers
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	640 Output_flushBuffers();
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	641 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	642
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	643
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	644 // USB Data Send
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	645 inline void Output_send()
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	646 {
420 23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	647 // USB status checks
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	648 // Non-standard USB state manipulation, usually does nothing
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	649 usb_device_check();
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	650
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	651 // Boot Mode Only, unset stale keys
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	652 if ( USBKeys_Protocol == 0 )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	653 for ( uint8_t c = USBKeys_Sent; c < USB_BOOT_MAX_KEYS; c++ )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	654 USBKeys_Keys[c] = 0;
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	655
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	656 // Send keypresses while there are pending changes
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	657 while ( USBKeys_Changed )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	658 usb_keyboard_send();
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	659
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	660 // Clear keys sent
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	661 USBKeys_Sent = 0;
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	662
186 50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: 178 diff changeset	663 // Signal Scan Module we are finished
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	664 switch ( USBKeys_Protocol )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	665 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	666 case 0: // Boot Mode
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	667 // Clear modifiers only in boot mode
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	668 USBKeys_Modifiers = 0;
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	669 Scan_finishedWithOutput( USBKeys_Sent <= USB_BOOT_MAX_KEYS ? USBKeys_Sent : USB_BOOT_MAX_KEYS );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	670 break;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	671 case 1: // NKRO Mode
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	672 Scan_finishedWithOutput( USBKeys_Sent );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	673 break;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	674 }
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	675 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	676
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	677
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	678 // Sets the device into firmware reload mode
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	679 void Output_firmwareReload()
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	680 {
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	681 usb_device_reload();
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	682 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	683
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	684
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	685 // USB Input buffer available
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	686 inline unsigned int Output_availablechar()
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	687 {
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	688 return usb_serial_available() + uart_serial_available();
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	689 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	690
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	691
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	692 // USB Get Character from input buffer
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	693 inline int Output_getchar()
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	694 {
178 555d70c6764d Removing unnecessary ifdefs Jacob Alexander <haata@kiibohd.com> parents: 175 diff changeset	695 // XXX Make sure to check output_availablechar() first! Information is lost with the cast (error codes) (AVR)
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	696 if ( usb_serial_available() > 0 )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	697 {
178 555d70c6764d Removing unnecessary ifdefs Jacob Alexander <haata@kiibohd.com> parents: 175 diff changeset	698 return (int)usb_serial_getchar();
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	699 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	700
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	701 if ( uart_serial_available() > 0 )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	702 {
178 555d70c6764d Removing unnecessary ifdefs Jacob Alexander <haata@kiibohd.com> parents: 175 diff changeset	703 return (int)uart_serial_getchar();
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	704 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	705
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	706 return -1;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	707 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	708
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	709
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	710 // USB Send Character to output buffer
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	711 inline int Output_putchar( char c )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	712 {
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	713 // First send to UART
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	714 uart_serial_putchar( c );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	715
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	716 // Then send to USB
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	717 return usb_serial_putchar( c );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	718 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	719
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	720
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	721 // USB Send String to output buffer, null terminated
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	722 inline int Output_putstr( char* str )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	723 {
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	724 #if defined(_at90usb162_) \|\| defined(_atmega32u4_) \|\| defined(_at90usb646_) \|\| defined(_at90usb1286_) // AVR
178 555d70c6764d Removing unnecessary ifdefs Jacob Alexander <haata@kiibohd.com> parents: 175 diff changeset	725 uint16_t count = 0;
263 9afed592bcb5 Preparing for mk20dx256vlh7 Jacob Alexander <haata@kiibohd.com> parents: 239 diff changeset	726 #elif defined(_mk20dx128_) \|\| defined(_mk20dx128vlf5_) \|\| defined(_mk20dx256_) \|\| defined(_mk20dx256vlh7_) // ARM
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	727 uint32_t count = 0;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	728 #endif
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	729 // Count characters until NULL character, then send the amount counted
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	730 while ( str[count] != '\0' )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	731 count++;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	732
173 afd0f94023ff Fixed bug with standalone UART CLI Jacob Alexander <haata@kiibohd.com> parents: 172 diff changeset	733 // First send to UART
afd0f94023ff Fixed bug with standalone UART CLI Jacob Alexander <haata@kiibohd.com> parents: 172 diff changeset	734 uart_serial_write( str, count );
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	735
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	736 // Then send to USB
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	737 return usb_serial_write( str, count );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	738 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	739
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	740
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	741 // Soft Chip Reset
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	742 inline void Output_softReset()
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	743 {
178 555d70c6764d Removing unnecessary ifdefs Jacob Alexander <haata@kiibohd.com> parents: 175 diff changeset	744 usb_device_software_reset();
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	745 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	746
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	747
420 23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	748 // Update USB current (mA)
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	749 // Triggers power change event
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	750 void Output_update_usb_current( unsigned int current )
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	751 {
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	752 // Only signal if changed
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	753 if ( current == Output_USBCurrent_Available )
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	754 return;
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	755
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	756 // Update USB current
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	757 Output_USBCurrent_Available = current;
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	758
439 68e19d7c953e Adding proper remote wake-up support Jacob Alexander <haata@kiibohd.com> parents: 438 diff changeset	759 /* XXX Affects sleep states due to USB messages
420 23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	760 unsigned int total_current = Output_current_available();
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	761 info_msg("USB Available Current Changed. Total Available: ");
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	762 printInt32( total_current );
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	763 print(" mA" NL);
439 68e19d7c953e Adding proper remote wake-up support Jacob Alexander <haata@kiibohd.com> parents: 438 diff changeset	764 */
420 23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	765
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	766 // Send new total current to the Scan Modules
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	767 Scan_currentChange( Output_current_available() );
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	768 }
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	769
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	770
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	771 // Update external current (mA)
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	772 // Triggers power change event
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	773 void Output_update_external_current( unsigned int current )
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	774 {
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	775 // Only signal if changed
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	776 if ( current == Output_ExtCurrent_Available )
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	777 return;
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	778
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	779 // Update external current
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	780 Output_ExtCurrent_Available = current;
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	781
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	782 unsigned int total_current = Output_current_available();
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	783 info_msg("External Available Current Changed. Total Available: ");
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	784 printInt32( total_current );
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	785 print(" mA" NL);
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	786
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	787 // Send new total current to the Scan Modules
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	788 Scan_currentChange( Output_current_available() );
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	789 }
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	790
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	791
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	792 // Power/Current Available
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	793 unsigned int Output_current_available()
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	794 {
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	795 unsigned int total_current = 0;
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	796
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	797 // Check for USB current source
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	798 total_current += Output_USBCurrent_Available;
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	799
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	800 // Check for external current source
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	801 total_current += Output_ExtCurrent_Available;
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	802
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	803 // XXX If the total available current is still 0
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	804 // Set to 100 mA, which is generally a safe assumption at startup
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	805 // before we've been able to determine actual available current
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	806 if ( total_current == 0 )
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	807 {
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	808 total_current = 100;
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	809 }
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	810
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	811 return total_current;
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	812 }
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	813
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	814
23a1868b4ac2 Adding dynamic USB power support Jacob Alexander <haata@kiibohd.com> parents: 385 diff changeset	815
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	816 // ----- CLI Command Functions -----
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	817
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	818 void cliFunc_kbdProtocol( char* args )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	819 {
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	820 print( NL );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	821 info_msg("Keyboard Protocol: ");
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	822 printInt8( USBKeys_Protocol );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	823 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	824
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	825
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	826 void cliFunc_outputDebug( char* args )
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	827 {
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	828 // Parse number from argument
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	829 // NOTE: Only first argument is used
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	830 char* arg1Ptr;
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	831 char* arg2Ptr;
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	832 CLI_argumentIsolation( args, &arg1Ptr, &arg2Ptr );
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	833
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	834 // Default to 1 if no argument is given
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	835 Output_DebugMode = 1;
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	836
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	837 if ( arg1Ptr[0] != '\0' )
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	838 {
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	839 Output_DebugMode = (uint16_t)numToInt( arg1Ptr );
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	840 }
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	841 }
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	842
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	843
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	844 void cliFunc_readLEDs( char* args )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	845 {
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	846 print( NL );
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	847 info_msg("LED State: ");
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	848 printInt8( USBKeys_LEDs );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	849 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	850
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	851
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	852 void cliFunc_readUART( char* args )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	853 {
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	854 print( NL );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	855
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	856 // Read UART buffer until empty
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	857 while ( uart_serial_available() > 0 )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	858 {
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	859 char out[] = { (char)uart_serial_getchar(), '\0' };
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	860 dPrint( out );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	861 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	862 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	863
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	864
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	865 void cliFunc_sendKeys( char* args )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	866 {
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	867 // Copy USBKeys_KeysCLI to USBKeys_Keys
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	868 for ( uint8_t key = 0; key < USBKeys_SentCLI; ++key )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	869 {
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	870 // TODO
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	871 //USBKeys_Keys[key] = USBKeys_KeysCLI[key];
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	872 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	873 USBKeys_Sent = USBKeys_SentCLI;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	874
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	875 // Set modifier byte
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	876 USBKeys_Modifiers = USBKeys_ModifiersCLI;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	877 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	878
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	879
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	880 void cliFunc_sendUART( char* args )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	881 {
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	882 // Write all args to UART
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	883 uart_serial_write( args, lenStr( args ) );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	884 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	885
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	886
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	887 void cliFunc_setKeys( char* args )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	888 {
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	889 char* curArgs;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	890 char* arg1Ptr;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	891 char* arg2Ptr = args;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	892
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	893 // Parse up to USBKeys_MaxSize args (whichever is least)
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	894 for ( USBKeys_SentCLI = 0; USBKeys_SentCLI < USB_BOOT_MAX_KEYS; ++USBKeys_SentCLI )
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	895 {
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	896 curArgs = arg2Ptr;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	897 CLI_argumentIsolation( curArgs, &arg1Ptr, &arg2Ptr );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	898
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	899 // Stop processing args if no more are found
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	900 if ( *arg1Ptr == '\0' )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	901 break;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	902
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	903 // Add the USB code to be sent
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	904 // TODO
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	905 //USBKeys_KeysCLI[USBKeys_SentCLI] = numToInt( arg1Ptr );
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	906 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	907 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	908
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	909
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	910 void cliFunc_setMod( char* args )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	911 {
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	912 // Parse number from argument
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	913 // NOTE: Only first argument is used
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	914 char* arg1Ptr;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	915 char* arg2Ptr;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	916 CLI_argumentIsolation( args, &arg1Ptr, &arg2Ptr );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	917
195 58cfcb7bac88 Changing decToInt to numToInt (adds support for Hex number interpreter) Jacob Alexander <haata@kiibohd.com> parents: 192 diff changeset	918 USBKeys_ModifiersCLI = numToInt( arg1Ptr );
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	919 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	920

Mercurial > louis > kiibohd-controller

annotate Output/usbMuxUart/output_com.c @ 445:380e1f0123d0