// ----- Function Declarations -----
-void cliFunc_holdKey ( char* args );
void cliFunc_readLEDs ( char* args );
-void cliFunc_releaseKey( char* args );
-void cliFunc_sendKey ( char* args );
+void cliFunc_sendKeys ( char* args );
+void cliFunc_setKeys ( char* args );
void cliFunc_setLEDs ( char* args );
void cliFunc_setMod ( char* args );
// Output Module command dictionary
char* outputCLIDictName = "USB Module Commands";
CLIDictItem outputCLIDict[] = {
- { "holdKey", "Hold a space separated list of USB codes. Ignores already pressed keys.", cliFunc_holdKey },
- { "readLEDs", "Read LED byte. See setLEDs.", cliFunc_readLEDs },
- { "releaseKey", "Release a space separated list of USB codes. Ignores unpressed keys.", cliFunc_releaseKey },
- { "sendKey", "Send a space separated list of USB codes. Press/Release.", cliFunc_sendKey },
- { "setLEDs", "Set LED byte: 1 NumLck, 2 CapsLck, 4 ScrlLck, 16 Kana, etc.", cliFunc_setLEDs },
- { "setMod", "Set the modfier byte: 1 LCtrl, 2 LShft, 4 LAlt, 8 LGUI, 16 RCtrl, 32 RShft, 64 RAlt, 128 RGUI", cliFunc_setMod },
+ { "readLEDs", "Read LED byte. See \033[35msetLEDs\033[0m.", cliFunc_readLEDs },
+ { "sendKeys", "Send the prepared list of USB codes and modifier byte.", cliFunc_sendKeys },
+ { "setKeys", "Prepare a space separated list of USB codes (decimal). Waits until \033[35msendKeys\033[0m.", cliFunc_setKeys },
+ { "setLEDs", "Set LED byte: 1 NumLck, 2 CapsLck, 4 ScrlLck, 16 Kana, etc.", cliFunc_setLEDs },
+ { "setMod", "Set the modfier byte: 1 LCtrl, 2 LShft, 4 LAlt, 8 LGUI, 16 RCtrl, 32 RShft, 64 RAlt, 128 RGUI", cliFunc_setMod },
{ 0, 0, 0 } // Null entry for dictionary end
};
-// which modifier keys are currently pressed
+// Which modifier keys are currently pressed
// 1=left ctrl, 2=left shift, 4=left alt, 8=left gui
// 16=right ctrl, 32=right shift, 64=right alt, 128=right gui
- uint8_t USBKeys_Modifiers = 0;
+ uint8_t USBKeys_Modifiers = 0;
+ uint8_t USBKeys_ModifiersCLI = 0; // Separate CLI send buffer
-// which keys are currently pressed, up to 6 keys may be down at once
- uint8_t USBKeys_Array[USB_MAX_KEY_SEND] = {0,0,0,0,0,0};
+// Currently pressed keys, max is defined by USB_MAX_KEY_SEND
+ uint8_t USBKeys_Array [USB_MAX_KEY_SEND];
+ uint8_t USBKeys_ArrayCLI[USB_MAX_KEY_SEND]; // Separate CLI send buffer
// The number of keys sent to the usb in the array
- uint8_t USBKeys_Sent;
+ uint8_t USBKeys_Sent = 0;
+ uint8_t USBKeys_SentCLI = 0;
// 1=num lock, 2=caps lock, 4=scroll lock, 8=compose, 16=kana
volatile uint8_t USBKeys_LEDs = 0;
// ----- Functions -----
// USB Module Setup
-inline void output_setup()
+inline void Output_setup()
{
// Initialize the USB, and then wait for the host to set configuration.
// If the Teensy is powered without a PC connected to the USB port,
usb_init();
while ( !usb_configured() ) /* wait */ ;
- // Register USB Output dictionary
- registerDictionary_cli( outputCLIDict, outputCLIDictName );
+ // Register USB Output CLI dictionary
+ CLI_registerDictionary( outputCLIDict, outputCLIDictName );
// Wait an extra second for the PC's operating system to load drivers
// and do whatever it does to actually be ready for input
// USB Data Send
-inline void output_send(void)
+inline void Output_send(void)
{
// TODO undo potentially old keys
for ( uint8_t c = USBKeys_Sent; c < USBKeys_MaxSize; c++ )
USBKeys_Sent = 0;
// Signal Scan Module we are finishedA
- scan_finishedWithUSBBuffer( USBKeys_Sent <= USBKeys_MaxSize ? USBKeys_Sent : USBKeys_MaxSize );
+ Scan_finishedWithUSBBuffer( USBKeys_Sent <= USBKeys_MaxSize ? USBKeys_Sent : USBKeys_MaxSize );
}
// Sets the device into firmware reload mode
-inline void output_firmwareReload()
+inline void Output_firmwareReload()
{
#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_)
usb_debug_reload();
// USB Input buffer available
-inline unsigned int output_availablechar()
+inline unsigned int Output_availablechar()
{
return usb_serial_available();
}
// USB Get Character from input buffer
-inline int output_getchar()
+inline int Output_getchar()
{
#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_)
// XXX Make sure to check output_availablechar() first! Information is lost with the cast (error codes)
// USB Send Character to output buffer
-inline int output_putchar( char c )
+inline int Output_putchar( char c )
{
return usb_serial_putchar( c );
}
// USB Send String to output buffer, null terminated
-inline int output_putstr( char* str )
+inline int Output_putstr( char* str )
{
#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) // AVR
uint16_t count = 0;
// Soft Chip Reset
-inline void output_softReset()
+inline void Output_softReset()
{
#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_)
usb_debug_software_reset();
// ----- CLI Command Functions -----
-void cliFunc_holdKey( char* args )
-{
- // TODO
-}
-
-
void cliFunc_readLEDs( char* args )
{
- // TODO
+ print( NL );
+ info_msg("LED State: ");
+ printInt8( USBKeys_LEDs );
}
-void cliFunc_releaseKey( char* args )
+void cliFunc_sendKeys( char* args )
{
- // TODO
+ // Copy USBKeys_ArrayCLI to USBKeys_Array
+ for ( uint8_t key = 0; key < USBKeys_SentCLI; ++key )
+ {
+ USBKeys_Array[key] = USBKeys_ArrayCLI[key];
+ }
+ USBKeys_Sent = USBKeys_SentCLI;
+
+ // Set modifier byte
+ USBKeys_Modifiers = USBKeys_ModifiersCLI;
}
-void cliFunc_sendKey( char* args )
+void cliFunc_setKeys( char* args )
{
- // TODO Argument handling
- USBKeys_Array[0] = 4; // KEY_A
- USBKeys_Sent = 1;
+ char* curArgs;
+ char* arg1Ptr;
+ char* arg2Ptr = args;
+
+ // Parse up to USBKeys_MaxSize args (whichever is least)
+ for ( USBKeys_SentCLI = 0; USBKeys_SentCLI < USBKeys_MaxSize; ++USBKeys_SentCLI )
+ {
+ curArgs = arg2Ptr;
+ CLI_argumentIsolation( curArgs, &arg1Ptr, &arg2Ptr );
+
+ // Stop processing args if no more are found
+ if ( *arg1Ptr == '\0' )
+ break;
+
+ // Add the USB code to be sent
+ USBKeys_ArrayCLI[USBKeys_SentCLI] = decToInt( arg1Ptr );
+ }
}
void cliFunc_setLEDs( char* args )
{
- // TODO
+ // Parse number from argument
+ // NOTE: Only first argument is used
+ char* arg1Ptr;
+ char* arg2Ptr;
+ CLI_argumentIsolation( args, &arg1Ptr, &arg2Ptr );
+
+ USBKeys_LEDs = decToInt( arg1Ptr );
}
void cliFunc_setMod( char* args )
{
- // TODO
+ // Parse number from argument
+ // NOTE: Only first argument is used
+ char* arg1Ptr;
+ char* arg2Ptr;
+ CLI_argumentIsolation( args, &arg1Ptr, &arg2Ptr );
+
+ USBKeys_ModifiersCLI = decToInt( arg1Ptr );
}
projects / kiibohd-controller.git / blobdiff