louis/kiibohd-controller: Output/usbMuxUart/output

annotate Output/usbMuxUart/output_com.c @ 370:39e338a6733d

Fixing default ErgoDox layout and adding FlashMode button - Adds proper flashMode support for all keyboards and microcontrollers (usb and serial) - flashModeEnabled must be set to 1 otherwise it will only show an error * This is on purpose (somewhat dangerous feature as it allows remote flashing) - Capability cleanup

author	Jacob Alexander <haata@kiibohd.com>
date	Fri, 21 Aug 2015 19:43:45 -0700
parents	136e47478441
children	d8f61e15aca1

rev	line source
275 d5bf41d7f7ef Initial code for USB cable detection Jacob Alexander <haata@kiibohd.com> parents: 263 diff changeset	1 /* Copyright (C) 2014-2015 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
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	42 // Local Includes
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	43 #include "output_com.h"
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	44
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	45
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	46
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	47 // ----- Macros -----
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	48
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	49 // 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	50 #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	51 case (( byte ) * ( 8 ) + ( 1 )): bytePosition = byte; byteShift = 1; break; \
a6bafeb5fecf Fix whitespace pt2 Rowan Decker <Smasher816@gmail.com> parents: 309 diff changeset	52 case (( byte ) * ( 8 ) + ( 2 )): bytePosition = byte; byteShift = 2; break; \
a6bafeb5fecf Fix whitespace pt2 Rowan Decker <Smasher816@gmail.com> parents: 309 diff changeset	53 case (( byte ) * ( 8 ) + ( 3 )): bytePosition = byte; byteShift = 3; break; \
a6bafeb5fecf Fix whitespace pt2 Rowan Decker <Smasher816@gmail.com> parents: 309 diff changeset	54 case (( byte ) * ( 8 ) + ( 4 )): bytePosition = byte; byteShift = 4; break; \
a6bafeb5fecf Fix whitespace pt2 Rowan Decker <Smasher816@gmail.com> parents: 309 diff changeset	55 case (( byte ) * ( 8 ) + ( 5 )): bytePosition = byte; byteShift = 5; break; \
a6bafeb5fecf Fix whitespace pt2 Rowan Decker <Smasher816@gmail.com> parents: 309 diff changeset	56 case (( byte ) * ( 8 ) + ( 6 )): bytePosition = byte; byteShift = 6; break; \
a6bafeb5fecf Fix whitespace pt2 Rowan Decker <Smasher816@gmail.com> parents: 309 diff changeset	57 case (( byte ) * ( 8 ) + ( 7 )): bytePosition = byte; byteShift = 7; break
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	58
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	59
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	60
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	61 // ----- Function Declarations -----
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	62
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	63 void cliFunc_kbdProtocol( char* args );
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	64 void cliFunc_outputDebug( char* args );
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	65 void cliFunc_readLEDs ( char* args );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	66 void cliFunc_readUART ( char* args );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	67 void cliFunc_sendKeys ( char* args );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	68 void cliFunc_sendUART ( char* args );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	69 void cliFunc_setKeys ( char* args );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	70 void cliFunc_setMod ( char* args );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	71
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	72
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	73
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	74 // ----- Variables -----
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	75
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	76 // Output Module command dictionary
239 2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 230 diff changeset	77 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	78 CLIDict_Entry( outputDebug, "Toggle Output Debug mode." );
239 2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 230 diff changeset	79 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	80 CLIDict_Entry( readUART, "Read UART buffer until empty." );
2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 230 diff changeset	81 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	82 CLIDict_Entry( sendUART, "Send characters over UART0." );
2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 230 diff changeset	83 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	84 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	85
2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 230 diff changeset	86 CLIDict_Def( outputCLIDict, "USB Module Commands" ) = {
2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 230 diff changeset	87 CLIDict_Item( kbdProtocol ),
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	88 CLIDict_Item( outputDebug ),
239 2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 230 diff changeset	89 CLIDict_Item( readLEDs ),
2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 230 diff changeset	90 CLIDict_Item( readUART ),
2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 230 diff changeset	91 CLIDict_Item( sendKeys ),
2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 230 diff changeset	92 CLIDict_Item( sendUART ),
2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 230 diff changeset	93 CLIDict_Item( setKeys ),
2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 230 diff changeset	94 CLIDict_Item( setMod ),
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	95 { 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	96 };
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	97
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	98
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	99 // Which modifier keys are currently pressed
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	100 // 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	101 // 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	102 uint8_t USBKeys_Modifiers = 0;
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	103 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	104
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	105 // 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	106 uint8_t USBKeys_Keys [USB_NKRO_BITFIELD_SIZE_KEYS];
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	107 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	108
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	109 // System Control and Consumer Control 1KRO containers
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	110 uint8_t USBKeys_SysCtrl;
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	111 uint16_t USBKeys_ConsCtrl;
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	112
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	113 // 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	114 uint8_t USBKeys_Sent = 0;
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	115 uint8_t USBKeys_SentCLI = 0;
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	116
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	117 // 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	118 volatile uint8_t USBKeys_LEDs = 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 // Protocol setting from the host.
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	121 // 0 - Boot Mode
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	122 // 1 - NKRO Mode (Default, unless set by a BIOS or boot interface)
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	123 volatile uint8_t USBKeys_Protocol = 1;
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	124
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	125 // Indicate if USB should send update
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	126 // 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	127 USBKeyChangeState USBKeys_Changed = USBKeyChangeState_None;
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	128
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	129 // 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	130 // host (ms * 4) even when it hasn't changed
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	131 uint8_t USBKeys_Idle_Config = 125;
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	132
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	133 // count until idle timeout
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	134 uint8_t USBKeys_Idle_Count = 0;
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	135
275 d5bf41d7f7ef Initial code for USB cable detection Jacob Alexander <haata@kiibohd.com> parents: 263 diff changeset	136 // Indicates whether the Output module is fully functional
d5bf41d7f7ef Initial code for USB cable detection Jacob Alexander <haata@kiibohd.com> parents: 263 diff changeset	137 // 0 - Not fully functional, 1 - Fully functional
d5bf41d7f7ef Initial code for USB cable detection Jacob Alexander <haata@kiibohd.com> parents: 263 diff changeset	138 // 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	139 volatile uint8_t Output_Available = 0;
275 d5bf41d7f7ef Initial code for USB cable detection Jacob Alexander <haata@kiibohd.com> parents: 263 diff changeset	140
300 7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	141 // Debug control variable for Output modules
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	142 // 0 - Debug disabled (default)
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	143 // 1 - Debug enabled
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	144 uint8_t Output_DebugMode = 0;
300 7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	145
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	146
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	147
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	148 // ----- Capabilities -----
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	149
300 7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	150 // Set Boot Keyboard Protocol
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	151 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	152 {
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	153 // Display capability name
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	154 if ( stateType == 0xFF && state == 0xFF )
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	155 {
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	156 print("Output_kbdProtocolBoot()");
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	157 return;
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	158 }
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	159
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	160 // Only set if necessary
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	161 if ( USBKeys_Protocol == 0 )
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	162 return;
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	163
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	164 // TODO Analog inputs
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	165 // Only set on key press
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	166 if ( stateType != 0x01 )
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	167 return;
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	168
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	169 // Flush the key buffers
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	170 Output_flushBuffers();
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	171
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	172 // Set the keyboard protocol to Boot Mode
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	173 USBKeys_Protocol = 0;
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	174 }
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	175
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 // Set NKRO Keyboard Protocol
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	178 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	179 {
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	180 // Display capability name
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	181 if ( stateType == 0xFF && state == 0xFF )
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	182 {
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	183 print("Output_kbdProtocolNKRO()");
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	184 return;
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	185 }
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	186
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	187 // Only set if necessary
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	188 if ( USBKeys_Protocol == 1 )
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	189 return;
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	190
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	191 // TODO Analog inputs
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	192 // Only set on key press
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	193 if ( stateType != 0x01 )
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	194 return;
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 // Flush the key buffers
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	197 Output_flushBuffers();
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	198
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	199 // Set the keyboard protocol to NKRO Mode
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	200 USBKeys_Protocol = 1;
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	201 }
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	202
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	203
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	204 // Sends a Consumer Control code to the USB Output buffer
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	205 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	206 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	207 // Display capability name
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	208 if ( stateType == 0xFF && state == 0xFF )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	209 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	210 print("Output_consCtrlSend(consCode)");
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	211 return;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	212 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	213
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	214 // Not implemented in Boot Mode
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	215 if ( USBKeys_Protocol == 0 )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	216 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	217 warn_print("Consumer Control is not implemented for Boot Mode");
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	218 return;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	219 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	220
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	221 // TODO Analog inputs
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	222 // 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	223 if ( state == 0x01 \|\| state == 0x03 )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	224 USBKeys_Changed \|= USBKeyChangeState_Consumer;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	225
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	226 // Only send keypresses if press or hold state
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	227 if ( stateType == 0x00 && state == 0x03 ) // Release state
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	228 {
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	229 USBKeys_ConsCtrl = 0;
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	230 return;
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	231 }
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	232
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	233 // Set consumer control code
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	234 USBKeys_ConsCtrl = (uint16_t)(&args[0]);
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	235 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	236
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	237
340 e8841d3c6db5 mk20dx256vlh7 working! Jacob Alexander <haata@kiibohd.com> parents: 310 diff changeset	238 // Ignores the given key status update
e8841d3c6db5 mk20dx256vlh7 working! Jacob Alexander <haata@kiibohd.com> parents: 310 diff changeset	239 // Used to prevent fall-through, this is the None keyword in KLL
e8841d3c6db5 mk20dx256vlh7 working! Jacob Alexander <haata@kiibohd.com> parents: 310 diff changeset	240 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	241 {
e8841d3c6db5 mk20dx256vlh7 working! Jacob Alexander <haata@kiibohd.com> parents: 310 diff changeset	242 // Display capability name
e8841d3c6db5 mk20dx256vlh7 working! Jacob Alexander <haata@kiibohd.com> parents: 310 diff changeset	243 if ( stateType == 0xFF && state == 0xFF )
e8841d3c6db5 mk20dx256vlh7 working! Jacob Alexander <haata@kiibohd.com> parents: 310 diff changeset	244 {
e8841d3c6db5 mk20dx256vlh7 working! Jacob Alexander <haata@kiibohd.com> parents: 310 diff changeset	245 print("Output_noneSend()");
e8841d3c6db5 mk20dx256vlh7 working! Jacob Alexander <haata@kiibohd.com> parents: 310 diff changeset	246 return;
e8841d3c6db5 mk20dx256vlh7 working! Jacob Alexander <haata@kiibohd.com> parents: 310 diff changeset	247 }
e8841d3c6db5 mk20dx256vlh7 working! Jacob Alexander <haata@kiibohd.com> parents: 310 diff changeset	248
e8841d3c6db5 mk20dx256vlh7 working! Jacob Alexander <haata@kiibohd.com> parents: 310 diff changeset	249 // Nothing to do, because that's the point :P
e8841d3c6db5 mk20dx256vlh7 working! Jacob Alexander <haata@kiibohd.com> parents: 310 diff changeset	250 }
e8841d3c6db5 mk20dx256vlh7 working! Jacob Alexander <haata@kiibohd.com> parents: 310 diff changeset	251
e8841d3c6db5 mk20dx256vlh7 working! Jacob Alexander <haata@kiibohd.com> parents: 310 diff changeset	252
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	253 // Sends a System Control code to the USB Output buffer
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	254 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	255 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	256 // Display capability name
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	257 if ( stateType == 0xFF && state == 0xFF )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	258 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	259 print("Output_sysCtrlSend(sysCode)");
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	260 return;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	261 }
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 // Not implemented in Boot Mode
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	264 if ( USBKeys_Protocol == 0 )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	265 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	266 warn_print("System Control is not implemented for Boot Mode");
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	267 return;
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
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	270 // TODO Analog inputs
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	271 // 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	272 if ( state == 0x01 \|\| state == 0x03 )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	273 USBKeys_Changed \|= USBKeyChangeState_System;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	274
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	275 // Only send keypresses if press or hold state
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	276 if ( stateType == 0x00 && state == 0x03 ) // Release state
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	277 {
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	278 USBKeys_SysCtrl = 0;
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	279 return;
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	280 }
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	281
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	282 // Set system control code
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	283 USBKeys_SysCtrl = args[0];
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	284 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	285
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	286
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	287 // Adds a single USB Code to the USB Output buffer
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	288 // Argument #1: USB Code
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	289 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	290 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	291 // Display capability name
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	292 if ( stateType == 0xFF && state == 0xFF )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	293 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	294 print("Output_usbCodeSend(usbCode)");
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	295 return;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	296 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	297
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	298 // 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	299 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	300 switch ( USBKeys_Protocol )
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 case 0: // Boot Mode
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	303 // TODO Analog inputs
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	304 // 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	305 if ( state == 0x01 \|\| state == 0x03 )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	306 USBKeys_Changed = USBKeyChangeState_MainKeys;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	307
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	308 // Only send keypresses if press or hold state
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	309 if ( stateType == 0x00 && state == 0x03 ) // Release state
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 break;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	312 case 1: // NKRO Mode
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	313 // Only send press and release events
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	314 if ( stateType == 0x00 && state == 0x02 ) // Hold state
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	315 return;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	316
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	317 // Determine if setting or unsetting the bitfield (press == set)
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	318 if ( stateType == 0x00 && state == 0x01 ) // Press state
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	319 keyPress = 1;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	320 break;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	321 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	322
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	323 // Get the keycode from arguments
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	324 uint8_t key = args[0];
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	325
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	326 // 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	327 // Boot mode - Maximum of 6 byte codes
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	328 // 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	329 // 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	330 // 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	331 // 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	332 // Bits 214 - 216 unused
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	333 uint8_t bytePosition = 0;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	334 uint8_t byteShift = 0;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	335 switch ( USBKeys_Protocol )
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 case 0: // Boot Mode
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	338 // Set the modifier bit if this key is a modifier
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	339 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	340 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	341 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	342 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	343 // Normal USB Code
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	344 else
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	345 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	346 // USB Key limit reached
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	347 if ( USBKeys_Sent >= USB_BOOT_MAX_KEYS )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	348 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	349 warn_print("USB Key limit reached");
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	350 return;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	351 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	352
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	353 // Make sure key is within the USB HID range
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	354 if ( key <= 104 )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	355 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	356 USBKeys_Keys[USBKeys_Sent++] = key;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	357 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	358 // Invalid key
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	359 else
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	360 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	361 warn_msg("USB Code above 104/0x68 in Boot Mode: ");
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	362 printHex( key );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	363 print( NL );
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 break;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	367
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	368 case 1: // NKRO Mode
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	369 // Set the modifier bit if this key is a modifier
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	370 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	371 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	372 if ( keyPress )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	373 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	374 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	375 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	376 else // Release
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	377 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	378 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	379 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	380
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	381 USBKeys_Changed \|= USBKeyChangeState_Modifiers;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	382 break;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	383 }
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	384 // First 6 bytes
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	385 else if ( key >= 4 && key <= 49 )
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	386 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	387 // 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	388 // 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	389 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	390 switch ( keyPos )
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 byteLookup( 0 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	393 byteLookup( 1 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	394 byteLookup( 2 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	395 byteLookup( 3 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	396 byteLookup( 4 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	397 byteLookup( 5 );
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	398 }
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	399
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	400 USBKeys_Changed \|= USBKeyChangeState_MainKeys;
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	401 }
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	402 // Next 14 bytes
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	403 else if ( key >= 51 && key <= 155 )
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	404 {
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	405 // Lookup (otherwise division or multiple checks are needed to do alignment)
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	406 // 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	407 uint8_t keyPos = key + (6 * 8 - 51); // Starting position in array
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	408 switch ( keyPos )
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	409 {
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	410 byteLookup( 6 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	411 byteLookup( 7 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	412 byteLookup( 8 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	413 byteLookup( 9 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	414 byteLookup( 10 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	415 byteLookup( 11 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	416 byteLookup( 12 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	417 byteLookup( 13 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	418 byteLookup( 14 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	419 byteLookup( 15 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	420 byteLookup( 16 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	421 byteLookup( 17 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	422 byteLookup( 18 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	423 byteLookup( 19 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	424 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	425
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	426 USBKeys_Changed \|= USBKeyChangeState_SecondaryKeys;
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	427 }
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	428 // Next byte
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	429 else if ( key >= 157 && key <= 164 )
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	430 {
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	431 // Lookup (otherwise division or multiple checks are needed to do alignment)
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	432 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	433 switch ( keyPos )
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	434 {
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	435 byteLookup( 20 );
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	436 }
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	437
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	438 USBKeys_Changed \|= USBKeyChangeState_TertiaryKeys;
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	439 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	440 // Last 6 bytes
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	441 else if ( key >= 176 && key <= 221 )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	442 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	443 // 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	444 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	445 switch ( keyPos )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	446 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	447 byteLookup( 21 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	448 byteLookup( 22 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	449 byteLookup( 23 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	450 byteLookup( 24 );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	451 byteLookup( 25 );
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	452 byteLookup( 26 );
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	453 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	454
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	455 USBKeys_Changed \|= USBKeyChangeState_QuartiaryKeys;
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	456 }
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	457 // Received 0x00
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	458 // This is a special USB Code that internally indicates a "break"
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	459 // 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	460 else if ( key == 0x00 )
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	461 {
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	462 USBKeys_Changed \|= USBKeyChangeState_MainKeys;
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	463
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	464 // Also flush out buffers just in case
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	465 Output_flushBuffers();
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	466 break;
227 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 // Invalid key
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	469 else
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	470 {
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	471 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	472 printHex( key );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	473 print( NL );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	474 break;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	475 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	476
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	477 // Set/Unset
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	478 if ( keyPress )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	479 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	480 USBKeys_Keys[bytePosition] \|= (1 << byteShift);
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	481 USBKeys_Sent++;
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 else // Release
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	484 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	485 USBKeys_Keys[bytePosition] &= ~(1 << byteShift);
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	486 USBKeys_Sent++;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	487 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	488
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	489 break;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	490 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	491 }
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	492
370 39e338a6733d Fixing default ErgoDox layout and adding FlashMode button Jacob Alexander <haata@kiibohd.com> parents: 347 diff changeset	493 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	494 {
39e338a6733d Fixing default ErgoDox layout and adding FlashMode button Jacob Alexander <haata@kiibohd.com> parents: 347 diff changeset	495 // Display capability name
39e338a6733d Fixing default ErgoDox layout and adding FlashMode button Jacob Alexander <haata@kiibohd.com> parents: 347 diff changeset	496 if ( stateType == 0xFF && state == 0xFF )
39e338a6733d Fixing default ErgoDox layout and adding FlashMode button Jacob Alexander <haata@kiibohd.com> parents: 347 diff changeset	497 {
39e338a6733d Fixing default ErgoDox layout and adding FlashMode button Jacob Alexander <haata@kiibohd.com> parents: 347 diff changeset	498 print("Output_flashMode(usbCode)");
39e338a6733d Fixing default ErgoDox layout and adding FlashMode button Jacob Alexander <haata@kiibohd.com> parents: 347 diff changeset	499 return;
39e338a6733d Fixing default ErgoDox layout and adding FlashMode button Jacob Alexander <haata@kiibohd.com> parents: 347 diff changeset	500 }
39e338a6733d Fixing default ErgoDox layout and adding FlashMode button Jacob Alexander <haata@kiibohd.com> parents: 347 diff changeset	501
39e338a6733d Fixing default ErgoDox layout and adding FlashMode button Jacob Alexander <haata@kiibohd.com> parents: 347 diff changeset	502 // Start flash mode
39e338a6733d Fixing default ErgoDox layout and adding FlashMode button Jacob Alexander <haata@kiibohd.com> parents: 347 diff changeset	503 Output_firmwareReload();
39e338a6733d Fixing default ErgoDox layout and adding FlashMode button Jacob Alexander <haata@kiibohd.com> parents: 347 diff changeset	504 }
39e338a6733d Fixing default ErgoDox layout and adding FlashMode button Jacob Alexander <haata@kiibohd.com> parents: 347 diff changeset	505
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	506
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	507
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	508 // ----- Functions -----
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	509
300 7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	510 // Flush Key buffers
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	511 void Output_flushBuffers()
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	512 {
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	513 // Zero out USBKeys_Keys array
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	514 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	515 USBKeys_Keys[ c ] = 0;
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	516
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	517 // Zero out other key buffers
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	518 USBKeys_ConsCtrl = 0;
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	519 USBKeys_Modifiers = 0;
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	520 USBKeys_SysCtrl = 0;
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	521 }
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	522
7119c2149abb Fixing compiler errors for usbMuxUart Output module Jacob Alexander <haata@kiibohd.com> parents: 275 diff changeset	523
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	524 // USB Module Setup
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	525 inline void Output_setup()
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	526 {
230 d81ad399c14f Adding clear screen before usb initializes Jacob Alexander <haata@kiibohd.com> parents: 227 diff changeset	527 // Setup UART
d81ad399c14f Adding clear screen before usb initializes Jacob Alexander <haata@kiibohd.com> parents: 227 diff changeset	528 uart_serial_setup();
d81ad399c14f Adding clear screen before usb initializes Jacob Alexander <haata@kiibohd.com> parents: 227 diff changeset	529
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	530 // Initialize the USB
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	531 // If a USB connection does not exist, just ignore it
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	532 // All usb related functions will non-fatally fail if called
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	533 // 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	534 usb_init();
175 c70f641581b5 McHCK USB WORKS!! Jacob Alexander <haata@kiibohd.com> parents: 173 diff changeset	535
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	536 // Register USB Output CLI dictionary
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	537 CLI_registerDictionary( outputCLIDict, outputCLIDictName );
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	538
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	539 // Flush key buffers
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	540 Output_flushBuffers();
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	541 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	542
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	543
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	544 // USB Data Send
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	545 inline void Output_send()
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	546 {
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	547 // Boot Mode Only, unset stale keys
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	548 if ( USBKeys_Protocol == 0 )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	549 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	550 USBKeys_Keys[c] = 0;
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	551
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	552 // Send keypresses while there are pending changes
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	553 while ( USBKeys_Changed )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	554 usb_keyboard_send();
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	555
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	556 // Clear keys sent
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	557 USBKeys_Sent = 0;
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	558
186 50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: 178 diff changeset	559 // Signal Scan Module we are finished
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	560 switch ( USBKeys_Protocol )
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	561 {
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	562 case 0: // Boot Mode
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	563 // Clear modifiers only in boot mode
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	564 USBKeys_Modifiers = 0;
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	565 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	566 break;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	567 case 1: // NKRO Mode
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	568 Scan_finishedWithOutput( USBKeys_Sent );
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	569 break;
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	570 }
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	571 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	572
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	573
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	574 // Sets the device into firmware reload mode
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	575 void Output_firmwareReload()
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	576 {
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	577 usb_device_reload();
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	578 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	579
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	580
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	581 // USB Input buffer available
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	582 inline unsigned int Output_availablechar()
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	583 {
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	584 return usb_serial_available() + uart_serial_available();
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	585 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	586
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	587
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	588 // USB Get Character from input buffer
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	589 inline int Output_getchar()
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	590 {
178 555d70c6764d Removing unnecessary ifdefs Jacob Alexander <haata@kiibohd.com> parents: 175 diff changeset	591 // 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	592 if ( usb_serial_available() > 0 )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	593 {
178 555d70c6764d Removing unnecessary ifdefs Jacob Alexander <haata@kiibohd.com> parents: 175 diff changeset	594 return (int)usb_serial_getchar();
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	595 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	596
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	597 if ( uart_serial_available() > 0 )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	598 {
178 555d70c6764d Removing unnecessary ifdefs Jacob Alexander <haata@kiibohd.com> parents: 175 diff changeset	599 return (int)uart_serial_getchar();
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	600 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	601
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	602 return -1;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	603 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	604
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	605
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	606 // USB Send Character to output buffer
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	607 inline int Output_putchar( char c )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	608 {
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	609 // First send to UART
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	610 uart_serial_putchar( c );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	611
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	612 // Then send to USB
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	613 return usb_serial_putchar( c );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	614 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	615
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	616
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	617 // 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	618 inline int Output_putstr( char* str )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	619 {
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	620 #if defined(_at90usb162_) \|\| defined(_atmega32u4_) \|\| defined(_at90usb646_) \|\| defined(_at90usb1286_) // AVR
178 555d70c6764d Removing unnecessary ifdefs Jacob Alexander <haata@kiibohd.com> parents: 175 diff changeset	621 uint16_t count = 0;
263 9afed592bcb5 Preparing for mk20dx256vlh7 Jacob Alexander <haata@kiibohd.com> parents: 239 diff changeset	622 #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	623 uint32_t count = 0;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	624 #endif
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	625 // 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	626 while ( str[count] != '\0' )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	627 count++;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	628
173 afd0f94023ff Fixed bug with standalone UART CLI Jacob Alexander <haata@kiibohd.com> parents: 172 diff changeset	629 // First send to UART
afd0f94023ff Fixed bug with standalone UART CLI Jacob Alexander <haata@kiibohd.com> parents: 172 diff changeset	630 uart_serial_write( str, count );
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	631
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	632 // Then send to USB
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	633 return usb_serial_write( str, count );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	634 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	635
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	636
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	637 // Soft Chip Reset
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	638 inline void Output_softReset()
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	639 {
178 555d70c6764d Removing unnecessary ifdefs Jacob Alexander <haata@kiibohd.com> parents: 175 diff changeset	640 usb_device_software_reset();
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 // ----- CLI Command Functions -----
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	645
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	646 void cliFunc_kbdProtocol( char* args )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	647 {
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	648 print( NL );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	649 info_msg("Keyboard Protocol: ");
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	650 printInt8( USBKeys_Protocol );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	651 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	652
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	653
347 136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	654 void cliFunc_outputDebug( char* args )
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	655 {
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	656 // Parse number from argument
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	657 // NOTE: Only first argument is used
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	658 char* arg1Ptr;
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	659 char* arg2Ptr;
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	660 CLI_argumentIsolation( args, &arg1Ptr, &arg2Ptr );
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	661
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	662 // Default to 1 if no argument is given
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	663 Output_DebugMode = 1;
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	664
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	665 if ( arg1Ptr[0] != '\0' )
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	666 {
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	667 Output_DebugMode = (uint16_t)numToInt( arg1Ptr );
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	668 }
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	669 }
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	670
136e47478441 UARTConnect enumeration working! Jacob Alexander <haata@kiibohd.com> parents: 340 diff changeset	671
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	672 void cliFunc_readLEDs( char* args )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	673 {
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	674 print( NL );
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	675 info_msg("LED State: ");
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	676 printInt8( USBKeys_LEDs );
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
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	679
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	680 void cliFunc_readUART( char* args )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	681 {
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	682 print( NL );
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 // Read UART buffer until empty
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	685 while ( uart_serial_available() > 0 )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	686 {
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	687 char out[] = { (char)uart_serial_getchar(), '\0' };
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	688 dPrint( out );
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
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	693 void cliFunc_sendKeys( char* args )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	694 {
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	695 // Copy USBKeys_KeysCLI to USBKeys_Keys
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	696 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	697 {
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	698 // TODO
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	699 //USBKeys_Keys[key] = USBKeys_KeysCLI[key];
172 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 USBKeys_Sent = USBKeys_SentCLI;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	702
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	703 // Set modifier byte
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	704 USBKeys_Modifiers = USBKeys_ModifiersCLI;
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
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 void cliFunc_sendUART( char* args )
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 // Write all args to UART
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	711 uart_serial_write( args, lenStr( args ) );
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
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	714
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	715 void cliFunc_setKeys( char* args )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	716 {
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	717 char* curArgs;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	718 char* arg1Ptr;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	719 char* arg2Ptr = args;
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 // Parse up to USBKeys_MaxSize args (whichever is least)
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	722 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	723 {
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	724 curArgs = arg2Ptr;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	725 CLI_argumentIsolation( curArgs, &arg1Ptr, &arg2Ptr );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	726
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	727 // 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	728 if ( *arg1Ptr == '\0' )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	729 break;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	730
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	731 // Add the USB code to be sent
227 ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	732 // TODO
ed05fa3555d4 Updating usbMuxUart for NKRO Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	733 //USBKeys_KeysCLI[USBKeys_SentCLI] = numToInt( arg1Ptr );
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	734 }
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
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	737
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	738 void cliFunc_setMod( char* args )
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 // Parse number from argument
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	741 // NOTE: Only first argument is used
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	742 char* arg1Ptr;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	743 char* arg2Ptr;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	744 CLI_argumentIsolation( args, &arg1Ptr, &arg2Ptr );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	745
195 58cfcb7bac88 Changing decToInt to numToInt (adds support for Hex number interpreter) Jacob Alexander <haata@kiibohd.com> parents: 192 diff changeset	746 USBKeys_ModifiersCLI = numToInt( arg1Ptr );
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	747 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	748

Mercurial > louis > kiibohd-controller

annotate Output/usbMuxUart/output_com.c @ 370:39e338a6733d