louis/kiibohd-controller: Output/pjrcUSB/output

annotate Output/pjrcUSB/output_com.c @ 453:98bbee08f005 default tip louis

Setup hgignore, volume/brightness up/down, sysreq still not working

author	Louis Opter <kalessin@kalessin.fr>
date	Wed, 13 Jul 2016 23:16:49 -0700
parents	45feb80a2ad1
children

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

Mercurial > louis > kiibohd-controller

annotate Output/pjrcUSB/output_com.c @ 453:98bbee08f005 default tip louis