Fixing RAM calculator and reduced actual SRAM usage
- Changed static variables to const that should have been const - Updated CMake files to prepare for MCHCK custom bootloader - Changed the USB ID numbers and ID number for bootloader - Only generate DFU or Teensy binary image, not both - Fixed RAM and FLASH calculator - Added missing license in delay.c/h (much of it was taken from Teensy source though I've changed a bunch of it) - Prepared mk20dx.c for upcoming bootloader addition - mk20dx.h cleanup - Reduced the MCHCK based flash size for the application image (bootloader changes requires more flash space) - Fixed bugs in macro.c - Added keyHold cli command - Added show pending events debug message for PartialMap macro module
This commit is contained in:
Jacob Alexander
parent
2f7e3cb117
commit
eabb1c546a
24 changed files with 418 additions and 110 deletions
|
|
@ -21,7 +21,11 @@
|
|||
|
||||
// ----- Includes -----
|
||||
|
||||
// Project Includes
|
||||
#include <print.h>
|
||||
#include <scan_loop.h>
|
||||
#include <macro.h>
|
||||
#include <output_com.h>
|
||||
|
||||
// USB HID Keymap list
|
||||
#include <usb_hid.h>
|
||||
|
|
@ -44,7 +48,7 @@
|
|||
|
||||
// ResultMacro struct, one is created per ResultMacro, no duplicates
|
||||
typedef struct ResultMacro {
|
||||
uint8_t *guide;
|
||||
const uint8_t *guide;
|
||||
unsigned int pos;
|
||||
uint8_t state;
|
||||
uint8_t stateType;
|
||||
|
|
@ -91,7 +95,7 @@ typedef enum TriggerMacroState {
|
|||
|
||||
// TriggerMacro struct, one is created per TriggerMacro, no duplicates
|
||||
typedef struct TriggerMacro {
|
||||
uint8_t *guide;
|
||||
const uint8_t *guide;
|
||||
unsigned int result;
|
||||
unsigned int pos;
|
||||
TriggerMacroState state;
|
||||
|
|
@ -156,13 +160,15 @@ typedef struct Capability {
|
|||
} Capability;
|
||||
|
||||
// Total Number of Capabilities
|
||||
#define CapabilitiesNum sizeof( void* ) / 4 + sizeof( uint8_t )
|
||||
#define CapabilitiesNum sizeof( CapabilitiesList ) / sizeof( Capability )
|
||||
|
||||
// Indexed Capabilities Table
|
||||
// TODO Should be moved to the Scan Module
|
||||
Capability CapabilitiesList[] = {
|
||||
// TODO Generated from .kll files in each module
|
||||
const Capability CapabilitiesList[] = {
|
||||
{ debugPrint_capability, 1 },
|
||||
{ debugPrint2_capability, 2 },
|
||||
{ Macro_layerStateToggle_capability, sizeof(unsigned int) + 1 },
|
||||
{ Output_usbCodeSend_capability, 1 },
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -175,7 +181,7 @@ Capability CapabilitiesList[] = {
|
|||
// Define_RM( index );
|
||||
// * index - Result Macro index number
|
||||
// Must be used after Guide_RM
|
||||
#define Guide_RM( index ) static uint8_t rm##index##_guide[]
|
||||
#define Guide_RM( index ) const uint8_t rm##index##_guide[]
|
||||
#define Define_RM( index ) { rm##index##_guide, 0, 0, 0 }
|
||||
|
||||
Guide_RM( 0 ) = { 1, 0, 0xDA, 0 };
|
||||
|
|
@ -208,13 +214,13 @@ ResultMacro ResultMacroList[] = {
|
|||
// Define_TM( index, result );
|
||||
// * index - Trigger Macro index number
|
||||
// * result - Result Macro index number which is triggered by this Trigger Macro
|
||||
#define Guide_TM( index ) static uint8_t tm##index##_guide[]
|
||||
#define Define_TM( index, result ) { tm##index##_guide, result, 0 }
|
||||
#define Guide_TM( index ) const uint8_t tm##index##_guide[]
|
||||
#define Define_TM( index, result ) { tm##index##_guide, result, 0, TriggerMacro_Waiting }
|
||||
|
||||
Guide_TM( 0 ) = { 1, 0x10, 0x01, 0x73, 0 };
|
||||
Guide_TM( 1 ) = { 1, 0x0F, 0x01, 0x73, 1, 0x00, 0x01, 0x75, 0 };
|
||||
Guide_TM( 2 ) = { 2, 0xF0, 0x01, 0x73, 0x00, 0x01, 0x74, 0 };
|
||||
Guide_TM( 3 ) = { 1, 0x10, 0x01, 0x76, 0 };
|
||||
Guide_TM( 0 ) = { 1, 0x00, 0x01, 0x73, 0 };
|
||||
Guide_TM( 1 ) = { 1, 0x00, 0x01, 0x73, 1, 0x00, 0x01, 0x75, 0 };
|
||||
Guide_TM( 2 ) = { 2, 0x00, 0x01, 0x73, 0x00, 0x01, 0x74, 0 };
|
||||
Guide_TM( 3 ) = { 1, 0x00, 0x01, 0x76, 0 };
|
||||
|
||||
|
||||
// -- Trigger Macro List
|
||||
|
|
@ -246,7 +252,7 @@ TriggerMacro TriggerMacroList[] = {
|
|||
// * layer - basename of the layer
|
||||
// * scanCode - Hex value of the scanCode
|
||||
// * triggerList - Trigger List (see Trigger Lists)
|
||||
#define Define_TL( layer, scanCode ) static unsigned int layer##_tl_##scanCode[]
|
||||
#define Define_TL( layer, scanCode ) const unsigned int layer##_tl_##scanCode[]
|
||||
|
||||
// -- Trigger Lists
|
||||
//
|
||||
|
|
@ -538,17 +544,17 @@ Define_TL( myname2, 0x06 ) = { 0 };
|
|||
// -
|
||||
|
||||
// Default Map for ScanCode Lookup
|
||||
static unsigned int *default_scanMap[] = {
|
||||
const unsigned int *default_scanMap[] = {
|
||||
default_tl_0x00, default_tl_0x01, default_tl_0x02, default_tl_0x03, default_tl_0x04, default_tl_0x05, default_tl_0x06, default_tl_0x07, default_tl_0x08, default_tl_0x09, default_tl_0x0A, default_tl_0x0B, default_tl_0x0C, default_tl_0x0D, default_tl_0x0E, default_tl_0x0F, default_tl_0x10, default_tl_0x11, default_tl_0x12, default_tl_0x13, default_tl_0x14, default_tl_0x15, default_tl_0x16, default_tl_0x17, default_tl_0x18, default_tl_0x19, default_tl_0x1A, default_tl_0x1B, default_tl_0x1C, default_tl_0x1D, default_tl_0x1E, default_tl_0x1F, default_tl_0x20, default_tl_0x21, default_tl_0x22, default_tl_0x23, default_tl_0x24, default_tl_0x25, default_tl_0x26, default_tl_0x27, default_tl_0x28, default_tl_0x29, default_tl_0x2A, default_tl_0x2B, default_tl_0x2C, default_tl_0x2D, default_tl_0x2E, default_tl_0x2F, default_tl_0x30, default_tl_0x31, default_tl_0x32, default_tl_0x33, default_tl_0x34, default_tl_0x35, default_tl_0x36, default_tl_0x37, default_tl_0x38, default_tl_0x39, default_tl_0x3A, default_tl_0x3B, default_tl_0x3C, default_tl_0x3D, default_tl_0x3E, default_tl_0x3F, default_tl_0x40, default_tl_0x41, default_tl_0x42, default_tl_0x43, default_tl_0x44, default_tl_0x45, default_tl_0x46, default_tl_0x47, default_tl_0x48, default_tl_0x49, default_tl_0x4A, default_tl_0x4B, default_tl_0x4C, default_tl_0x4D, default_tl_0x4E, default_tl_0x4F, default_tl_0x50, default_tl_0x51, default_tl_0x52, default_tl_0x53, default_tl_0x54, default_tl_0x55, default_tl_0x56, default_tl_0x57, default_tl_0x58, default_tl_0x59, default_tl_0x5A, default_tl_0x5B, default_tl_0x5C, default_tl_0x5D, default_tl_0x5E, default_tl_0x5F, default_tl_0x60, default_tl_0x61, default_tl_0x62, default_tl_0x63, default_tl_0x64, default_tl_0x65, default_tl_0x66, default_tl_0x67, default_tl_0x68, default_tl_0x69, default_tl_0x6A, default_tl_0x6B, default_tl_0x6C, default_tl_0x6D, default_tl_0x6E, default_tl_0x6F, default_tl_0x70, default_tl_0x71, default_tl_0x72, default_tl_0x73, default_tl_0x74, default_tl_0x75, default_tl_0x76, default_tl_0x77, default_tl_0x78, default_tl_0x79, default_tl_0x7A, default_tl_0x7B, default_tl_0x7C, default_tl_0x7D, default_tl_0x7E, default_tl_0x7F, default_tl_0x80, default_tl_0x81, default_tl_0x82, default_tl_0x83, default_tl_0x84, default_tl_0x85, default_tl_0x86, default_tl_0x87, default_tl_0x88, default_tl_0x89, default_tl_0x8A, default_tl_0x8B, default_tl_0x8C, default_tl_0x8D, default_tl_0x8E, default_tl_0x8F, default_tl_0x90, default_tl_0x91, default_tl_0x92, default_tl_0x93, default_tl_0x94, default_tl_0x95, default_tl_0x96, default_tl_0x97, default_tl_0x98, default_tl_0x99, default_tl_0x9A, default_tl_0x9B, default_tl_0x9C, default_tl_0x9D, default_tl_0x9E, default_tl_0x9F, default_tl_0xA0, default_tl_0xA1, default_tl_0xA2, default_tl_0xA3, default_tl_0xA4, default_tl_0xA5, default_tl_0xA6, default_tl_0xA7, default_tl_0xA8, default_tl_0xA9, default_tl_0xAA, default_tl_0xAB, default_tl_0xAC, default_tl_0xAD, default_tl_0xAE, default_tl_0xAF, default_tl_0xB0, default_tl_0xB1, default_tl_0xB2, default_tl_0xB3, default_tl_0xB4, default_tl_0xB5, default_tl_0xB6, default_tl_0xB7, default_tl_0xB8, default_tl_0xB9, default_tl_0xBA, default_tl_0xBB, default_tl_0xBC, default_tl_0xBD, default_tl_0xBE, default_tl_0xBF, default_tl_0xC0, default_tl_0xC1, default_tl_0xC2, default_tl_0xC3, default_tl_0xC4, default_tl_0xC5, default_tl_0xC6, default_tl_0xC7, default_tl_0xC8, default_tl_0xC9, default_tl_0xCA, default_tl_0xCB, default_tl_0xCC, default_tl_0xCD, default_tl_0xCE, default_tl_0xCF, default_tl_0xD0, default_tl_0xD1, default_tl_0xD2, default_tl_0xD3, default_tl_0xD4, default_tl_0xD5, default_tl_0xD6, default_tl_0xD7, default_tl_0xD8, default_tl_0xD9, default_tl_0xDA, default_tl_0xDB, default_tl_0xDC, default_tl_0xDD, default_tl_0xDE, default_tl_0xDF, default_tl_0xE0, default_tl_0xE1, default_tl_0xE2, default_tl_0xE3, default_tl_0xE4, default_tl_0xE5, default_tl_0xE6, default_tl_0xE7, default_tl_0xE8, default_tl_0xE9, default_tl_0xEA, default_tl_0xEB, default_tl_0xEC, default_tl_0xED, default_tl_0xEE, default_tl_0xEF, default_tl_0xF0, default_tl_0xF1, default_tl_0xF2, default_tl_0xF3, default_tl_0xF4, default_tl_0xF5, default_tl_0xF6, default_tl_0xF7, default_tl_0xF8, default_tl_0xF9, default_tl_0xFA, default_tl_0xFB, default_tl_0xFC, default_tl_0xFD, default_tl_0xFE, default_tl_0xFF,
|
||||
};
|
||||
|
||||
// Layer <name> for ScanCode Lookup
|
||||
static unsigned int *myname_scanMap[] = {
|
||||
const unsigned int *myname_scanMap[] = {
|
||||
0, 0, 0, 0, myname_tl_0x05, myname_tl_0x06, myname_tl_0x07
|
||||
};
|
||||
|
||||
// Layer <name> for ScanCode Lookup
|
||||
static unsigned int *myname2_scanMap[] = {
|
||||
const unsigned int *myname2_scanMap[] = {
|
||||
0, 0, 0, myname2_tl_0x04, myname2_tl_0x05, myname2_tl_0x06
|
||||
};
|
||||
|
||||
|
|
@ -574,9 +580,9 @@ static unsigned int *myname2_scanMap[] = {
|
|||
// The name is defined for cli debugging purposes (Null terminated string)
|
||||
|
||||
typedef struct Layer {
|
||||
unsigned int **triggerMap;
|
||||
char *name;
|
||||
uint8_t max;
|
||||
const unsigned int **triggerMap;
|
||||
const char *name;
|
||||
const uint8_t max;
|
||||
uint8_t state;
|
||||
} Layer;
|
||||
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@
|
|||
|
||||
void cliFunc_capList ( char* args );
|
||||
void cliFunc_capSelect ( char* args );
|
||||
void cliFunc_keyHold ( char* args );
|
||||
void cliFunc_keyPress ( char* args );
|
||||
void cliFunc_keyRelease( char* args );
|
||||
void cliFunc_layerList ( char* args );
|
||||
|
|
@ -80,12 +81,13 @@ typedef enum ResultMacroEval {
|
|||
// ----- Variables -----
|
||||
|
||||
// Macro Module command dictionary
|
||||
char* macroCLIDictName = "Macro Module Commands";
|
||||
CLIDictItem macroCLIDict[] = {
|
||||
const char macroCLIDictName[] = "Macro Module Commands";
|
||||
const CLIDictItem macroCLIDict[] = {
|
||||
{ "capList", "Prints an indexed list of all non USB keycode capabilities.", cliFunc_capList },
|
||||
{ "capSelect", "Triggers the specified capabilities. First two args are state and stateType." NL "\t\t\033[35mK11\033[0m Keyboard Capability 0x0B", cliFunc_capSelect },
|
||||
{ "keyPress", "Send key-presses to the macro module. Held until released. Duplicates have undefined behaviour." NL "\t\t\033[35mS10\033[0m Scancode 0x0A", cliFunc_keyPress },
|
||||
{ "keyRelease", "Release a key-press from the macro module. Duplicates have undefined behaviour." NL "\t\t\033[35mS10\033[0m Scancode 0x0A", cliFunc_keyRelease },
|
||||
{ "keyHold", "Send key-hold events to the macro module. Duplicates have undefined behaviour." NL "\t\t\033[35mS10\033[0m Scancode 0x0A", cliFunc_keyHold },
|
||||
{ "keyPress", "Send key-press events to the macro module. Duplicates have undefined behaviour." NL "\t\t\033[35mS10\033[0m Scancode 0x0A", cliFunc_keyPress },
|
||||
{ "keyRelease", "Send key-release event to macro module. Duplicates have undefined behaviour." NL "\t\t\033[35mS10\033[0m Scancode 0x0A", cliFunc_keyRelease },
|
||||
{ "layerList", "List available layers.", cliFunc_layerList },
|
||||
{ "layerState", "Modify specified indexed layer state <layer> <state byte>." NL "\t\t\033[35mL2\033[0m Indexed Layer 0x02" NL "\t\t0 Off, 1 Shift, 2 Latch, 4 Lock States", cliFunc_layerState },
|
||||
{ "macroDebug", "Disables/Enables sending USB keycodes to the Output Module and prints U/K codes.", cliFunc_macroDebug },
|
||||
|
|
@ -146,7 +148,8 @@ void Macro_layerStateToggle_capability( uint8_t state, uint8_t stateType, uint8_
|
|||
}
|
||||
|
||||
// Get layer index from arguments
|
||||
unsigned int layer = (unsigned int)(&args[0]);
|
||||
// Cast pointer to uint8_t to unsigned int then access that memory location
|
||||
unsigned int layer = *(unsigned int*)(&args[0]);
|
||||
|
||||
// Get layer toggle byte
|
||||
uint8_t toggleByte = args[ sizeof(unsigned int) ];
|
||||
|
|
@ -229,7 +232,7 @@ unsigned int *Macro_layerLookup( uint8_t scanCode )
|
|||
if ( (layer->state & 0x01) ^ (latch>>1) ^ ((layer->state & 0x04)>>2) )
|
||||
{
|
||||
// Lookup layer
|
||||
unsigned int **map = layer->triggerMap;
|
||||
unsigned int **map = (unsigned int**)layer->triggerMap;
|
||||
|
||||
// Determine if layer has key defined
|
||||
if ( map != 0 && *map[ scanCode ] != 0 )
|
||||
|
|
@ -238,7 +241,7 @@ unsigned int *Macro_layerLookup( uint8_t scanCode )
|
|||
}
|
||||
|
||||
// Do lookup on default layer
|
||||
unsigned int **map = LayerIndex[0].triggerMap;
|
||||
unsigned int **map = (unsigned int**)LayerIndex[0].triggerMap;
|
||||
|
||||
// Determine if layer has key defined
|
||||
if ( map == 0 && *map[ scanCode ] == 0 )
|
||||
|
|
@ -615,6 +618,7 @@ inline void Macro_process()
|
|||
|
||||
// Proceed, decrementing the step counter
|
||||
macroStepCounter--;
|
||||
dbug_print("Macro Step");
|
||||
}
|
||||
|
||||
// Update pending trigger list, before processing TriggerMacros
|
||||
|
|
@ -713,7 +717,6 @@ inline void Macro_setup()
|
|||
// Initialize TriggerMacro states
|
||||
for ( unsigned int macro = 0; macro < TriggerMacroNum; macro++ )
|
||||
{
|
||||
TriggerMacroList[ macro ].result = 0;
|
||||
TriggerMacroList[ macro ].pos = 0;
|
||||
TriggerMacroList[ macro ].state = TriggerMacro_Waiting;
|
||||
}
|
||||
|
|
@ -734,6 +737,7 @@ void cliFunc_capList( char* args )
|
|||
{
|
||||
print( NL );
|
||||
info_msg("Capabilities List");
|
||||
printHex( CapabilitiesNum );
|
||||
|
||||
// Iterate through all of the capabilities and display them
|
||||
for ( unsigned int cap = 0; cap < CapabilitiesNum; cap++ )
|
||||
|
|
@ -812,6 +816,34 @@ void cliFunc_capSelect( char* args )
|
|||
}
|
||||
}
|
||||
|
||||
void cliFunc_keyHold( char* args )
|
||||
{
|
||||
// Parse codes from arguments
|
||||
char* curArgs;
|
||||
char* arg1Ptr;
|
||||
char* arg2Ptr = args;
|
||||
|
||||
// Process all args
|
||||
for ( ;; )
|
||||
{
|
||||
curArgs = arg2Ptr;
|
||||
CLI_argumentIsolation( curArgs, &arg1Ptr, &arg2Ptr );
|
||||
|
||||
// Stop processing args if no more are found
|
||||
if ( *arg1Ptr == '\0' )
|
||||
break;
|
||||
|
||||
// Ignore non-Scancode numbers
|
||||
switch ( arg1Ptr[0] )
|
||||
{
|
||||
// Scancode
|
||||
case 'S':
|
||||
Macro_keyState( (uint8_t)decToInt( &arg1Ptr[1] ), 0x02 ); // Hold scancode
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void cliFunc_keyPress( char* args )
|
||||
{
|
||||
// Parse codes from arguments
|
||||
|
|
@ -881,7 +913,7 @@ void cliFunc_layerList( char* args )
|
|||
print(" - ");
|
||||
|
||||
// Display layer name
|
||||
dPrint( LayerIndex[ layer ].name );
|
||||
dPrint( (char*)LayerIndex[ layer ].name );
|
||||
|
||||
// Default map
|
||||
if ( layer == 0 )
|
||||
|
|
@ -956,6 +988,39 @@ void cliFunc_macroDebug( char* args )
|
|||
|
||||
void cliFunc_macroList( char* args )
|
||||
{
|
||||
// Show pending key events
|
||||
print( NL );
|
||||
info_msg("Pending Key Events: ");
|
||||
printInt16( (uint16_t)macroTriggerListBufferSize );
|
||||
print(" : ");
|
||||
for ( uint8_t key = 0; key < macroTriggerListBufferSize; key++ )
|
||||
{
|
||||
printHex( macroTriggerListBuffer[ key ].scanCode );
|
||||
print(" ");
|
||||
}
|
||||
|
||||
// Show pending trigger macros
|
||||
print( NL );
|
||||
info_msg("Pending Trigger Macros: ");
|
||||
printInt16( (uint16_t)macroTriggerMacroPendingListSize );
|
||||
print(" : ");
|
||||
for ( unsigned int macro = 0; macro < macroTriggerMacroPendingListSize; macro++ )
|
||||
{
|
||||
printHex( macroTriggerMacroPendingList[ macro ] );
|
||||
print(" ");
|
||||
}
|
||||
|
||||
// Show pending result macros
|
||||
print( NL );
|
||||
info_msg("Pending Result Macros: ");
|
||||
printInt16( (uint16_t)macroResultMacroPendingListSize );
|
||||
print(" : ");
|
||||
for ( unsigned int macro = 0; macro < macroResultMacroPendingListSize; macro++ )
|
||||
{
|
||||
printHex( macroResultMacroPendingList[ macro ] );
|
||||
print(" ");
|
||||
}
|
||||
|
||||
// Show available trigger macro indices
|
||||
print( NL );
|
||||
info_msg("Trigger Macros Range: T0 -> T");
|
||||
|
|
@ -1176,7 +1241,13 @@ void cliFunc_macroStep( char* args )
|
|||
char* arg2Ptr;
|
||||
CLI_argumentIsolation( args, &arg1Ptr, &arg2Ptr );
|
||||
|
||||
// Default to 1, if no argument given
|
||||
unsigned int count = (unsigned int)decToInt( arg1Ptr );
|
||||
|
||||
if ( count == 0 )
|
||||
count = 1;
|
||||
|
||||
// Set the macro step counter, negative int's are cast to uint
|
||||
macroStepCounter = (unsigned int)decToInt( arg1Ptr );
|
||||
macroStepCounter = count;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue