di0ib
/
controller
關注 1
收藏 0
複製 0
程式碼 版本發佈 0 活動
瀏覽代碼

Adding macroList debug function 

- Fixed TriggerMacroNum and ResultMacroNum
simple
Jacob Alexander 10 年之前
父節點
f7bacebb26
當前提交
e42ae810a3
共有 2 個檔案被更改，包括 24 行新增 和 4 行删除
統一視圖 顯示文件統計
  1. 2
    2
      Macro/PartialMap/generatedKeymap.h
  2. 22
    2
      Macro/PartialMap/macro.c

+ 2
- 2
Macro/PartialMap/generatedKeymap.h 查看文件



// Total number of result macros (rm's) // Total number of result macros (rm's)
// Used to create pending rm's table // Used to create pending rm's table
#define ResultMacroNum sizeof( ResultMacroList )
#define ResultMacroNum sizeof( ResultMacroList ) / sizeof( ResultMacro )


// Indexed Table of Result Macros // Indexed Table of Result Macros
ResultMacro ResultMacroList[] = { ResultMacro ResultMacroList[] = {


// Total number of trigger macros (tm's) // Total number of trigger macros (tm's)
// Used to create pending tm's table // Used to create pending tm's table
#define TriggerMacroNum sizeof( TriggerMacroList )
#define TriggerMacroNum sizeof( TriggerMacroList ) / sizeof( TriggerMacro )


// Indexed Table of Trigger Macros // Indexed Table of Trigger Macros
TriggerMacro TriggerMacroList[] = { TriggerMacro TriggerMacroList[] = {

+ 22
- 2
Macro/PartialMap/macro.c 查看文件

{ "macroDebug", "Disables/Enables sending USB keycodes to the Output Module and prints U/K codes.", cliFunc_macroDebug }, { "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 }, { "macroList", "List the defined trigger and result macros.", cliFunc_macroList },
{ "macroProc", "Pause/Resume macro processing.", cliFunc_macroProc }, { "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 }, { "macroStep", "Do N macro processing steps. Defaults to 1.", cliFunc_macroStep },
{ 0, 0, 0 } // Null entry for dictionary end { 0, 0, 0 } // Null entry for dictionary end
}; };


void cliFunc_macroList( char* args ) 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 ) void cliFunc_macroProc( char* args )