Mercurial > louis > kiibohd-controller
changeset 181:80a44dcdafaf
Adding macroList debug function
- Fixed TriggerMacroNum and ResultMacroNum
| author | Jacob Alexander <haata@kiibohd.com> |
|---|---|
| date | Thu, 24 Jul 2014 23:42:38 -0700 |
| parents | ed56f7873645 |
| children | 880c33236cd1 |
| files | Macro/PartialMap/generatedKeymap.h Macro/PartialMap/macro.c |
| diffstat | 2 files changed, 24 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Macro/PartialMap/generatedKeymap.h Thu Jul 24 23:18:38 2014 -0700 +++ b/Macro/PartialMap/generatedKeymap.h Thu Jul 24 23:42:38 2014 -0700 @@ -171,7 +171,7 @@ // Total number of result macros (rm's) // Used to create pending rm's table -#define ResultMacroNum sizeof( ResultMacroList ) +#define ResultMacroNum sizeof( ResultMacroList ) / sizeof( ResultMacro ) // Indexed Table of Result Macros ResultMacro ResultMacroList[] = { @@ -202,7 +202,7 @@ // Total number of trigger macros (tm's) // Used to create pending tm's table -#define TriggerMacroNum sizeof( TriggerMacroList ) +#define TriggerMacroNum sizeof( TriggerMacroList ) / sizeof( TriggerMacro ) // Indexed Table of Trigger Macros TriggerMacro TriggerMacroList[] = {
--- a/Macro/PartialMap/macro.c Thu Jul 24 23:18:38 2014 -0700 +++ b/Macro/PartialMap/macro.c Thu Jul 24 23:42:38 2014 -0700 @@ -68,7 +68,7 @@ { "macroDebug", "Disables/Enables sending USB keycodes to the Output Module and prints U/K codes.", cliFunc_macroDebug }, { "macroList", "List the defined trigger and result macros.", cliFunc_macroList }, { "macroProc", "Pause/Resume macro processing.", cliFunc_macroProc }, - { "macroShow", "Show the macro corresponding to the given index or scan-code." NL "\t\t\033[35mT16\033[0m Indexed Trigger Macro 0x10, \033[35mR12\033[0m Indexed Result Macro 0x0C", cliFunc_macroShow }, + { "macroShow", "Show the macro corresponding to the given index." NL "\t\t\033[35mT16\033[0m Indexed Trigger Macro 0x10, \033[35mR12\033[0m Indexed Result Macro 0x0C", cliFunc_macroShow }, { "macroStep", "Do N macro processing steps. Defaults to 1.", cliFunc_macroStep }, { 0, 0, 0 } // Null entry for dictionary end }; @@ -496,7 +496,27 @@ void cliFunc_macroList( char* args ) { - // TODO + // Show available trigger macro indices + print( NL ); + info_msg("Trigger Macros Range: T0 -> T"); + printInt16( (uint16_t)TriggerMacroNum - 1 ); // Hopefully large enough :P (can't assume 32-bit) + + // Show available result macro indices + print( NL ); + info_msg("Result Macros Range: R0 -> R"); + printInt16( (uint16_t)ResultMacroNum - 1 ); // Hopefully large enough :P (can't assume 32-bit) + + // Show Trigger to Result Macro Links + print( NL ); + info_msg("Trigger : Result Macro Pairs"); + for ( unsigned int macro = 0; macro < TriggerMacroNum; macro++ ) + { + print( NL ); + print("\tT"); + printInt16( (uint16_t)macro ); // Hopefully large enough :P (can't assume 32-bit) + print(" : R"); + printInt16( (uint16_t)TriggerMacroList[ macro ].result ); // Hopefully large enough :P (can't assume 32-bit) + } } void cliFunc_macroProc( char* args )