annotate Output/usbMuxUart/output_com.c @ 340:e8841d3c6db5

mk20dx256vlh7 working! - Interrupt vector table position fix (affected everything in the firmware) - Added fault debug messages - Fixed usbMuxUart
author Jacob Alexander <haata@kiibohd.com>
date Sat, 13 Jun 2015 20:42:12 -0700
parents a6bafeb5fecf
children 136e47478441
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
275
d5bf41d7f7ef Initial code for USB cable detection
Jacob Alexander <haata@kiibohd.com>
parents: 263
diff changeset
1 /* Copyright (C) 2014-2015 by Jacob Alexander
172
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
2 *
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
3 * Permission is hereby granted, free of charge, to any person obtaining a copy
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
4 * of this software and associated documentation files (the "Software"), to deal
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
5 * in the Software without restriction, including without limitation the rights
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
6 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
7 * copies of the Software, and to permit persons to whom the Software is
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
8 * furnished to do so, subject to the following conditions:
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
9 *
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
10 * The above copyright notice and this permission notice shall be included in
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
11 * all copies or substantial portions of the Software.
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
12 *
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
13 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
14 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
15 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
16 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
17 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
18 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
19 * THE SOFTWARE.
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
20 */
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
21
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
22 // ----- Includes -----
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
23
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
24 // Compiler Includes
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
25 #include <Lib/OutputLib.h>
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
26
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
27 // Project Includes
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
28 #include <cli.h>
227
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
29 #include <led.h>
172
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
30 #include <print.h>
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
31 #include <scan_loop.h>
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
32
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
33 // USB Includes
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
34 #if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_)
263
9afed592bcb5 Preparing for mk20dx256vlh7
Jacob Alexander <haata@kiibohd.com>
parents: 239
diff changeset
35 #elif defined(_mk20dx128_) || defined(_mk20dx128vlf5_) || defined(_mk20dx256_) || defined(_mk20dx256vlh7_)
300
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
36 #include <arm/uart_serial.h>
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
37 #include <arm/usb_dev.h>
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
38 #include <arm/usb_keyboard.h>
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
39 #include <arm/usb_serial.h>
172
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
40 #endif
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
41
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
42 // Local Includes
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
43 #include "output_com.h"
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
44
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
45
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
46
227
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
47 // ----- Macros -----
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
48
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
49 // Used to build a bitmap lookup table from a byte addressable array
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
50 #define byteLookup( byte ) case (( byte ) * ( 8 )): bytePosition = byte; byteShift = 0; break; \
310
a6bafeb5fecf Fix whitespace pt2
Rowan Decker <Smasher816@gmail.com>
parents: 309
diff changeset
51 case (( byte ) * ( 8 ) + ( 1 )): bytePosition = byte; byteShift = 1; break; \
a6bafeb5fecf Fix whitespace pt2
Rowan Decker <Smasher816@gmail.com>
parents: 309
diff changeset
52 case (( byte ) * ( 8 ) + ( 2 )): bytePosition = byte; byteShift = 2; break; \
a6bafeb5fecf Fix whitespace pt2
Rowan Decker <Smasher816@gmail.com>
parents: 309
diff changeset
53 case (( byte ) * ( 8 ) + ( 3 )): bytePosition = byte; byteShift = 3; break; \
a6bafeb5fecf Fix whitespace pt2
Rowan Decker <Smasher816@gmail.com>
parents: 309
diff changeset
54 case (( byte ) * ( 8 ) + ( 4 )): bytePosition = byte; byteShift = 4; break; \
a6bafeb5fecf Fix whitespace pt2
Rowan Decker <Smasher816@gmail.com>
parents: 309
diff changeset
55 case (( byte ) * ( 8 ) + ( 5 )): bytePosition = byte; byteShift = 5; break; \
a6bafeb5fecf Fix whitespace pt2
Rowan Decker <Smasher816@gmail.com>
parents: 309
diff changeset
56 case (( byte ) * ( 8 ) + ( 6 )): bytePosition = byte; byteShift = 6; break; \
a6bafeb5fecf Fix whitespace pt2
Rowan Decker <Smasher816@gmail.com>
parents: 309
diff changeset
57 case (( byte ) * ( 8 ) + ( 7 )): bytePosition = byte; byteShift = 7; break
227
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
58
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
59
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
60
172
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
61 // ----- Function Declarations -----
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
62
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
63 void cliFunc_kbdProtocol( char* args );
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
64 void cliFunc_readLEDs ( char* args );
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
65 void cliFunc_readUART ( char* args );
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
66 void cliFunc_sendKeys ( char* args );
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
67 void cliFunc_sendUART ( char* args );
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
68 void cliFunc_setKeys ( char* args );
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
69 void cliFunc_setMod ( char* args );
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
70
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
71
227
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
72
172
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
73 // ----- Variables -----
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
74
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
75 // Output Module command dictionary
239
2a4c99da1276 HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents: 230
diff changeset
76 CLIDict_Entry( kbdProtocol, "Keyboard Protocol Mode: 0 - Boot, 1 - OS/NKRO Mode" );
2a4c99da1276 HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents: 230
diff changeset
77 CLIDict_Entry( readLEDs, "Read LED byte:" NL "\t\t1 NumLck, 2 CapsLck, 4 ScrlLck, 16 Kana, etc." );
2a4c99da1276 HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents: 230
diff changeset
78 CLIDict_Entry( readUART, "Read UART buffer until empty." );
2a4c99da1276 HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents: 230
diff changeset
79 CLIDict_Entry( sendKeys, "Send the prepared list of USB codes and modifier byte." );
2a4c99da1276 HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents: 230
diff changeset
80 CLIDict_Entry( sendUART, "Send characters over UART0." );
2a4c99da1276 HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents: 230
diff changeset
81 CLIDict_Entry( setKeys, "Prepare a space separated list of USB codes (decimal). Waits until \033[35msendKeys\033[0m." );
2a4c99da1276 HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents: 230
diff changeset
82 CLIDict_Entry( setMod, "Set the modfier byte:" NL "\t\t1 LCtrl, 2 LShft, 4 LAlt, 8 LGUI, 16 RCtrl, 32 RShft, 64 RAlt, 128 RGUI" );
2a4c99da1276 HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents: 230
diff changeset
83
2a4c99da1276 HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents: 230
diff changeset
84 CLIDict_Def( outputCLIDict, "USB Module Commands" ) = {
2a4c99da1276 HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents: 230
diff changeset
85 CLIDict_Item( kbdProtocol ),
2a4c99da1276 HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents: 230
diff changeset
86 CLIDict_Item( readLEDs ),
2a4c99da1276 HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents: 230
diff changeset
87 CLIDict_Item( readUART ),
2a4c99da1276 HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents: 230
diff changeset
88 CLIDict_Item( sendKeys ),
2a4c99da1276 HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents: 230
diff changeset
89 CLIDict_Item( sendUART ),
2a4c99da1276 HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents: 230
diff changeset
90 CLIDict_Item( setKeys ),
2a4c99da1276 HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents: 230
diff changeset
91 CLIDict_Item( setMod ),
172
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
92 { 0, 0, 0 } // Null entry for dictionary end
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
93 };
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
94
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
95
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
96 // Which modifier keys are currently pressed
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
97 // 1=left ctrl, 2=left shift, 4=left alt, 8=left gui
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
98 // 16=right ctrl, 32=right shift, 64=right alt, 128=right gui
308
ab4515606277 Fix whitespace
Rowan Decker <Smasher816@gmail.com>
parents: 275
diff changeset
99 uint8_t USBKeys_Modifiers = 0;
ab4515606277 Fix whitespace
Rowan Decker <Smasher816@gmail.com>
parents: 275
diff changeset
100 uint8_t USBKeys_ModifiersCLI = 0; // Separate CLI send buffer
172
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
101
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
102 // Currently pressed keys, max is defined by USB_MAX_KEY_SEND
308
ab4515606277 Fix whitespace
Rowan Decker <Smasher816@gmail.com>
parents: 275
diff changeset
103 uint8_t USBKeys_Keys [USB_NKRO_BITFIELD_SIZE_KEYS];
ab4515606277 Fix whitespace
Rowan Decker <Smasher816@gmail.com>
parents: 275
diff changeset
104 uint8_t USBKeys_KeysCLI[USB_NKRO_BITFIELD_SIZE_KEYS]; // Separate CLI send buffer
227
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
105
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
106 // System Control and Consumer Control 1KRO containers
308
ab4515606277 Fix whitespace
Rowan Decker <Smasher816@gmail.com>
parents: 275
diff changeset
107 uint8_t USBKeys_SysCtrl;
ab4515606277 Fix whitespace
Rowan Decker <Smasher816@gmail.com>
parents: 275
diff changeset
108 uint16_t USBKeys_ConsCtrl;
172
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
109
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
110 // The number of keys sent to the usb in the array
308
ab4515606277 Fix whitespace
Rowan Decker <Smasher816@gmail.com>
parents: 275
diff changeset
111 uint8_t USBKeys_Sent = 0;
ab4515606277 Fix whitespace
Rowan Decker <Smasher816@gmail.com>
parents: 275
diff changeset
112 uint8_t USBKeys_SentCLI = 0;
172
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
113
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
114 // 1=num lock, 2=caps lock, 4=scroll lock, 8=compose, 16=kana
227
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
115 volatile uint8_t USBKeys_LEDs = 0;
172
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
116
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
117 // Protocol setting from the host.
227
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
118 // 0 - Boot Mode
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
119 // 1 - NKRO Mode (Default, unless set by a BIOS or boot interface)
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
120 volatile uint8_t USBKeys_Protocol = 0;
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
121
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
122 // Indicate if USB should send update
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
123 // OS only needs update if there has been a change in state
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
124 USBKeyChangeState USBKeys_Changed = USBKeyChangeState_None;
172
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
125
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
126 // the idle configuration, how often we send the report to the
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
127 // host (ms * 4) even when it hasn't changed
308
ab4515606277 Fix whitespace
Rowan Decker <Smasher816@gmail.com>
parents: 275
diff changeset
128 uint8_t USBKeys_Idle_Config = 125;
172
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
129
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
130 // count until idle timeout
308
ab4515606277 Fix whitespace
Rowan Decker <Smasher816@gmail.com>
parents: 275
diff changeset
131 uint8_t USBKeys_Idle_Count = 0;
227
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
132
275
d5bf41d7f7ef Initial code for USB cable detection
Jacob Alexander <haata@kiibohd.com>
parents: 263
diff changeset
133 // Indicates whether the Output module is fully functional
d5bf41d7f7ef Initial code for USB cable detection
Jacob Alexander <haata@kiibohd.com>
parents: 263
diff changeset
134 // 0 - Not fully functional, 1 - Fully functional
d5bf41d7f7ef Initial code for USB cable detection
Jacob Alexander <haata@kiibohd.com>
parents: 263
diff changeset
135 // 0 is often used to show that a USB cable is not plugged in (but has power)
308
ab4515606277 Fix whitespace
Rowan Decker <Smasher816@gmail.com>
parents: 275
diff changeset
136 uint8_t Output_Available = 0;
275
d5bf41d7f7ef Initial code for USB cable detection
Jacob Alexander <haata@kiibohd.com>
parents: 263
diff changeset
137
300
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
138 // Debug control variable for Output modules
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
139 // 0 - Debug disabled (default)
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
140 // 1 - Debug enabled
310
a6bafeb5fecf Fix whitespace pt2
Rowan Decker <Smasher816@gmail.com>
parents: 309
diff changeset
141 uint8_t Output_DebugMode = 0;
300
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
142
227
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
143
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
144
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
145 // ----- Capabilities -----
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
146
300
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
147 // Set Boot Keyboard Protocol
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
148 void Output_kbdProtocolBoot_capability( uint8_t state, uint8_t stateType, uint8_t *args )
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
149 {
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
150 // Display capability name
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
151 if ( stateType == 0xFF && state == 0xFF )
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
152 {
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
153 print("Output_kbdProtocolBoot()");
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
154 return;
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
155 }
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
156
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
157 // Only set if necessary
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
158 if ( USBKeys_Protocol == 0 )
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
159 return;
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
160
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
161 // TODO Analog inputs
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
162 // Only set on key press
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
163 if ( stateType != 0x01 )
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
164 return;
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
165
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
166 // Flush the key buffers
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
167 Output_flushBuffers();
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
168
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
169 // Set the keyboard protocol to Boot Mode
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
170 USBKeys_Protocol = 0;
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
171 }
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
172
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
173
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
174 // Set NKRO Keyboard Protocol
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
175 void Output_kbdProtocolNKRO_capability( uint8_t state, uint8_t stateType, uint8_t *args )
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
176 {
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
177 // Display capability name
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
178 if ( stateType == 0xFF && state == 0xFF )
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
179 {
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
180 print("Output_kbdProtocolNKRO()");
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
181 return;
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
182 }
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
183
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
184 // Only set if necessary
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
185 if ( USBKeys_Protocol == 1 )
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
186 return;
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
187
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
188 // TODO Analog inputs
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
189 // Only set on key press
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
190 if ( stateType != 0x01 )
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
191 return;
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
192
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
193 // Flush the key buffers
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
194 Output_flushBuffers();
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
195
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
196 // Set the keyboard protocol to NKRO Mode
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
197 USBKeys_Protocol = 1;
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
198 }
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
199
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
200
227
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
201 // Sends a Consumer Control code to the USB Output buffer
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
202 void Output_consCtrlSend_capability( uint8_t state, uint8_t stateType, uint8_t *args )
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
203 {
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
204 // Display capability name
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
205 if ( stateType == 0xFF && state == 0xFF )
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
206 {
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
207 print("Output_consCtrlSend(consCode)");
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
208 return;
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
209 }
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
210
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
211 // Not implemented in Boot Mode
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
212 if ( USBKeys_Protocol == 0 )
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
213 {
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
214 warn_print("Consumer Control is not implemented for Boot Mode");
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
215 return;
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
216 }
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
217
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
218 // TODO Analog inputs
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
219 // Only indicate USB has changed if either a press or release has occured
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
220 if ( state == 0x01 || state == 0x03 )
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
221 USBKeys_Changed |= USBKeyChangeState_Consumer;
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
222
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
223 // Only send keypresses if press or hold state
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
224 if ( stateType == 0x00 && state == 0x03 ) // Release state
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
225 return;
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
226
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
227 // Set consumer control code
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
228 USBKeys_ConsCtrl = *(uint16_t*)(&args[0]);
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
229 }
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
230
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
231
340
e8841d3c6db5 mk20dx256vlh7 working!
Jacob Alexander <haata@kiibohd.com>
parents: 310
diff changeset
232 // Ignores the given key status update
e8841d3c6db5 mk20dx256vlh7 working!
Jacob Alexander <haata@kiibohd.com>
parents: 310
diff changeset
233 // Used to prevent fall-through, this is the None keyword in KLL
e8841d3c6db5 mk20dx256vlh7 working!
Jacob Alexander <haata@kiibohd.com>
parents: 310
diff changeset
234 void Output_noneSend_capability( uint8_t state, uint8_t stateType, uint8_t *args )
e8841d3c6db5 mk20dx256vlh7 working!
Jacob Alexander <haata@kiibohd.com>
parents: 310
diff changeset
235 {
e8841d3c6db5 mk20dx256vlh7 working!
Jacob Alexander <haata@kiibohd.com>
parents: 310
diff changeset
236 // Display capability name
e8841d3c6db5 mk20dx256vlh7 working!
Jacob Alexander <haata@kiibohd.com>
parents: 310
diff changeset
237 if ( stateType == 0xFF && state == 0xFF )
e8841d3c6db5 mk20dx256vlh7 working!
Jacob Alexander <haata@kiibohd.com>
parents: 310
diff changeset
238 {
e8841d3c6db5 mk20dx256vlh7 working!
Jacob Alexander <haata@kiibohd.com>
parents: 310
diff changeset
239 print("Output_noneSend()");
e8841d3c6db5 mk20dx256vlh7 working!
Jacob Alexander <haata@kiibohd.com>
parents: 310
diff changeset
240 return;
e8841d3c6db5 mk20dx256vlh7 working!
Jacob Alexander <haata@kiibohd.com>
parents: 310
diff changeset
241 }
e8841d3c6db5 mk20dx256vlh7 working!
Jacob Alexander <haata@kiibohd.com>
parents: 310
diff changeset
242
e8841d3c6db5 mk20dx256vlh7 working!
Jacob Alexander <haata@kiibohd.com>
parents: 310
diff changeset
243 // Nothing to do, because that's the point :P
e8841d3c6db5 mk20dx256vlh7 working!
Jacob Alexander <haata@kiibohd.com>
parents: 310
diff changeset
244 }
e8841d3c6db5 mk20dx256vlh7 working!
Jacob Alexander <haata@kiibohd.com>
parents: 310
diff changeset
245
e8841d3c6db5 mk20dx256vlh7 working!
Jacob Alexander <haata@kiibohd.com>
parents: 310
diff changeset
246
227
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
247 // Sends a System Control code to the USB Output buffer
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
248 void Output_sysCtrlSend_capability( uint8_t state, uint8_t stateType, uint8_t *args )
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
249 {
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
250 // Display capability name
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
251 if ( stateType == 0xFF && state == 0xFF )
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
252 {
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
253 print("Output_sysCtrlSend(sysCode)");
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
254 return;
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
255 }
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
256
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
257 // Not implemented in Boot Mode
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
258 if ( USBKeys_Protocol == 0 )
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
259 {
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
260 warn_print("System Control is not implemented for Boot Mode");
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
261 return;
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
262 }
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
263
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
264 // TODO Analog inputs
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
265 // Only indicate USB has changed if either a press or release has occured
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
266 if ( state == 0x01 || state == 0x03 )
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
267 USBKeys_Changed |= USBKeyChangeState_System;
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
268
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
269 // Only send keypresses if press or hold state
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
270 if ( stateType == 0x00 && state == 0x03 ) // Release state
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
271 return;
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
272
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
273 // Set system control code
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
274 USBKeys_SysCtrl = args[0];
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
275 }
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
276
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
277
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
278 // Adds a single USB Code to the USB Output buffer
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
279 // Argument #1: USB Code
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
280 void Output_usbCodeSend_capability( uint8_t state, uint8_t stateType, uint8_t *args )
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
281 {
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
282 // Display capability name
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
283 if ( stateType == 0xFF && state == 0xFF )
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
284 {
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
285 print("Output_usbCodeSend(usbCode)");
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
286 return;
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
287 }
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
288
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
289 // Depending on which mode the keyboard is in the USB needs Press/Hold/Release events
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
290 uint8_t keyPress = 0; // Default to key release, only used for NKRO
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
291 switch ( USBKeys_Protocol )
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
292 {
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
293 case 0: // Boot Mode
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
294 // TODO Analog inputs
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
295 // Only indicate USB has changed if either a press or release has occured
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
296 if ( state == 0x01 || state == 0x03 )
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
297 USBKeys_Changed = USBKeyChangeState_MainKeys;
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
298
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
299 // Only send keypresses if press or hold state
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
300 if ( stateType == 0x00 && state == 0x03 ) // Release state
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
301 return;
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
302 break;
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
303 case 1: // NKRO Mode
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
304 // Only send press and release events
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
305 if ( stateType == 0x00 && state == 0x02 ) // Hold state
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
306 return;
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
307
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
308 // Determine if setting or unsetting the bitfield (press == set)
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
309 if ( stateType == 0x00 && state == 0x01 ) // Press state
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
310 keyPress = 1;
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
311 break;
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
312 }
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
313
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
314 // Get the keycode from arguments
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
315 uint8_t key = args[0];
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
316
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
317 // Depending on which mode the keyboard is in, USBKeys_Keys array is used differently
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
318 // Boot mode - Maximum of 6 byte codes
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
319 // NKRO mode - Each bit of the 26 byte corresponds to a key
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
320 // Bits 0 - 160 (first 20 bytes) correspond to USB Codes 4 - 164
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
321 // Bits 161 - 205 (last 6 bytes) correspond to USB Codes 176 - 221
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
322 // Bits 206 - 208 (last byte) correspond to the 3 padded bits in USB (unused)
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
323 uint8_t bytePosition = 0;
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
324 uint8_t byteShift = 0;
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
325 switch ( USBKeys_Protocol )
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
326 {
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
327 case 0: // Boot Mode
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
328 // Set the modifier bit if this key is a modifier
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
329 if ( (key & 0xE0) == 0xE0 ) // AND with 0xE0 (Left Ctrl, first modifier)
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
330 {
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
331 USBKeys_Modifiers |= 1 << (key ^ 0xE0); // Left shift 1 by key XOR 0xE0
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
332 }
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
333 // Normal USB Code
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
334 else
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
335 {
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
336 // USB Key limit reached
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
337 if ( USBKeys_Sent >= USB_BOOT_MAX_KEYS )
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
338 {
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
339 warn_print("USB Key limit reached");
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
340 return;
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
341 }
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
342
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
343 // Make sure key is within the USB HID range
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
344 if ( key <= 104 )
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
345 {
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
346 USBKeys_Keys[USBKeys_Sent++] = key;
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
347 }
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
348 // Invalid key
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
349 else
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
350 {
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
351 warn_msg("USB Code above 104/0x68 in Boot Mode: ");
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
352 printHex( key );
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
353 print( NL );
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
354 }
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
355 }
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
356 break;
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
357
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
358 case 1: // NKRO Mode
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
359 // Set the modifier bit if this key is a modifier
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
360 if ( (key & 0xE0) == 0xE0 ) // AND with 0xE0 (Left Ctrl, first modifier)
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
361 {
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
362 if ( keyPress )
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
363 {
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
364 USBKeys_Modifiers |= 1 << (key ^ 0xE0); // Left shift 1 by key XOR 0xE0
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
365 }
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
366 else // Release
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
367 {
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
368 USBKeys_Modifiers &= ~(1 << (key ^ 0xE0)); // Left shift 1 by key XOR 0xE0
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
369 }
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
370
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
371 USBKeys_Changed |= USBKeyChangeState_Modifiers;
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
372 break;
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
373 }
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
374 // First 20 bytes
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
375 else if ( key >= 4 && key <= 164 )
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
376 {
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
377 // Lookup (otherwise division or multiple checks are needed to do alignment)
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
378 uint8_t keyPos = key - 4; // Starting position in array
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
379 switch ( keyPos )
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
380 {
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
381 byteLookup( 0 );
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
382 byteLookup( 1 );
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
383 byteLookup( 2 );
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
384 byteLookup( 3 );
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
385 byteLookup( 4 );
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
386 byteLookup( 5 );
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
387 byteLookup( 6 );
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
388 byteLookup( 7 );
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
389 byteLookup( 8 );
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
390 byteLookup( 9 );
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
391 byteLookup( 10 );
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
392 byteLookup( 11 );
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
393 byteLookup( 12 );
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
394 byteLookup( 13 );
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
395 byteLookup( 14 );
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
396 byteLookup( 15 );
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
397 byteLookup( 16 );
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
398 byteLookup( 17 );
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
399 byteLookup( 18 );
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
400 byteLookup( 19 );
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
401 }
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
402
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
403 USBKeys_Changed |= USBKeyChangeState_MainKeys;
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
404 }
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
405 // Last 6 bytes
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
406 else if ( key >= 176 && key <= 221 )
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
407 {
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
408 // Lookup (otherwise division or multiple checks are needed to do alignment)
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
409 uint8_t keyPos = key - 176; // Starting position in array
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
410 switch ( keyPos )
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
411 {
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
412 byteLookup( 20 );
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
413 byteLookup( 21 );
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
414 byteLookup( 22 );
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
415 byteLookup( 23 );
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
416 byteLookup( 24 );
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
417 byteLookup( 25 );
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
418 }
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
419
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
420 USBKeys_Changed |= USBKeyChangeState_SecondaryKeys;
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
421 }
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
422 // Invalid key
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
423 else
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
424 {
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
425 warn_msg("USB Code not within 4-164 (0x4-0xA4) or 176-221 (0xB0-0xDD) NKRO Mode: ");
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
426 printHex( key );
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
427 print( NL );
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
428 break;
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
429 }
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
430
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
431 // Set/Unset
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
432 if ( keyPress )
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
433 {
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
434 USBKeys_Keys[bytePosition] |= (1 << byteShift);
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
435 USBKeys_Sent++;
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
436 }
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
437 else // Release
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
438 {
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
439 USBKeys_Keys[bytePosition] &= ~(1 << byteShift);
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
440 USBKeys_Sent++;
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
441 }
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
442
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
443 break;
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
444 }
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
445 }
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
446
172
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
447
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
448
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
449 // ----- Functions -----
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
450
300
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
451 // Flush Key buffers
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
452 void Output_flushBuffers()
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
453 {
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
454 // Zero out USBKeys_Keys array
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
455 for ( uint8_t c = 0; c < USB_NKRO_BITFIELD_SIZE_KEYS; c++ )
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
456 USBKeys_Keys[ c ] = 0;
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
457
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
458 // Zero out other key buffers
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
459 USBKeys_ConsCtrl = 0;
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
460 USBKeys_Modifiers = 0;
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
461 USBKeys_SysCtrl = 0;
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
462 }
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
463
7119c2149abb Fixing compiler errors for usbMuxUart Output module
Jacob Alexander <haata@kiibohd.com>
parents: 275
diff changeset
464
172
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
465 // USB Module Setup
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
466 inline void Output_setup()
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
467 {
230
d81ad399c14f Adding clear screen before usb initializes
Jacob Alexander <haata@kiibohd.com>
parents: 227
diff changeset
468 // Setup UART
d81ad399c14f Adding clear screen before usb initializes
Jacob Alexander <haata@kiibohd.com>
parents: 227
diff changeset
469 uart_serial_setup();
d81ad399c14f Adding clear screen before usb initializes
Jacob Alexander <haata@kiibohd.com>
parents: 227
diff changeset
470 print("\033[2J"); // Clear screen
d81ad399c14f Adding clear screen before usb initializes
Jacob Alexander <haata@kiibohd.com>
parents: 227
diff changeset
471
172
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
472 // Initialize the USB, and then wait for the host to set configuration.
227
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
473 // This will hang forever if USB does not initialize
172
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
474 usb_init();
175
c70f641581b5 McHCK USB WORKS!!
Jacob Alexander <haata@kiibohd.com>
parents: 173
diff changeset
475
227
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
476 while ( !usb_configured() );
172
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
477
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
478 // Register USB Output CLI dictionary
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
479 CLI_registerDictionary( outputCLIDict, outputCLIDictName );
227
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
480
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
481 // Zero out USBKeys_Keys array
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
482 for ( uint8_t c = 0; c < USB_NKRO_BITFIELD_SIZE_KEYS; c++ )
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
483 USBKeys_Keys[ c ] = 0;
172
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
484 }
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
485
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
486
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
487 // USB Data Send
227
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
488 inline void Output_send()
172
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
489 {
227
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
490 // Boot Mode Only, unset stale keys
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
491 if ( USBKeys_Protocol == 0 )
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
492 for ( uint8_t c = USBKeys_Sent; c < USB_BOOT_MAX_KEYS; c++ )
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
493 USBKeys_Keys[c] = 0;
172
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
494
227
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
495 // Send keypresses while there are pending changes
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
496 while ( USBKeys_Changed )
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
497 usb_keyboard_send();
172
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
498
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
499 // Clear modifiers and keys
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
500 USBKeys_Modifiers = 0;
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
501 USBKeys_Sent = 0;
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
502
186
50702debf278 Initial MatrixARM implementation
Jacob Alexander <haata@kiibohd.com>
parents: 178
diff changeset
503 // Signal Scan Module we are finished
227
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
504 switch ( USBKeys_Protocol )
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
505 {
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
506 case 0: // Boot Mode
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
507 Scan_finishedWithOutput( USBKeys_Sent <= USB_BOOT_MAX_KEYS ? USBKeys_Sent : USB_BOOT_MAX_KEYS );
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
508 break;
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
509 case 1: // NKRO Mode
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
510 Scan_finishedWithOutput( USBKeys_Sent );
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
511 break;
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
512 }
172
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
513 }
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
514
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
515
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
516 // Sets the device into firmware reload mode
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
517 inline void Output_firmwareReload()
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
518 {
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
519 uart_device_reload();
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
520 }
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
521
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
522
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
523 // USB Input buffer available
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
524 inline unsigned int Output_availablechar()
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
525 {
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
526 return usb_serial_available() + uart_serial_available();
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
527 }
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
528
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
529
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
530 // USB Get Character from input buffer
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
531 inline int Output_getchar()
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
532 {
178
555d70c6764d Removing unnecessary ifdefs
Jacob Alexander <haata@kiibohd.com>
parents: 175
diff changeset
533 // XXX Make sure to check output_availablechar() first! Information is lost with the cast (error codes) (AVR)
172
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
534 if ( usb_serial_available() > 0 )
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
535 {
178
555d70c6764d Removing unnecessary ifdefs
Jacob Alexander <haata@kiibohd.com>
parents: 175
diff changeset
536 return (int)usb_serial_getchar();
172
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
537 }
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
538
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
539 if ( uart_serial_available() > 0 )
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
540 {
178
555d70c6764d Removing unnecessary ifdefs
Jacob Alexander <haata@kiibohd.com>
parents: 175
diff changeset
541 return (int)uart_serial_getchar();
172
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
542 }
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
543
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
544 return -1;
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
545 }
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
546
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
547
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
548 // USB Send Character to output buffer
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
549 inline int Output_putchar( char c )
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
550 {
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
551 // First send to UART
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
552 uart_serial_putchar( c );
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
553
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
554 // Then send to USB
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
555 return usb_serial_putchar( c );
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
556 }
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
557
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
558
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
559 // USB Send String to output buffer, null terminated
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
560 inline int Output_putstr( char* str )
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
561 {
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
562 #if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) // AVR
178
555d70c6764d Removing unnecessary ifdefs
Jacob Alexander <haata@kiibohd.com>
parents: 175
diff changeset
563 uint16_t count = 0;
263
9afed592bcb5 Preparing for mk20dx256vlh7
Jacob Alexander <haata@kiibohd.com>
parents: 239
diff changeset
564 #elif defined(_mk20dx128_) || defined(_mk20dx128vlf5_) || defined(_mk20dx256_) || defined(_mk20dx256vlh7_) // ARM
172
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
565 uint32_t count = 0;
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
566 #endif
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
567 // Count characters until NULL character, then send the amount counted
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
568 while ( str[count] != '\0' )
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
569 count++;
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
570
173
afd0f94023ff Fixed bug with standalone UART CLI
Jacob Alexander <haata@kiibohd.com>
parents: 172
diff changeset
571 // First send to UART
afd0f94023ff Fixed bug with standalone UART CLI
Jacob Alexander <haata@kiibohd.com>
parents: 172
diff changeset
572 uart_serial_write( str, count );
172
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
573
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
574 // Then send to USB
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
575 return usb_serial_write( str, count );
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
576 }
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
577
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
578
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
579 // Soft Chip Reset
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
580 inline void Output_softReset()
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
581 {
178
555d70c6764d Removing unnecessary ifdefs
Jacob Alexander <haata@kiibohd.com>
parents: 175
diff changeset
582 usb_device_software_reset();
172
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
583 }
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
584
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
585
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
586 // ----- CLI Command Functions -----
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
587
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
588 void cliFunc_kbdProtocol( char* args )
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
589 {
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
590 print( NL );
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
591 info_msg("Keyboard Protocol: ");
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
592 printInt8( USBKeys_Protocol );
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
593 }
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
594
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
595
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
596 void cliFunc_readLEDs( char* args )
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
597 {
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
598 print( NL );
227
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
599 info_msg("LED State: ");
172
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
600 printInt8( USBKeys_LEDs );
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
601 }
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
602
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
603
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
604 void cliFunc_readUART( char* args )
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
605 {
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
606 print( NL );
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
607
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
608 // Read UART buffer until empty
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
609 while ( uart_serial_available() > 0 )
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
610 {
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
611 char out[] = { (char)uart_serial_getchar(), '\0' };
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
612 dPrint( out );
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
613 }
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
614 }
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
615
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
616
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
617 void cliFunc_sendKeys( char* args )
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
618 {
227
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
619 // Copy USBKeys_KeysCLI to USBKeys_Keys
172
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
620 for ( uint8_t key = 0; key < USBKeys_SentCLI; ++key )
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
621 {
227
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
622 // TODO
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
623 //USBKeys_Keys[key] = USBKeys_KeysCLI[key];
172
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
624 }
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
625 USBKeys_Sent = USBKeys_SentCLI;
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
626
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
627 // Set modifier byte
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
628 USBKeys_Modifiers = USBKeys_ModifiersCLI;
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
629 }
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
630
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
631
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
632 void cliFunc_sendUART( char* args )
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
633 {
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
634 // Write all args to UART
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
635 uart_serial_write( args, lenStr( args ) );
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
636 }
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
637
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
638
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
639 void cliFunc_setKeys( char* args )
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
640 {
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
641 char* curArgs;
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
642 char* arg1Ptr;
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
643 char* arg2Ptr = args;
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
644
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
645 // Parse up to USBKeys_MaxSize args (whichever is least)
227
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
646 for ( USBKeys_SentCLI = 0; USBKeys_SentCLI < USB_BOOT_MAX_KEYS; ++USBKeys_SentCLI )
172
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
647 {
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
648 curArgs = arg2Ptr;
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
649 CLI_argumentIsolation( curArgs, &arg1Ptr, &arg2Ptr );
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
650
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
651 // Stop processing args if no more are found
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
652 if ( *arg1Ptr == '\0' )
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
653 break;
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
654
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
655 // Add the USB code to be sent
227
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
656 // TODO
ed05fa3555d4 Updating usbMuxUart for NKRO
Jacob Alexander <haata@kiibohd.com>
parents: 195
diff changeset
657 //USBKeys_KeysCLI[USBKeys_SentCLI] = numToInt( arg1Ptr );
172
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
658 }
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
659 }
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
660
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
661
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
662 void cliFunc_setMod( char* args )
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
663 {
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
664 // Parse number from argument
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
665 // NOTE: Only first argument is used
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
666 char* arg1Ptr;
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
667 char* arg2Ptr;
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
668 CLI_argumentIsolation( args, &arg1Ptr, &arg2Ptr );
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
669
195
58cfcb7bac88 Changing decToInt to numToInt (adds support for Hex number interpreter)
Jacob Alexander <haata@kiibohd.com>
parents: 192
diff changeset
670 USBKeys_ModifiersCLI = numToInt( arg1Ptr );
172
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
671 }
a30bddad4115 Adding UART and UART + USB muxed CLI output.
Jacob Alexander <haata@kiibohd.com>
parents:
diff changeset
672