louis/kiibohd-controller: Output/usbMuxUart/output

annotate Output/usbMuxUart/output_com.c @ 186:50702debf278

Initial MatrixARM implementation - Cleaned up Macro and USB callback naming - Added security jumper for automated reload (MCHCK based only) - Added additional LED position

author	Jacob Alexander <haata@kiibohd.com>
date	Fri, 01 Aug 2014 01:26:25 -0700
parents	555d70c6764d
children	6ac92b8614c0

rev	line source
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1 /* Copyright (C) 2014 by Jacob Alexander
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>
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	29 #include <print.h>
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	30 #include <scan_loop.h>
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	31
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	32 // USB Includes
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	33 #if defined(_at90usb162_) \|\| defined(_atmega32u4_) \|\| defined(_at90usb646_) \|\| defined(_at90usb1286_)
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	34 #elif defined(_mk20dx128_) \|\| defined(_mk20dx128vlf5_) \|\| defined(_mk20dx256_)
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	35 #include "../uartOut/arm/uart_serial.h"
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	36 #include "../pjrcUSB/arm/usb_dev.h"
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	37 #include "../pjrcUSB/arm/usb_keyboard.h"
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	38 #include "../pjrcUSB/arm/usb_serial.h"
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	39 #endif
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	40
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	41 // Local Includes
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	42 #include "output_com.h"
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	43
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 // ----- Function Declarations -----
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	47
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	48 void cliFunc_kbdProtocol( char* args );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	49 void cliFunc_readLEDs ( char* args );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	50 void cliFunc_readUART ( char* args );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	51 void cliFunc_sendKeys ( char* args );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	52 void cliFunc_sendUART ( char* args );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	53 void cliFunc_setKeys ( char* args );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	54 void cliFunc_setMod ( char* args );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	55
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	56
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	57 // ----- Variables -----
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	58
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	59 // Output Module command dictionary
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	60 char* outputCLIDictName = "USB Module Commands - NOT WORKING";
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	61 CLIDictItem outputCLIDict[] = {
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	62 { "kbdProtocol", "Keyboard Protocol Mode: 0 - Boot, 1 - OS/NKRO Mode", cliFunc_kbdProtocol },
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	63 { "readLEDs", "Read LED byte:" NL "\t\t1 NumLck, 2 CapsLck, 4 ScrlLck, 16 Kana, etc.", cliFunc_readLEDs },
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	64 { "readUART", "Read UART buffer until empty.", cliFunc_readUART },
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	65 { "sendKeys", "Send the prepared list of USB codes and modifier byte.", cliFunc_sendKeys },
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	66 { "sendUART", "Send characters over UART0.", cliFunc_sendUART },
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	67 { "setKeys", "Prepare a space separated list of USB codes (decimal). Waits until \033[35msendKeys\033[0m.", cliFunc_setKeys },
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	68 { "setMod", "Set the modfier byte:" NL "\t\t1 LCtrl, 2 LShft, 4 LAlt, 8 LGUI, 16 RCtrl, 32 RShft, 64 RAlt, 128 RGUI", cliFunc_setMod },
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	69 { 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	70 };
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	71
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	72
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	73 // Which modifier keys are currently pressed
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	74 // 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	75 // 16=right ctrl, 32=right shift, 64=right alt, 128=right gui
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	76 uint8_t USBKeys_Modifiers = 0;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	77 uint8_t USBKeys_ModifiersCLI = 0; // Separate CLI send buffer
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	78
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	79 // Currently pressed keys, max is defined by USB_MAX_KEY_SEND
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	80 uint8_t USBKeys_Array [USB_MAX_KEY_SEND];
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	81 uint8_t USBKeys_ArrayCLI[USB_MAX_KEY_SEND]; // Separate CLI send buffer
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	82
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	83 // The number of keys sent to the usb in the array
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	84 uint8_t USBKeys_Sent = 0;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	85 uint8_t USBKeys_SentCLI = 0;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	86
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	87 // 1=num lock, 2=caps lock, 4=scroll lock, 8=compose, 16=kana
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	88 volatile uint8_t USBKeys_LEDs = 0;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	89
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	90 // Protocol setting from the host.
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	91 // 0 - Boot Mode (Default, until set by the host)
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	92 // 1 - NKRO Mode
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	93 volatile uint8_t USBKeys_Protocol = 1;
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 // 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	96 // host (ms * 4) even when it hasn't changed
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	97 uint8_t USBKeys_Idle_Config = 125;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	98
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	99 // count until idle timeout
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	100 uint8_t USBKeys_Idle_Count = 0;
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
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	103 // ----- Functions -----
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	104
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	105 // USB Module Setup
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	106 inline void Output_setup()
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	107 {
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	108 // Initialize the USB, and then wait for the host to set configuration.
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	109 // If the Teensy is powered without a PC connected to the USB port,
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	110 // this will wait forever.
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	111 usb_init();
175 c70f641581b5 McHCK USB WORKS!! Jacob Alexander <haata@kiibohd.com> parents: 173 diff changeset	112
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	113 // Setup UART
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	114 uart_serial_setup();
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	115
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	116 while ( !usb_configured() ) /* wait */ ;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	117
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	118 // Register USB Output CLI dictionary
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	119 CLI_registerDictionary( outputCLIDict, outputCLIDictName );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	120 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	121
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	122
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	123 // USB Data Send
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	124 inline void Output_send(void)
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 // TODO undo potentially old keys
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	127 for ( uint8_t c = USBKeys_Sent; c < USBKeys_MaxSize; c++ )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	128 USBKeys_Array[c] = 0;
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 // Send keypresses
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	131 usb_keyboard_send();
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	132
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	133 // Clear modifiers and keys
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	134 USBKeys_Modifiers = 0;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	135 USBKeys_Sent = 0;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	136
186 50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: 178 diff changeset	137 // Signal Scan Module we are finished
50702debf278 Initial MatrixARM implementation Jacob Alexander <haata@kiibohd.com> parents: 178 diff changeset	138 Scan_finishedWithOutput( USBKeys_Sent <= USBKeys_MaxSize ? USBKeys_Sent : USBKeys_MaxSize );
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	139 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	140
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	141
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	142 // Sets the device into firmware reload mode
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	143 inline void Output_firmwareReload()
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	144 {
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	145 uart_device_reload();
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	146 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	147
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	148
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	149 // USB Input buffer available
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	150 inline unsigned int Output_availablechar()
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	151 {
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	152 return usb_serial_available() + uart_serial_available();
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	153 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	154
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	155
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	156 // USB Get Character from input buffer
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	157 inline int Output_getchar()
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	158 {
178 555d70c6764d Removing unnecessary ifdefs Jacob Alexander <haata@kiibohd.com> parents: 175 diff changeset	159 // 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	160 if ( usb_serial_available() > 0 )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	161 {
178 555d70c6764d Removing unnecessary ifdefs Jacob Alexander <haata@kiibohd.com> parents: 175 diff changeset	162 return (int)usb_serial_getchar();
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	163 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	164
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	165 if ( uart_serial_available() > 0 )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	166 {
178 555d70c6764d Removing unnecessary ifdefs Jacob Alexander <haata@kiibohd.com> parents: 175 diff changeset	167 return (int)uart_serial_getchar();
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	168 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	169
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	170 return -1;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	171 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	172
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	173
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	174 // USB Send Character to output buffer
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	175 inline int Output_putchar( char c )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	176 {
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	177 // First send to UART
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	178 uart_serial_putchar( c );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	179
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	180 // Then send to USB
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	181 return usb_serial_putchar( c );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	182 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	183
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	184
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	185 // 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	186 inline int Output_putstr( char* str )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	187 {
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	188 #if defined(_at90usb162_) \|\| defined(_atmega32u4_) \|\| defined(_at90usb646_) \|\| defined(_at90usb1286_) // AVR
178 555d70c6764d Removing unnecessary ifdefs Jacob Alexander <haata@kiibohd.com> parents: 175 diff changeset	189 uint16_t count = 0;
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	190 #elif defined(_mk20dx128_) \|\| defined(_mk20dx128vlf5_) \|\| defined(_mk20dx256_) // ARM
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	191 uint32_t count = 0;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	192 #endif
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	193 // 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	194 while ( str[count] != '\0' )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	195 count++;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	196
173 afd0f94023ff Fixed bug with standalone UART CLI Jacob Alexander <haata@kiibohd.com> parents: 172 diff changeset	197 // First send to UART
afd0f94023ff Fixed bug with standalone UART CLI Jacob Alexander <haata@kiibohd.com> parents: 172 diff changeset	198 uart_serial_write( str, count );
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	199
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	200 // Then send to USB
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	201 return usb_serial_write( str, count );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	202 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	203
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	204
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	205 // Soft Chip Reset
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	206 inline void Output_softReset()
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	207 {
178 555d70c6764d Removing unnecessary ifdefs Jacob Alexander <haata@kiibohd.com> parents: 175 diff changeset	208 usb_device_software_reset();
172 a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	209 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	210
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	211
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	212 // ----- CLI Command Functions -----
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	213
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	214 void cliFunc_kbdProtocol( char* args )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	215 {
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	216 print( NL );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	217 info_msg("Keyboard Protocol: ");
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	218 printInt8( USBKeys_Protocol );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	219 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	220
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	221
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	222 void cliFunc_readLEDs( char* args )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	223 {
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	224 print( NL );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	225 info_msg("LED State (This doesn't work yet...): ");
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	226 printInt8( USBKeys_LEDs );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	227 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	228
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	229
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	230 void cliFunc_readUART( char* args )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	231 {
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	232 print( NL );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	233
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	234 // Read UART buffer until empty
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	235 while ( uart_serial_available() > 0 )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	236 {
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	237 char out[] = { (char)uart_serial_getchar(), '\0' };
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	238 dPrint( out );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	239 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	240 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	241
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	242
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	243 void cliFunc_sendKeys( char* args )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	244 {
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	245 // Copy USBKeys_ArrayCLI to USBKeys_Array
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	246 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	247 {
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	248 USBKeys_Array[key] = USBKeys_ArrayCLI[key];
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	249 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	250 USBKeys_Sent = USBKeys_SentCLI;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	251
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	252 // Set modifier byte
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	253 USBKeys_Modifiers = USBKeys_ModifiersCLI;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	254 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	255
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	256
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	257 void cliFunc_sendUART( char* args )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	258 {
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	259 // Write all args to UART
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	260 uart_serial_write( args, lenStr( args ) );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	261 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	262
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	263
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	264 void cliFunc_setKeys( char* args )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	265 {
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	266 char* curArgs;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	267 char* arg1Ptr;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	268 char* arg2Ptr = args;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	269
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	270 // Parse up to USBKeys_MaxSize args (whichever is least)
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	271 for ( USBKeys_SentCLI = 0; USBKeys_SentCLI < USBKeys_MaxSize; ++USBKeys_SentCLI )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	272 {
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	273 curArgs = arg2Ptr;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	274 CLI_argumentIsolation( curArgs, &arg1Ptr, &arg2Ptr );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	275
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	276 // 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	277 if ( *arg1Ptr == '\0' )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	278 break;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	279
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	280 // Add the USB code to be sent
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	281 USBKeys_ArrayCLI[USBKeys_SentCLI] = decToInt( arg1Ptr );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	282 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	283 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	284
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	285
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	286 void cliFunc_setMod( char* args )
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	287 {
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	288 // Parse number from argument
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	289 // NOTE: Only first argument is used
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	290 char* arg1Ptr;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	291 char* arg2Ptr;
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	292 CLI_argumentIsolation( args, &arg1Ptr, &arg2Ptr );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	293
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	294 USBKeys_ModifiersCLI = decToInt( arg1Ptr );
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	295 }
a30bddad4115 Adding UART and UART + USB muxed CLI output. Jacob Alexander <haata@kiibohd.com> parents: diff changeset	296

Mercurial > louis > kiibohd-controller

annotate Output/usbMuxUart/output_com.c @ 186:50702debf278