Mercurial > louis > kiibohd-controller
annotate Macro/PartialMap/macro.c @ 271:e6c753528873
More mk20dx256vlh7 preparation.
author | Jacob Alexander <haata@kiibohd.com> |
---|---|
date | Sun, 25 Jan 2015 12:49:23 -0800 |
parents | 708af1b9bc55 |
children | c86eb7d0a693 |
rev | line source |
---|---|
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
1 /* Copyright (C) 2014 by Jacob Alexander |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
2 * |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
3 * This file is free software: you can redistribute it and/or modify |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
4 * it under the terms of the GNU General Public License as published by |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
5 * the Free Software Foundation, either version 3 of the License, or |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
6 * (at your option) any later version. |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
7 * |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
8 * This file is distributed in the hope that it will be useful, |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
11 * GNU General Public License for more details. |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
12 * |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
13 * You should have received a copy of the GNU General Public License |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
14 * along with this file. If not, see <http://www.gnu.org/licenses/>. |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
15 */ |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
16 |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
17 // ----- Includes ----- |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
18 |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
19 // Compiler Includes |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
20 #include <Lib/MacroLib.h> |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
21 |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
22 // Project Includes |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
23 #include <cli.h> |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
24 #include <led.h> |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
25 #include <print.h> |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
26 #include <scan_loop.h> |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
27 |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
28 // Keymaps |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
29 #include "usb_hid.h" |
205
a2e9bb170eef
Adding CMake build support for the KLL compiler
Jacob Alexander <haata@kiibohd.com>
parents:
204
diff
changeset
|
30 #include <generatedKeymap.h> // Generated using kll at compile time, in build directory |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
31 |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
32 // Local Includes |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
33 #include "macro.h" |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
34 |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
35 |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
36 |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
37 // ----- Function Declarations ----- |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
38 |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
39 void cliFunc_capList ( char* args ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
40 void cliFunc_capSelect ( char* args ); |
192
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
41 void cliFunc_keyHold ( char* args ); |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
42 void cliFunc_keyPress ( char* args ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
43 void cliFunc_keyRelease( char* args ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
44 void cliFunc_layerList ( char* args ); |
183
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
45 void cliFunc_layerState( char* args ); |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
46 void cliFunc_macroDebug( char* args ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
47 void cliFunc_macroList ( char* args ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
48 void cliFunc_macroProc ( char* args ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
49 void cliFunc_macroShow ( char* args ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
50 void cliFunc_macroStep ( char* args ); |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
51 |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
52 |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
53 |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
54 // ----- Enums ----- |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
55 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
56 // Bit positions are important, passes (correct key) always trump incorrect key votes |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
57 typedef enum TriggerMacroVote { |
197
1ebb6fb5f74f
All basic macros tested and working!
Jacob Alexander <haata@kiibohd.com>
parents:
196
diff
changeset
|
58 TriggerMacroVote_Release = 0x10, // Correct key |
1ebb6fb5f74f
All basic macros tested and working!
Jacob Alexander <haata@kiibohd.com>
parents:
196
diff
changeset
|
59 TriggerMacroVote_PassRelease = 0x18, // Correct key (both pass and release) |
1ebb6fb5f74f
All basic macros tested and working!
Jacob Alexander <haata@kiibohd.com>
parents:
196
diff
changeset
|
60 TriggerMacroVote_Pass = 0x8, // Correct key |
1ebb6fb5f74f
All basic macros tested and working!
Jacob Alexander <haata@kiibohd.com>
parents:
196
diff
changeset
|
61 TriggerMacroVote_DoNothingRelease = 0x4, // Incorrect key |
1ebb6fb5f74f
All basic macros tested and working!
Jacob Alexander <haata@kiibohd.com>
parents:
196
diff
changeset
|
62 TriggerMacroVote_DoNothing = 0x2, // Incorrect key |
1ebb6fb5f74f
All basic macros tested and working!
Jacob Alexander <haata@kiibohd.com>
parents:
196
diff
changeset
|
63 TriggerMacroVote_Fail = 0x1, // Incorrect key |
1ebb6fb5f74f
All basic macros tested and working!
Jacob Alexander <haata@kiibohd.com>
parents:
196
diff
changeset
|
64 TriggerMacroVote_Invalid = 0x0, // Invalid state |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
65 } TriggerMacroVote; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
66 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
67 typedef enum TriggerMacroEval { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
68 TriggerMacroEval_DoNothing, |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
69 TriggerMacroEval_DoResult, |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
70 TriggerMacroEval_DoResultAndRemove, |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
71 TriggerMacroEval_Remove, |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
72 } TriggerMacroEval; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
73 |
190
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
74 typedef enum ResultMacroEval { |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
75 ResultMacroEval_DoNothing, |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
76 ResultMacroEval_Remove, |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
77 } ResultMacroEval; |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
78 |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
79 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
80 |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
81 // ----- Variables ----- |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
82 |
132
e08d7b586ea3
Adding analog.c lib from teensyduino.
Jacob Alexander <haata@kiibohd.com>
parents:
126
diff
changeset
|
83 // Macro Module command dictionary |
239
2a4c99da1276
HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents:
217
diff
changeset
|
84 CLIDict_Entry( capList, "Prints an indexed list of all non USB keycode capabilities." ); |
2a4c99da1276
HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents:
217
diff
changeset
|
85 CLIDict_Entry( capSelect, "Triggers the specified capabilities. First two args are state and stateType." NL "\t\t\033[35mK11\033[0m Keyboard Capability 0x0B" ); |
2a4c99da1276
HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents:
217
diff
changeset
|
86 CLIDict_Entry( keyHold, "Send key-hold events to the macro module. Duplicates have undefined behaviour." NL "\t\t\033[35mS10\033[0m Scancode 0x0A" ); |
2a4c99da1276
HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents:
217
diff
changeset
|
87 CLIDict_Entry( keyPress, "Send key-press events to the macro module. Duplicates have undefined behaviour." NL "\t\t\033[35mS10\033[0m Scancode 0x0A" ); |
2a4c99da1276
HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents:
217
diff
changeset
|
88 CLIDict_Entry( keyRelease, "Send key-release event to macro module. Duplicates have undefined behaviour." NL "\t\t\033[35mS10\033[0m Scancode 0x0A" ); |
2a4c99da1276
HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents:
217
diff
changeset
|
89 CLIDict_Entry( layerList, "List available layers." ); |
2a4c99da1276
HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents:
217
diff
changeset
|
90 CLIDict_Entry( 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" ); |
2a4c99da1276
HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents:
217
diff
changeset
|
91 CLIDict_Entry( macroDebug, "Disables/Enables sending USB keycodes to the Output Module and prints U/K codes." ); |
2a4c99da1276
HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents:
217
diff
changeset
|
92 CLIDict_Entry( macroList, "List the defined trigger and result macros." ); |
2a4c99da1276
HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents:
217
diff
changeset
|
93 CLIDict_Entry( macroProc, "Pause/Resume macro processing." ); |
2a4c99da1276
HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents:
217
diff
changeset
|
94 CLIDict_Entry( 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" ); |
2a4c99da1276
HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents:
217
diff
changeset
|
95 CLIDict_Entry( macroStep, "Do N macro processing steps. Defaults to 1." ); |
2a4c99da1276
HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents:
217
diff
changeset
|
96 |
2a4c99da1276
HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents:
217
diff
changeset
|
97 CLIDict_Def( macroCLIDict, "Macro Module Commands" ) = { |
2a4c99da1276
HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents:
217
diff
changeset
|
98 CLIDict_Item( capList ), |
2a4c99da1276
HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents:
217
diff
changeset
|
99 CLIDict_Item( capSelect ), |
2a4c99da1276
HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents:
217
diff
changeset
|
100 CLIDict_Item( keyHold ), |
2a4c99da1276
HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents:
217
diff
changeset
|
101 CLIDict_Item( keyPress ), |
2a4c99da1276
HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents:
217
diff
changeset
|
102 CLIDict_Item( keyRelease ), |
2a4c99da1276
HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents:
217
diff
changeset
|
103 CLIDict_Item( layerList ), |
2a4c99da1276
HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents:
217
diff
changeset
|
104 CLIDict_Item( layerState ), |
2a4c99da1276
HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents:
217
diff
changeset
|
105 CLIDict_Item( macroDebug ), |
2a4c99da1276
HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents:
217
diff
changeset
|
106 CLIDict_Item( macroList ), |
2a4c99da1276
HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents:
217
diff
changeset
|
107 CLIDict_Item( macroProc ), |
2a4c99da1276
HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents:
217
diff
changeset
|
108 CLIDict_Item( macroShow ), |
2a4c99da1276
HUGE AVR RAM optimization (~28%).
Jacob Alexander <haata@kiibohd.com>
parents:
217
diff
changeset
|
109 CLIDict_Item( macroStep ), |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
110 { 0, 0, 0 } // Null entry for dictionary end |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
111 }; |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
112 |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
113 |
126
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
114 // Macro debug flag - If set, clears the USB Buffers after signalling processing completion |
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
115 uint8_t macroDebugMode = 0; |
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
116 |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
117 // Macro pause flag - If set, the macro module pauses processing, unless unset, or the step counter is non-zero |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
118 uint8_t macroPauseMode = 0; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
119 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
120 // Macro step counter - If non-zero, the step counter counts down every time the macro module does one processing loop |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
121 uint16_t macroStepCounter = 0; |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
122 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
123 |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
124 // Key Trigger List Buffer |
184
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
125 TriggerGuide macroTriggerListBuffer[ MaxScanCode ]; |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
126 uint8_t macroTriggerListBufferSize = 0; |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
127 |
184
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
128 // Pending Trigger Macro Index List |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
129 // * Any trigger macros that need processing from a previous macro processing loop |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
130 // TODO, figure out a good way to scale this array size without wasting too much memory, but not rejecting macros |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
131 // Possibly could be calculated by the KLL compiler |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
132 // XXX It may be possible to calculate the worst case using the KLL compiler |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
133 uint16_t macroTriggerMacroPendingList[ TriggerMacroNum ] = { 0 }; |
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
134 uint16_t macroTriggerMacroPendingListSize = 0; |
184
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
135 |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
136 // Layer Index Stack |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
137 // * When modifying layer state and the state is non-0x0, the stack must be adjusted |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
138 uint16_t macroLayerIndexStack[ LayerNum + 1 ] = { 0 }; |
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
139 uint16_t macroLayerIndexStackSize = 0; |
184
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
140 |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
141 // Pending Result Macro Index List |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
142 // * Any result macro that needs processing from a previous macro processing loop |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
143 uint16_t macroResultMacroPendingList[ ResultMacroNum ] = { 0 }; |
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
144 uint16_t macroResultMacroPendingListSize = 0; |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
145 |
126
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
146 |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
147 |
191
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
148 // ----- Capabilities ----- |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
149 |
199
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
150 // Sets the given layer with the specified layerState |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
151 void Macro_layerState( uint8_t state, uint8_t stateType, uint16_t layer, uint8_t layerState ) |
191
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
152 { |
241
9f62492034c7
Fixing bug that locks up the keyboard if shifting to a layer that doesn't exist.
Jacob Alexander <haata@kiibohd.com>
parents:
239
diff
changeset
|
153 // Ignore if layer does not exist |
9f62492034c7
Fixing bug that locks up the keyboard if shifting to a layer that doesn't exist.
Jacob Alexander <haata@kiibohd.com>
parents:
239
diff
changeset
|
154 if ( layer >= LayerNum ) |
9f62492034c7
Fixing bug that locks up the keyboard if shifting to a layer that doesn't exist.
Jacob Alexander <haata@kiibohd.com>
parents:
239
diff
changeset
|
155 return; |
9f62492034c7
Fixing bug that locks up the keyboard if shifting to a layer that doesn't exist.
Jacob Alexander <haata@kiibohd.com>
parents:
239
diff
changeset
|
156 |
191
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
157 // Is layer in the LayerIndexStack? |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
158 uint8_t inLayerIndexStack = 0; |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
159 uint16_t stackItem = 0; |
191
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
160 while ( stackItem < macroLayerIndexStackSize ) |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
161 { |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
162 // Flag if layer is already in the LayerIndexStack |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
163 if ( macroLayerIndexStack[ stackItem ] == layer ) |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
164 { |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
165 inLayerIndexStack = 1; |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
166 break; |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
167 } |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
168 |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
169 // Increment to next item |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
170 stackItem++; |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
171 } |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
172 |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
173 // Toggle Layer State Byte |
214
5a5404338b9f
Adding support for layer packing
Jacob Alexander <haata@kiibohd.com>
parents:
205
diff
changeset
|
174 if ( LayerState[ layer ] & layerState ) |
191
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
175 { |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
176 // Unset |
214
5a5404338b9f
Adding support for layer packing
Jacob Alexander <haata@kiibohd.com>
parents:
205
diff
changeset
|
177 LayerState[ layer ] &= ~layerState; |
191
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
178 } |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
179 else |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
180 { |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
181 // Set |
214
5a5404338b9f
Adding support for layer packing
Jacob Alexander <haata@kiibohd.com>
parents:
205
diff
changeset
|
182 LayerState[ layer ] |= layerState; |
191
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
183 } |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
184 |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
185 // If the layer was not in the LayerIndexStack add it |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
186 if ( !inLayerIndexStack ) |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
187 { |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
188 macroLayerIndexStack[ macroLayerIndexStackSize++ ] = layer; |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
189 } |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
190 |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
191 // If the layer is in the LayerIndexStack and the state is 0x00, remove |
214
5a5404338b9f
Adding support for layer packing
Jacob Alexander <haata@kiibohd.com>
parents:
205
diff
changeset
|
192 if ( LayerState[ layer ] == 0x00 && inLayerIndexStack ) |
191
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
193 { |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
194 // Remove the layer from the LayerIndexStack |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
195 // Using the already positioned stackItem variable from the loop above |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
196 while ( stackItem < macroLayerIndexStackSize ) |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
197 { |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
198 macroLayerIndexStack[ stackItem ] = macroLayerIndexStack[ stackItem + 1 ]; |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
199 stackItem++; |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
200 } |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
201 |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
202 // Reduce LayerIndexStack size |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
203 macroLayerIndexStackSize--; |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
204 } |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
205 } |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
206 |
199
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
207 // Modifies the specified Layer control byte |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
208 // Argument #1: Layer Index -> uint16_t |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
209 // Argument #2: Layer State -> uint8_t |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
210 void Macro_layerState_capability( uint8_t state, uint8_t stateType, uint8_t *args ) |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
211 { |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
212 // Display capability name |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
213 if ( stateType == 0xFF && state == 0xFF ) |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
214 { |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
215 print("Macro_layerState(layerIndex,layerState)"); |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
216 return; |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
217 } |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
218 |
201
326f75709d10
Fixing release state for keys
Jacob Alexander <jacob.alexander@virtualinstruments.com>
parents:
199
diff
changeset
|
219 // Only use capability on press or release |
326f75709d10
Fixing release state for keys
Jacob Alexander <jacob.alexander@virtualinstruments.com>
parents:
199
diff
changeset
|
220 // TODO Analog |
326f75709d10
Fixing release state for keys
Jacob Alexander <jacob.alexander@virtualinstruments.com>
parents:
199
diff
changeset
|
221 // XXX This may cause issues, might be better to implement state table here to decide -HaaTa |
326f75709d10
Fixing release state for keys
Jacob Alexander <jacob.alexander@virtualinstruments.com>
parents:
199
diff
changeset
|
222 if ( stateType == 0x00 && state == 0x02 ) // Hold condition |
326f75709d10
Fixing release state for keys
Jacob Alexander <jacob.alexander@virtualinstruments.com>
parents:
199
diff
changeset
|
223 return; |
326f75709d10
Fixing release state for keys
Jacob Alexander <jacob.alexander@virtualinstruments.com>
parents:
199
diff
changeset
|
224 |
199
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
225 // Get layer index from arguments |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
226 // Cast pointer to uint8_t to uint16_t then access that memory location |
199
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
227 uint16_t layer = *(uint16_t*)(&args[0]); |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
228 |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
229 // Get layer toggle byte |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
230 uint8_t layerState = args[ sizeof(uint16_t) ]; |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
231 |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
232 Macro_layerState( state, stateType, layer, layerState ); |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
233 } |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
234 |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
235 |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
236 // Latches given layer |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
237 // Argument #1: Layer Index -> uint16_t |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
238 void Macro_layerLatch_capability( uint8_t state, uint8_t stateType, uint8_t *args ) |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
239 { |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
240 // Display capability name |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
241 if ( stateType == 0xFF && state == 0xFF ) |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
242 { |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
243 print("Macro_layerLatch(layerIndex)"); |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
244 return; |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
245 } |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
246 |
201
326f75709d10
Fixing release state for keys
Jacob Alexander <jacob.alexander@virtualinstruments.com>
parents:
199
diff
changeset
|
247 // Only use capability on press |
326f75709d10
Fixing release state for keys
Jacob Alexander <jacob.alexander@virtualinstruments.com>
parents:
199
diff
changeset
|
248 // TODO Analog |
253
e79f2b9c39cf
Fixing layer latch capability.
Jacob Alexander <haata@kiibohd.com>
parents:
241
diff
changeset
|
249 if ( stateType == 0x00 && state != 0x03 ) // Only on release |
201
326f75709d10
Fixing release state for keys
Jacob Alexander <jacob.alexander@virtualinstruments.com>
parents:
199
diff
changeset
|
250 return; |
326f75709d10
Fixing release state for keys
Jacob Alexander <jacob.alexander@virtualinstruments.com>
parents:
199
diff
changeset
|
251 |
199
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
252 // Get layer index from arguments |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
253 // Cast pointer to uint8_t to uint16_t then access that memory location |
199
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
254 uint16_t layer = *(uint16_t*)(&args[0]); |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
255 |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
256 Macro_layerState( state, stateType, layer, 0x02 ); |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
257 } |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
258 |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
259 |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
260 // Locks given layer |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
261 // Argument #1: Layer Index -> uint16_t |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
262 void Macro_layerLock_capability( uint8_t state, uint8_t stateType, uint8_t *args ) |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
263 { |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
264 // Display capability name |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
265 if ( stateType == 0xFF && state == 0xFF ) |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
266 { |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
267 print("Macro_layerLock(layerIndex)"); |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
268 return; |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
269 } |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
270 |
201
326f75709d10
Fixing release state for keys
Jacob Alexander <jacob.alexander@virtualinstruments.com>
parents:
199
diff
changeset
|
271 // Only use capability on press |
326f75709d10
Fixing release state for keys
Jacob Alexander <jacob.alexander@virtualinstruments.com>
parents:
199
diff
changeset
|
272 // TODO Analog |
326f75709d10
Fixing release state for keys
Jacob Alexander <jacob.alexander@virtualinstruments.com>
parents:
199
diff
changeset
|
273 // XXX Could also be on release, but that's sorta dumb -HaaTa |
326f75709d10
Fixing release state for keys
Jacob Alexander <jacob.alexander@virtualinstruments.com>
parents:
199
diff
changeset
|
274 if ( stateType == 0x00 && state != 0x01 ) // All normal key conditions except press |
326f75709d10
Fixing release state for keys
Jacob Alexander <jacob.alexander@virtualinstruments.com>
parents:
199
diff
changeset
|
275 return; |
326f75709d10
Fixing release state for keys
Jacob Alexander <jacob.alexander@virtualinstruments.com>
parents:
199
diff
changeset
|
276 |
199
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
277 // Get layer index from arguments |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
278 // Cast pointer to uint8_t to uint16_t then access that memory location |
199
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
279 uint16_t layer = *(uint16_t*)(&args[0]); |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
280 |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
281 Macro_layerState( state, stateType, layer, 0x04 ); |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
282 } |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
283 |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
284 |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
285 // Shifts given layer |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
286 // Argument #1: Layer Index -> uint16_t |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
287 void Macro_layerShift_capability( uint8_t state, uint8_t stateType, uint8_t *args ) |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
288 { |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
289 // Display capability name |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
290 if ( stateType == 0xFF && state == 0xFF ) |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
291 { |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
292 print("Macro_layerShift(layerIndex)"); |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
293 return; |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
294 } |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
295 |
201
326f75709d10
Fixing release state for keys
Jacob Alexander <jacob.alexander@virtualinstruments.com>
parents:
199
diff
changeset
|
296 // Only use capability on press or release |
326f75709d10
Fixing release state for keys
Jacob Alexander <jacob.alexander@virtualinstruments.com>
parents:
199
diff
changeset
|
297 // TODO Analog |
326f75709d10
Fixing release state for keys
Jacob Alexander <jacob.alexander@virtualinstruments.com>
parents:
199
diff
changeset
|
298 if ( stateType == 0x00 && ( state == 0x00 || state == 0x02 ) ) // Only pass press or release conditions |
326f75709d10
Fixing release state for keys
Jacob Alexander <jacob.alexander@virtualinstruments.com>
parents:
199
diff
changeset
|
299 return; |
326f75709d10
Fixing release state for keys
Jacob Alexander <jacob.alexander@virtualinstruments.com>
parents:
199
diff
changeset
|
300 |
199
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
301 // Get layer index from arguments |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
302 // Cast pointer to uint8_t to uint16_t then access that memory location |
199
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
303 uint16_t layer = *(uint16_t*)(&args[0]); |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
304 |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
305 Macro_layerState( state, stateType, layer, 0x01 ); |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
306 } |
559a467f6d57
Preparing for kll compiler usage
Jacob Alexander <haata@kiibohd.com>
parents:
197
diff
changeset
|
307 |
191
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
308 |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
309 |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
310 // ----- Functions ----- |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
311 |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
312 // Looks up the trigger list for the given scan code (from the active layer) |
184
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
313 // NOTE: Calling function must handle the NULL pointer case |
253
e79f2b9c39cf
Fixing layer latch capability.
Jacob Alexander <haata@kiibohd.com>
parents:
241
diff
changeset
|
314 nat_ptr_t *Macro_layerLookup( uint8_t scanCode, uint8_t latch_expire ) |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
315 { |
184
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
316 // If no trigger macro is defined at the given layer, fallthrough to the next layer |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
317 for ( uint16_t layerIndex = 0; layerIndex < macroLayerIndexStackSize; layerIndex++ ) |
184
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
318 { |
191
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
319 // Lookup Layer |
214
5a5404338b9f
Adding support for layer packing
Jacob Alexander <haata@kiibohd.com>
parents:
205
diff
changeset
|
320 const Layer *layer = &LayerIndex[ macroLayerIndexStack[ layerIndex ] ]; |
191
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
321 |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
322 // Check if latch has been pressed for this layer |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
323 // XXX Regardless of whether a key is found, the latch is removed on first lookup |
253
e79f2b9c39cf
Fixing layer latch capability.
Jacob Alexander <haata@kiibohd.com>
parents:
241
diff
changeset
|
324 uint8_t latch = LayerState[ macroLayerIndexStack[ layerIndex ] ] & 0x02; |
e79f2b9c39cf
Fixing layer latch capability.
Jacob Alexander <haata@kiibohd.com>
parents:
241
diff
changeset
|
325 if ( latch && latch_expire ) |
191
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
326 { |
253
e79f2b9c39cf
Fixing layer latch capability.
Jacob Alexander <haata@kiibohd.com>
parents:
241
diff
changeset
|
327 Macro_layerState( 0, 0, macroLayerIndexStack[ layerIndex ], 0x02 ); |
191
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
328 } |
184
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
329 |
191
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
330 // Only use layer, if state is valid |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
331 // XOR each of the state bits |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
332 // If only two are enabled, do not use this state |
216
738445f38639
DPH controller now working with the kishsaver and macros
Jacob Alexander <haata@kiibohd.com>
parents:
215
diff
changeset
|
333 if ( (LayerState[ macroLayerIndexStack[ layerIndex ] ] & 0x01) ^ (latch>>1) ^ ((LayerState[ macroLayerIndexStack[ layerIndex ] ] & 0x04)>>2) ) |
191
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
334 { |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
335 // Lookup layer |
202
1a68a9a04ad3
Adding variable width state variable width.
Jacob Alexander <haata@kiibohd.com>
parents:
201
diff
changeset
|
336 nat_ptr_t **map = (nat_ptr_t**)layer->triggerMap; |
191
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
337 |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
338 // Determine if layer has key defined |
214
5a5404338b9f
Adding support for layer packing
Jacob Alexander <haata@kiibohd.com>
parents:
205
diff
changeset
|
339 // Make sure scanCode is between layer first and last scancodes |
5a5404338b9f
Adding support for layer packing
Jacob Alexander <haata@kiibohd.com>
parents:
205
diff
changeset
|
340 if ( map != 0 |
215
00a8c7f491d4
Fixing first and last element bug for layers.
Jacob Alexander <haata@kiibohd.com>
parents:
214
diff
changeset
|
341 && scanCode <= layer->last |
00a8c7f491d4
Fixing first and last element bug for layers.
Jacob Alexander <haata@kiibohd.com>
parents:
214
diff
changeset
|
342 && scanCode >= layer->first |
214
5a5404338b9f
Adding support for layer packing
Jacob Alexander <haata@kiibohd.com>
parents:
205
diff
changeset
|
343 && *map[ scanCode - layer->first ] != 0 ) |
5a5404338b9f
Adding support for layer packing
Jacob Alexander <haata@kiibohd.com>
parents:
205
diff
changeset
|
344 { |
5a5404338b9f
Adding support for layer packing
Jacob Alexander <haata@kiibohd.com>
parents:
205
diff
changeset
|
345 return map[ scanCode - layer->first ]; |
5a5404338b9f
Adding support for layer packing
Jacob Alexander <haata@kiibohd.com>
parents:
205
diff
changeset
|
346 } |
191
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
347 } |
184
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
348 } |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
349 |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
350 // Do lookup on default layer |
202
1a68a9a04ad3
Adding variable width state variable width.
Jacob Alexander <haata@kiibohd.com>
parents:
201
diff
changeset
|
351 nat_ptr_t **map = (nat_ptr_t**)LayerIndex[0].triggerMap; |
184
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
352 |
214
5a5404338b9f
Adding support for layer packing
Jacob Alexander <haata@kiibohd.com>
parents:
205
diff
changeset
|
353 // Lookup default layer |
216
738445f38639
DPH controller now working with the kishsaver and macros
Jacob Alexander <haata@kiibohd.com>
parents:
215
diff
changeset
|
354 const Layer *layer = &LayerIndex[0]; |
214
5a5404338b9f
Adding support for layer packing
Jacob Alexander <haata@kiibohd.com>
parents:
205
diff
changeset
|
355 |
5a5404338b9f
Adding support for layer packing
Jacob Alexander <haata@kiibohd.com>
parents:
205
diff
changeset
|
356 // Make sure scanCode is between layer first and last scancodes |
5a5404338b9f
Adding support for layer packing
Jacob Alexander <haata@kiibohd.com>
parents:
205
diff
changeset
|
357 if ( map != 0 |
215
00a8c7f491d4
Fixing first and last element bug for layers.
Jacob Alexander <haata@kiibohd.com>
parents:
214
diff
changeset
|
358 && scanCode <= layer->last |
00a8c7f491d4
Fixing first and last element bug for layers.
Jacob Alexander <haata@kiibohd.com>
parents:
214
diff
changeset
|
359 && scanCode >= layer->first |
214
5a5404338b9f
Adding support for layer packing
Jacob Alexander <haata@kiibohd.com>
parents:
205
diff
changeset
|
360 && *map[ scanCode - layer->first ] != 0 ) |
184
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
361 { |
214
5a5404338b9f
Adding support for layer packing
Jacob Alexander <haata@kiibohd.com>
parents:
205
diff
changeset
|
362 return map[ scanCode - layer->first ]; |
184
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
363 } |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
364 |
214
5a5404338b9f
Adding support for layer packing
Jacob Alexander <haata@kiibohd.com>
parents:
205
diff
changeset
|
365 // Otherwise no defined Trigger Macro |
5a5404338b9f
Adding support for layer packing
Jacob Alexander <haata@kiibohd.com>
parents:
205
diff
changeset
|
366 erro_msg("Scan Code has no defined Trigger Macro: "); |
5a5404338b9f
Adding support for layer packing
Jacob Alexander <haata@kiibohd.com>
parents:
205
diff
changeset
|
367 printHex( scanCode ); |
5a5404338b9f
Adding support for layer packing
Jacob Alexander <haata@kiibohd.com>
parents:
205
diff
changeset
|
368 return 0; |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
369 } |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
370 |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
371 |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
372 // Update the scancode key state |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
373 // States: |
184
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
374 // * 0x00 - Off |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
375 // * 0x01 - Pressed |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
376 // * 0x02 - Held |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
377 // * 0x03 - Released |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
378 // * 0x04 - Unpressed (this is currently ignored) |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
379 inline void Macro_keyState( uint8_t scanCode, uint8_t state ) |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
380 { |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
381 // Only add to macro trigger list if one of three states |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
382 switch ( state ) |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
383 { |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
384 case 0x01: // Pressed |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
385 case 0x02: // Held |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
386 case 0x03: // Released |
184
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
387 macroTriggerListBuffer[ macroTriggerListBufferSize ].scanCode = scanCode; |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
388 macroTriggerListBuffer[ macroTriggerListBufferSize ].state = state; |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
389 macroTriggerListBuffer[ macroTriggerListBufferSize ].type = 0x00; // Normal key |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
390 macroTriggerListBufferSize++; |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
391 break; |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
392 } |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
393 } |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
394 |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
395 |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
396 // Update the scancode analog state |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
397 // States: |
184
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
398 // * 0x00 - Off |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
399 // * 0x01 - Released |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
400 // * 0x02-0xFF - Analog value (low to high) |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
401 inline void Macro_analogState( uint8_t scanCode, uint8_t state ) |
166
2fba36caf039
Initial work for KLL macro support
Jacob Alexander <haata@kiibohd.com>
parents:
159
diff
changeset
|
402 { |
184
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
403 // Only add to macro trigger list if non-off |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
404 if ( state != 0x00 ) |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
405 { |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
406 macroTriggerListBuffer[ macroTriggerListBufferSize ].scanCode = scanCode; |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
407 macroTriggerListBuffer[ macroTriggerListBufferSize ].state = state; |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
408 macroTriggerListBuffer[ macroTriggerListBufferSize ].type = 0x02; // Analog key |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
409 macroTriggerListBufferSize++; |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
410 } |
166
2fba36caf039
Initial work for KLL macro support
Jacob Alexander <haata@kiibohd.com>
parents:
159
diff
changeset
|
411 } |
2fba36caf039
Initial work for KLL macro support
Jacob Alexander <haata@kiibohd.com>
parents:
159
diff
changeset
|
412 |
2fba36caf039
Initial work for KLL macro support
Jacob Alexander <haata@kiibohd.com>
parents:
159
diff
changeset
|
413 |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
414 // Update led state |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
415 // States: |
184
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
416 // * 0x00 - Off |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
417 // * 0x01 - On |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
418 inline void Macro_ledState( uint8_t ledCode, uint8_t state ) |
166
2fba36caf039
Initial work for KLL macro support
Jacob Alexander <haata@kiibohd.com>
parents:
159
diff
changeset
|
419 { |
184
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
420 // Only add to macro trigger list if non-off |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
421 if ( state != 0x00 ) |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
422 { |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
423 macroTriggerListBuffer[ macroTriggerListBufferSize ].scanCode = ledCode; |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
424 macroTriggerListBuffer[ macroTriggerListBufferSize ].state = state; |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
425 macroTriggerListBuffer[ macroTriggerListBufferSize ].type = 0x01; // LED key |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
426 macroTriggerListBufferSize++; |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
427 } |
166
2fba36caf039
Initial work for KLL macro support
Jacob Alexander <haata@kiibohd.com>
parents:
159
diff
changeset
|
428 } |
2fba36caf039
Initial work for KLL macro support
Jacob Alexander <haata@kiibohd.com>
parents:
159
diff
changeset
|
429 |
2fba36caf039
Initial work for KLL macro support
Jacob Alexander <haata@kiibohd.com>
parents:
159
diff
changeset
|
430 |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
431 // Append result macro to pending list, checking for duplicates |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
432 // Do nothing if duplicate |
217
8ceb1a0582ee
Adding more RAM optimizations
Jacob Alexander <haata@kiibohd.com>
parents:
216
diff
changeset
|
433 inline void Macro_appendResultMacroToPendingList( const TriggerMacro *triggerMacro ) |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
434 { |
196
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
435 // Lookup result macro index |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
436 var_uint_t resultMacroIndex = triggerMacro->result; |
196
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
437 |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
438 // Iterate through result macro pending list, making sure this macro hasn't been added yet |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
439 for ( var_uint_t macro = 0; macro < macroResultMacroPendingListSize; macro++ ) |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
440 { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
441 // If duplicate found, do nothing |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
442 if ( macroResultMacroPendingList[ macro ] == resultMacroIndex ) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
443 return; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
444 } |
166
2fba36caf039
Initial work for KLL macro support
Jacob Alexander <haata@kiibohd.com>
parents:
159
diff
changeset
|
445 |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
446 // No duplicates found, add to pending list |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
447 macroResultMacroPendingList[ macroResultMacroPendingListSize++ ] = resultMacroIndex; |
196
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
448 |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
449 // Lookup scanCode of the last key in the last combo |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
450 var_uint_t pos = 0; |
196
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
451 for ( uint8_t comboLength = triggerMacro->guide[0]; comboLength > 0; ) |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
452 { |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
453 pos += TriggerGuideSize * comboLength + 1; |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
454 comboLength = triggerMacro->guide[ pos ]; |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
455 } |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
456 |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
457 uint8_t scanCode = ((TriggerGuide*)&triggerMacro->guide[ pos - TriggerGuideSize ])->scanCode; |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
458 |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
459 // Lookup scanCode in buffer list for the current state and stateType |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
460 for ( uint8_t keyIndex = 0; keyIndex < macroTriggerListBufferSize; keyIndex++ ) |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
461 { |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
462 if ( macroTriggerListBuffer[ keyIndex ].scanCode == scanCode ) |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
463 { |
217
8ceb1a0582ee
Adding more RAM optimizations
Jacob Alexander <haata@kiibohd.com>
parents:
216
diff
changeset
|
464 ResultMacroRecordList[ resultMacroIndex ].state = macroTriggerListBuffer[ keyIndex ].state; |
8ceb1a0582ee
Adding more RAM optimizations
Jacob Alexander <haata@kiibohd.com>
parents:
216
diff
changeset
|
465 ResultMacroRecordList[ resultMacroIndex ].stateType = macroTriggerListBuffer[ keyIndex ].type; |
196
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
466 } |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
467 } |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
468 |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
469 // Reset the macro position |
217
8ceb1a0582ee
Adding more RAM optimizations
Jacob Alexander <haata@kiibohd.com>
parents:
216
diff
changeset
|
470 ResultMacroRecordList[ resultMacroIndex ].pos = 0; |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
471 } |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
472 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
473 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
474 // Determine if long ResultMacro (more than 1 seqence element) |
217
8ceb1a0582ee
Adding more RAM optimizations
Jacob Alexander <haata@kiibohd.com>
parents:
216
diff
changeset
|
475 inline uint8_t Macro_isLongResultMacro( const ResultMacro *macro ) |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
476 { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
477 // Check the second sequence combo length |
196
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
478 // If non-zero return non-zero (long sequence) |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
479 // 0 otherwise (short sequence) |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
480 var_uint_t position = 1; |
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
481 for ( var_uint_t result = 0; result < macro->guide[0]; result++ ) |
196
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
482 position += ResultGuideSize( (ResultGuide*)¯o->guide[ position ] ); |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
483 return macro->guide[ position ]; |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
484 } |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
485 |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
486 |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
487 // Determine if long TriggerMacro (more than 1 sequence element) |
217
8ceb1a0582ee
Adding more RAM optimizations
Jacob Alexander <haata@kiibohd.com>
parents:
216
diff
changeset
|
488 inline uint8_t Macro_isLongTriggerMacro( const TriggerMacro *macro ) |
196
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
489 { |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
490 // Check the second sequence combo length |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
491 // If non-zero return non-zero (long sequence) |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
492 // 0 otherwise (short sequence) |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
493 return macro->guide[ macro->guide[0] * TriggerGuideSize + 1 ]; |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
494 } |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
495 |
166
2fba36caf039
Initial work for KLL macro support
Jacob Alexander <haata@kiibohd.com>
parents:
159
diff
changeset
|
496 |
196
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
497 // Votes on the given key vs. guide, short macros |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
498 inline TriggerMacroVote Macro_evalShortTriggerMacroVote( TriggerGuide *key, TriggerGuide *guide ) |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
499 { |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
500 // Depending on key type |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
501 switch ( guide->type ) |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
502 { |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
503 // Normal State Type |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
504 case 0x00: |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
505 // For short TriggerMacros completely ignore incorrect keys |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
506 if ( guide->scanCode == key->scanCode ) |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
507 { |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
508 switch ( key->state ) |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
509 { |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
510 // Correct key, pressed, possible passing |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
511 case 0x01: |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
512 return TriggerMacroVote_Pass; |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
513 |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
514 // Correct key, held, possible passing or release |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
515 case 0x02: |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
516 return TriggerMacroVote_PassRelease; |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
517 |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
518 // Correct key, released, possible release |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
519 case 0x03: |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
520 return TriggerMacroVote_Release; |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
521 } |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
522 } |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
523 |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
524 return TriggerMacroVote_DoNothing; |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
525 |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
526 // LED State Type |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
527 case 0x01: |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
528 erro_print("LED State Type - Not implemented..."); |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
529 break; |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
530 |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
531 // Analog State Type |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
532 case 0x02: |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
533 erro_print("Analog State Type - Not implemented..."); |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
534 break; |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
535 |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
536 // Invalid State Type |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
537 default: |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
538 erro_print("Invalid State Type. This is a bug."); |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
539 break; |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
540 } |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
541 |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
542 // XXX Shouldn't reach here |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
543 return TriggerMacroVote_Invalid; |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
544 } |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
545 |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
546 |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
547 // Votes on the given key vs. guide, long macros |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
548 // A long macro is defined as a guide with more than 1 combo |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
549 inline TriggerMacroVote Macro_evalLongTriggerMacroVote( TriggerGuide *key, TriggerGuide *guide ) |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
550 { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
551 // Depending on key type |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
552 switch ( guide->type ) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
553 { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
554 // Normal State Type |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
555 case 0x00: |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
556 // Depending on the state of the buffered key, make voting decision |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
557 // Incorrect key |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
558 if ( guide->scanCode != key->scanCode ) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
559 { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
560 switch ( key->state ) |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
561 { |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
562 // Wrong key, pressed, fail |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
563 case 0x01: |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
564 return TriggerMacroVote_Fail; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
565 |
197
1ebb6fb5f74f
All basic macros tested and working!
Jacob Alexander <haata@kiibohd.com>
parents:
196
diff
changeset
|
566 // Wrong key, held, do not pass (no effect) |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
567 case 0x02: |
197
1ebb6fb5f74f
All basic macros tested and working!
Jacob Alexander <haata@kiibohd.com>
parents:
196
diff
changeset
|
568 return TriggerMacroVote_DoNothing; |
1ebb6fb5f74f
All basic macros tested and working!
Jacob Alexander <haata@kiibohd.com>
parents:
196
diff
changeset
|
569 |
1ebb6fb5f74f
All basic macros tested and working!
Jacob Alexander <haata@kiibohd.com>
parents:
196
diff
changeset
|
570 // Wrong key released, fail out if pos == 0 |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
571 case 0x03: |
197
1ebb6fb5f74f
All basic macros tested and working!
Jacob Alexander <haata@kiibohd.com>
parents:
196
diff
changeset
|
572 return TriggerMacroVote_DoNothing | TriggerMacroVote_DoNothingRelease; |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
573 } |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
574 } |
166
2fba36caf039
Initial work for KLL macro support
Jacob Alexander <haata@kiibohd.com>
parents:
159
diff
changeset
|
575 |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
576 // Correct key |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
577 else |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
578 { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
579 switch ( key->state ) |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
580 { |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
581 // Correct key, pressed, possible passing |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
582 case 0x01: |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
583 return TriggerMacroVote_Pass; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
584 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
585 // Correct key, held, possible passing or release |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
586 case 0x02: |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
587 return TriggerMacroVote_PassRelease; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
588 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
589 // Correct key, released, possible release |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
590 case 0x03: |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
591 return TriggerMacroVote_Release; |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
592 } |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
593 } |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
594 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
595 break; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
596 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
597 // LED State Type |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
598 case 0x01: |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
599 erro_print("LED State Type - Not implemented..."); |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
600 break; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
601 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
602 // Analog State Type |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
603 case 0x02: |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
604 erro_print("Analog State Type - Not implemented..."); |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
605 break; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
606 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
607 // Invalid State Type |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
608 default: |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
609 erro_print("Invalid State Type. This is a bug."); |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
610 break; |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
611 } |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
612 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
613 // XXX Shouldn't reach here |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
614 return TriggerMacroVote_Invalid; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
615 } |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
616 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
617 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
618 // Evaluate/Update TriggerMacro |
265
708af1b9bc55
Fixing warning messages found using clang.
Jacob Alexander <haata@kiibohd.com>
parents:
253
diff
changeset
|
619 TriggerMacroEval Macro_evalTriggerMacro( var_uint_t triggerMacroIndex ) |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
620 { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
621 // Lookup TriggerMacro |
217
8ceb1a0582ee
Adding more RAM optimizations
Jacob Alexander <haata@kiibohd.com>
parents:
216
diff
changeset
|
622 const TriggerMacro *macro = &TriggerMacroList[ triggerMacroIndex ]; |
8ceb1a0582ee
Adding more RAM optimizations
Jacob Alexander <haata@kiibohd.com>
parents:
216
diff
changeset
|
623 TriggerMacroRecord *record = &TriggerMacroRecordList[ triggerMacroIndex ]; |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
624 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
625 // Check if macro has finished and should be incremented sequence elements |
217
8ceb1a0582ee
Adding more RAM optimizations
Jacob Alexander <haata@kiibohd.com>
parents:
216
diff
changeset
|
626 if ( record->state == TriggerMacro_Release ) |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
627 { |
217
8ceb1a0582ee
Adding more RAM optimizations
Jacob Alexander <haata@kiibohd.com>
parents:
216
diff
changeset
|
628 record->state = TriggerMacro_Waiting; |
8ceb1a0582ee
Adding more RAM optimizations
Jacob Alexander <haata@kiibohd.com>
parents:
216
diff
changeset
|
629 record->pos = record->pos + macro->guide[ record->pos ] * TriggerGuideSize + 1; |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
630 } |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
631 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
632 // Current Macro position |
217
8ceb1a0582ee
Adding more RAM optimizations
Jacob Alexander <haata@kiibohd.com>
parents:
216
diff
changeset
|
633 var_uint_t pos = record->pos; |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
634 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
635 // Length of the combo being processed |
196
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
636 uint8_t comboLength = macro->guide[ pos ] * TriggerGuideSize; |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
637 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
638 // If no combo items are left, remove the TriggerMacro from the pending list |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
639 if ( comboLength == 0 ) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
640 { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
641 return TriggerMacroEval_Remove; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
642 } |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
643 |
196
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
644 // Check if this is a long Trigger Macro |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
645 uint8_t longMacro = Macro_isLongTriggerMacro( macro ); |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
646 |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
647 // Iterate through the items in the combo, voting the on the key state |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
648 // If any of the pressed keys do not match, fail the macro |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
649 // |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
650 // The macro is waiting for input when in the TriggerMacro_Waiting state |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
651 // Once all keys have been pressed/held (only those keys), entered TriggerMacro_Press state (passing) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
652 // Transition to the next combo (if it exists) when a single key is released (TriggerMacro_Release state) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
653 // On scan after position increment, change to TriggerMacro_Waiting state |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
654 // TODO Add support for system LED states (NumLock, CapsLock, etc.) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
655 // TODO Add support for analog key states |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
656 // TODO Add support for 0x00 Key state (not pressing a key, not all that useful in general) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
657 // TODO Add support for Press/Hold/Release differentiation when evaluating (not sure if useful) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
658 TriggerMacroVote overallVote = TriggerMacroVote_Invalid; |
196
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
659 for ( uint8_t comboItem = pos + 1; comboItem < pos + comboLength + 1; comboItem += TriggerGuideSize ) |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
660 { |
196
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
661 // Assign TriggerGuide element (key type, state and scancode) |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
662 TriggerGuide *guide = (TriggerGuide*)(¯o->guide[ comboItem ]); |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
663 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
664 TriggerMacroVote vote = TriggerMacroVote_Invalid; |
196
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
665 // Iterate through the key buffer, comparing to each key in the combo |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
666 for ( uint8_t key = 0; key < macroTriggerListBufferSize; key++ ) |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
667 { |
196
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
668 // Lookup key information |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
669 TriggerGuide *keyInfo = ¯oTriggerListBuffer[ key ]; |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
670 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
671 // If vote is a pass (>= 0x08, no more keys in the combo need to be looked at) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
672 // Also mask all of the non-passing votes |
196
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
673 vote |= longMacro |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
674 ? Macro_evalLongTriggerMacroVote( keyInfo, guide ) |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
675 : Macro_evalShortTriggerMacroVote( keyInfo, guide ); |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
676 if ( vote >= TriggerMacroVote_Pass ) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
677 { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
678 vote &= TriggerMacroVote_Release | TriggerMacroVote_PassRelease | TriggerMacroVote_Pass; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
679 break; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
680 } |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
681 } |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
682 |
196
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
683 // If no pass vote was found after scanning all of the keys |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
684 // Fail the combo, if this is a short macro (long macros already will have a fail vote) |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
685 if ( !longMacro && vote < TriggerMacroVote_Pass ) |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
686 vote |= TriggerMacroVote_Fail; |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
687 |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
688 // After voting, append to overall vote |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
689 overallVote |= vote; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
690 } |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
691 |
197
1ebb6fb5f74f
All basic macros tested and working!
Jacob Alexander <haata@kiibohd.com>
parents:
196
diff
changeset
|
692 // If no pass vote was found after scanning the entire combo |
1ebb6fb5f74f
All basic macros tested and working!
Jacob Alexander <haata@kiibohd.com>
parents:
196
diff
changeset
|
693 // And this is the first position in the combo, just remove it (nothing important happened) |
1ebb6fb5f74f
All basic macros tested and working!
Jacob Alexander <haata@kiibohd.com>
parents:
196
diff
changeset
|
694 if ( longMacro && overallVote & TriggerMacroVote_DoNothingRelease && pos == 0 ) |
1ebb6fb5f74f
All basic macros tested and working!
Jacob Alexander <haata@kiibohd.com>
parents:
196
diff
changeset
|
695 overallVote |= TriggerMacroVote_Fail; |
1ebb6fb5f74f
All basic macros tested and working!
Jacob Alexander <haata@kiibohd.com>
parents:
196
diff
changeset
|
696 |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
697 // Decide new state of macro after voting |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
698 // Fail macro, remove from pending list |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
699 if ( overallVote & TriggerMacroVote_Fail ) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
700 { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
701 return TriggerMacroEval_Remove; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
702 } |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
703 // Do nothing, incorrect key is being held or released |
196
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
704 else if ( overallVote & TriggerMacroVote_DoNothing && longMacro ) |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
705 { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
706 // Just doing nothing :) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
707 } |
216
738445f38639
DPH controller now working with the kishsaver and macros
Jacob Alexander <haata@kiibohd.com>
parents:
215
diff
changeset
|
708 // If ready for transition and in Press state, set to Waiting and increment combo position |
738445f38639
DPH controller now working with the kishsaver and macros
Jacob Alexander <haata@kiibohd.com>
parents:
215
diff
changeset
|
709 // Position is incremented (and possibly remove the macro from the pending list) on the next iteration |
217
8ceb1a0582ee
Adding more RAM optimizations
Jacob Alexander <haata@kiibohd.com>
parents:
216
diff
changeset
|
710 else if ( overallVote & TriggerMacroVote_Release && record->state == TriggerMacro_Press ) |
216
738445f38639
DPH controller now working with the kishsaver and macros
Jacob Alexander <haata@kiibohd.com>
parents:
215
diff
changeset
|
711 { |
217
8ceb1a0582ee
Adding more RAM optimizations
Jacob Alexander <haata@kiibohd.com>
parents:
216
diff
changeset
|
712 record->state = TriggerMacro_Release; |
216
738445f38639
DPH controller now working with the kishsaver and macros
Jacob Alexander <haata@kiibohd.com>
parents:
215
diff
changeset
|
713 |
738445f38639
DPH controller now working with the kishsaver and macros
Jacob Alexander <haata@kiibohd.com>
parents:
215
diff
changeset
|
714 // If this is the last combo in the sequence, remove from the pending list |
217
8ceb1a0582ee
Adding more RAM optimizations
Jacob Alexander <haata@kiibohd.com>
parents:
216
diff
changeset
|
715 if ( macro->guide[ record->pos + macro->guide[ record->pos ] * TriggerGuideSize + 1 ] == 0 ) |
216
738445f38639
DPH controller now working with the kishsaver and macros
Jacob Alexander <haata@kiibohd.com>
parents:
215
diff
changeset
|
716 return TriggerMacroEval_DoResultAndRemove; |
738445f38639
DPH controller now working with the kishsaver and macros
Jacob Alexander <haata@kiibohd.com>
parents:
215
diff
changeset
|
717 } |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
718 // If passing and in Waiting state, set macro state to Press |
196
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
719 else if ( overallVote & TriggerMacroVote_Pass |
217
8ceb1a0582ee
Adding more RAM optimizations
Jacob Alexander <haata@kiibohd.com>
parents:
216
diff
changeset
|
720 && ( record->state == TriggerMacro_Waiting || record->state == TriggerMacro_Press ) ) |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
721 { |
217
8ceb1a0582ee
Adding more RAM optimizations
Jacob Alexander <haata@kiibohd.com>
parents:
216
diff
changeset
|
722 record->state = TriggerMacro_Press; |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
723 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
724 // If in press state, and this is the final combo, send request for ResultMacro |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
725 // Check to see if the result macro only has a single element |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
726 // If this result macro has more than 1 key, only send once |
196
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
727 // TODO Add option to have long macro repeat rate |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
728 if ( macro->guide[ pos + comboLength + 1 ] == 0 ) |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
729 { |
196
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
730 // Long result macro (more than 1 combo) |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
731 if ( Macro_isLongResultMacro( &ResultMacroList[ macro->result ] ) ) |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
732 { |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
733 // Only ever trigger result once, on press |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
734 if ( overallVote == TriggerMacroVote_Pass ) |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
735 { |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
736 return TriggerMacroEval_DoResultAndRemove; |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
737 } |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
738 } |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
739 // Short result macro |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
740 else |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
741 { |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
742 // Only trigger result once, on press, if long trigger (more than 1 combo) |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
743 if ( Macro_isLongTriggerMacro( macro ) ) |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
744 { |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
745 return TriggerMacroEval_DoResultAndRemove; |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
746 } |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
747 // Otherwise, trigger result continuously |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
748 else |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
749 { |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
750 return TriggerMacroEval_DoResult; |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
751 } |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
752 } |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
753 } |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
754 } |
196
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
755 // Otherwise, just remove the macro on key release |
201
326f75709d10
Fixing release state for keys
Jacob Alexander <jacob.alexander@virtualinstruments.com>
parents:
199
diff
changeset
|
756 // One more result has to be called to indicate to the ResultMacro that the key transitioned to the release state |
196
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
757 else if ( overallVote & TriggerMacroVote_Release ) |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
758 { |
201
326f75709d10
Fixing release state for keys
Jacob Alexander <jacob.alexander@virtualinstruments.com>
parents:
199
diff
changeset
|
759 return TriggerMacroEval_DoResultAndRemove; |
196
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
760 } |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
761 |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
762 // If this is a short macro, just remove it |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
763 // The state can be rebuilt on the next iteration |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
764 if ( !longMacro ) |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
765 return TriggerMacroEval_Remove; |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
766 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
767 return TriggerMacroEval_DoNothing; |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
768 } |
166
2fba36caf039
Initial work for KLL macro support
Jacob Alexander <haata@kiibohd.com>
parents:
159
diff
changeset
|
769 |
2fba36caf039
Initial work for KLL macro support
Jacob Alexander <haata@kiibohd.com>
parents:
159
diff
changeset
|
770 |
185 | 771 // Evaluate/Update ResultMacro |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
772 inline ResultMacroEval Macro_evalResultMacro( var_uint_t resultMacroIndex ) |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
773 { |
190
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
774 // Lookup ResultMacro |
217
8ceb1a0582ee
Adding more RAM optimizations
Jacob Alexander <haata@kiibohd.com>
parents:
216
diff
changeset
|
775 const ResultMacro *macro = &ResultMacroList[ resultMacroIndex ]; |
8ceb1a0582ee
Adding more RAM optimizations
Jacob Alexander <haata@kiibohd.com>
parents:
216
diff
changeset
|
776 ResultMacroRecord *record = &ResultMacroRecordList[ resultMacroIndex ]; |
190
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
777 |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
778 // Current Macro position |
217
8ceb1a0582ee
Adding more RAM optimizations
Jacob Alexander <haata@kiibohd.com>
parents:
216
diff
changeset
|
779 var_uint_t pos = record->pos; |
190
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
780 |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
781 // Length of combo being processed |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
782 uint8_t comboLength = macro->guide[ pos ]; |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
783 |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
784 // Function Counter, used to keep track of the combo items processed |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
785 var_uint_t funcCount = 0; |
190
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
786 |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
787 // Combo Item Position within the guide |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
788 var_uint_t comboItem = pos + 1; |
190
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
789 |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
790 // Iterate through the Result Combo |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
791 while ( funcCount < comboLength ) |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
792 { |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
793 // Assign TriggerGuide element (key type, state and scancode) |
196
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
794 ResultGuide *guide = (ResultGuide*)(¯o->guide[ comboItem ]); |
190
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
795 |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
796 // Do lookup on capability function |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
797 void (*capability)(uint8_t, uint8_t, uint8_t*) = (void(*)(uint8_t, uint8_t, uint8_t*))(CapabilitiesList[ guide->index ].func); |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
798 |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
799 // Call capability |
217
8ceb1a0582ee
Adding more RAM optimizations
Jacob Alexander <haata@kiibohd.com>
parents:
216
diff
changeset
|
800 capability( record->state, record->stateType, &guide->args ); |
190
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
801 |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
802 // Increment counters |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
803 funcCount++; |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
804 comboItem += ResultGuideSize( (ResultGuide*)(¯o->guide[ comboItem ]) ); |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
805 } |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
806 |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
807 // Move to next item in the sequence |
217
8ceb1a0582ee
Adding more RAM optimizations
Jacob Alexander <haata@kiibohd.com>
parents:
216
diff
changeset
|
808 record->pos = comboItem; |
190
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
809 |
196
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
810 // If the ResultMacro is finished, remove |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
811 if ( macro->guide[ comboItem ] == 0 ) |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
812 { |
217
8ceb1a0582ee
Adding more RAM optimizations
Jacob Alexander <haata@kiibohd.com>
parents:
216
diff
changeset
|
813 record->pos = 0; |
196
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
814 return ResultMacroEval_Remove; |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
815 } |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
816 |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
817 // Otherwise leave the macro in the list |
190
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
818 return ResultMacroEval_DoNothing; |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
819 } |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
820 |
159
84beeecd2c94
Kishsaver is fully working with DPH!
Jacob Alexander <haata@kiibohd.com>
parents:
150
diff
changeset
|
821 |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
822 // Update pending trigger list |
196
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
823 inline void Macro_updateTriggerMacroPendingList() |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
824 { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
825 // Iterate over the macroTriggerListBuffer to add any new Trigger Macros to the pending list |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
826 for ( uint8_t key = 0; key < macroTriggerListBufferSize; key++ ) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
827 { |
196
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
828 // TODO LED States |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
829 // TODO Analog Switches |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
830 // Only add TriggerMacro to pending list if key was pressed (not held, released or off) |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
831 if ( macroTriggerListBuffer[ key ].state == 0x00 && macroTriggerListBuffer[ key ].state != 0x01 ) |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
832 continue; |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
833 |
253
e79f2b9c39cf
Fixing layer latch capability.
Jacob Alexander <haata@kiibohd.com>
parents:
241
diff
changeset
|
834 // TODO Analog |
e79f2b9c39cf
Fixing layer latch capability.
Jacob Alexander <haata@kiibohd.com>
parents:
241
diff
changeset
|
835 // If this is a release case, indicate to layer lookup for possible latch expiry |
e79f2b9c39cf
Fixing layer latch capability.
Jacob Alexander <haata@kiibohd.com>
parents:
241
diff
changeset
|
836 uint8_t latch_expire = macroTriggerListBuffer[ key ].state == 0x03; |
e79f2b9c39cf
Fixing layer latch capability.
Jacob Alexander <haata@kiibohd.com>
parents:
241
diff
changeset
|
837 |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
838 // Lookup Trigger List |
253
e79f2b9c39cf
Fixing layer latch capability.
Jacob Alexander <haata@kiibohd.com>
parents:
241
diff
changeset
|
839 nat_ptr_t *triggerList = Macro_layerLookup( macroTriggerListBuffer[ key ].scanCode, latch_expire ); |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
840 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
841 // Number of Triggers in list |
202
1a68a9a04ad3
Adding variable width state variable width.
Jacob Alexander <haata@kiibohd.com>
parents:
201
diff
changeset
|
842 nat_ptr_t triggerListSize = triggerList[0]; |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
843 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
844 // Iterate over triggerList to see if any TriggerMacros need to be added |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
845 // First item is the number of items in the TriggerList |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
846 for ( var_uint_t macro = 1; macro < triggerListSize + 1; macro++ ) |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
847 { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
848 // Lookup trigger macro index |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
849 var_uint_t triggerMacroIndex = triggerList[ macro ]; |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
850 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
851 // Iterate over macroTriggerMacroPendingList to see if any macro in the scancode's |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
852 // triggerList needs to be added |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
853 var_uint_t pending = 0; |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
854 for ( ; pending < macroTriggerMacroPendingListSize; pending++ ) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
855 { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
856 // Stop scanning if the trigger macro index is found in the pending list |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
857 if ( macroTriggerMacroPendingList[ pending ] == triggerMacroIndex ) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
858 break; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
859 } |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
860 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
861 // If the triggerMacroIndex (macro) was not found in the macroTriggerMacroPendingList |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
862 // Add it to the list |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
863 if ( pending == macroTriggerMacroPendingListSize ) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
864 { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
865 macroTriggerMacroPendingList[ macroTriggerMacroPendingListSize++ ] = triggerMacroIndex; |
196
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
866 |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
867 // Reset macro position |
217
8ceb1a0582ee
Adding more RAM optimizations
Jacob Alexander <haata@kiibohd.com>
parents:
216
diff
changeset
|
868 TriggerMacroRecordList[ triggerMacroIndex ].pos = 0; |
8ceb1a0582ee
Adding more RAM optimizations
Jacob Alexander <haata@kiibohd.com>
parents:
216
diff
changeset
|
869 TriggerMacroRecordList[ triggerMacroIndex ].state = TriggerMacro_Waiting; |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
870 } |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
871 } |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
872 } |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
873 } |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
874 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
875 |
185 | 876 // Macro Procesing Loop |
877 // Called once per USB buffer send | |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
878 inline void Macro_process() |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
879 { |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
880 // Only do one round of macro processing between Output Module timer sends |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
881 if ( USBKeys_Sent != 0 ) |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
882 return; |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
883 |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
884 // If the pause flag is set, only process if the step counter is non-zero |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
885 if ( macroPauseMode ) |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
886 { |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
887 if ( macroStepCounter == 0 ) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
888 return; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
889 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
890 // Proceed, decrementing the step counter |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
891 macroStepCounter--; |
192
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
892 dbug_print("Macro Step"); |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
893 } |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
894 |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
895 // Update pending trigger list, before processing TriggerMacros |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
896 Macro_updateTriggerMacroPendingList(); |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
897 |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
898 // Tail pointer for macroTriggerMacroPendingList |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
899 // Macros must be explicitly re-added |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
900 var_uint_t macroTriggerMacroPendingListTail = 0; |
185 | 901 |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
902 // Iterate through the pending TriggerMacros, processing each of them |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
903 for ( var_uint_t macro = 0; macro < macroTriggerMacroPendingListSize; macro++ ) |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
904 { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
905 switch ( Macro_evalTriggerMacro( macroTriggerMacroPendingList[ macro ] ) ) |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
906 { |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
907 // Trigger Result Macro (purposely falling through) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
908 case TriggerMacroEval_DoResult: |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
909 // Append ResultMacro to PendingList |
196
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
910 Macro_appendResultMacroToPendingList( &TriggerMacroList[ macroTriggerMacroPendingList[ macro ] ] ); |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
911 |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
912 default: |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
913 macroTriggerMacroPendingList[ macroTriggerMacroPendingListTail++ ] = macroTriggerMacroPendingList[ macro ]; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
914 break; |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
915 |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
916 // Trigger Result Macro and Remove (purposely falling through) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
917 case TriggerMacroEval_DoResultAndRemove: |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
918 // Append ResultMacro to PendingList |
196
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
919 Macro_appendResultMacroToPendingList( &TriggerMacroList[ macroTriggerMacroPendingList[ macro ] ] ); |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
920 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
921 // Remove Macro from Pending List, nothing to do, removing by default |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
922 case TriggerMacroEval_Remove: |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
923 break; |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
924 } |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
925 } |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
926 |
190
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
927 // Update the macroTriggerMacroPendingListSize with the tail pointer |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
928 macroTriggerMacroPendingListSize = macroTriggerMacroPendingListTail; |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
929 |
190
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
930 |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
931 // Tail pointer for macroResultMacroPendingList |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
932 // Macros must be explicitly re-added |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
933 var_uint_t macroResultMacroPendingListTail = 0; |
190
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
934 |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
935 // Iterate through the pending ResultMacros, processing each of them |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
936 for ( var_uint_t macro = 0; macro < macroResultMacroPendingListSize; macro++ ) |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
937 { |
190
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
938 switch ( Macro_evalResultMacro( macroResultMacroPendingList[ macro ] ) ) |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
939 { |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
940 // Re-add macros to pending list |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
941 case ResultMacroEval_DoNothing: |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
942 default: |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
943 macroResultMacroPendingList[ macroResultMacroPendingListTail++ ] = macroResultMacroPendingList[ macro ]; |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
944 break; |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
945 |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
946 // Remove Macro from Pending List, nothing to do, removing by default |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
947 case ResultMacroEval_Remove: |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
948 break; |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
949 } |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
950 } |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
951 |
190
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
952 // Update the macroResultMacroPendingListSize with the tail pointer |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
953 macroResultMacroPendingListSize = macroResultMacroPendingListTail; |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
954 |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
955 // Signal buffer that we've used it |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
956 Scan_finishedWithMacro( macroTriggerListBufferSize ); |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
957 |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
958 // Reset TriggerList buffer |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
959 macroTriggerListBufferSize = 0; |
126
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
960 |
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
961 // If Macro debug mode is set, clear the USB Buffer |
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
962 if ( macroDebugMode ) |
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
963 { |
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
964 USBKeys_Modifiers = 0; |
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
965 USBKeys_Sent = 0; |
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
966 } |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
967 } |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
968 |
185 | 969 |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
970 inline void Macro_setup() |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
971 { |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
972 // Register Macro CLI dictionary |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
973 CLI_registerDictionary( macroCLIDict, macroCLIDictName ); |
126
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
974 |
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
975 // Disable Macro debug mode |
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
976 macroDebugMode = 0; |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
977 |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
978 // Disable Macro pause flag |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
979 macroPauseMode = 0; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
980 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
981 // Set Macro step counter to zero |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
982 macroStepCounter = 0; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
983 |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
984 // Make sure macro trigger buffer is empty |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
985 macroTriggerListBufferSize = 0; |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
986 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
987 // Initialize TriggerMacro states |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
988 for ( var_uint_t macro = 0; macro < TriggerMacroNum; macro++ ) |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
989 { |
217
8ceb1a0582ee
Adding more RAM optimizations
Jacob Alexander <haata@kiibohd.com>
parents:
216
diff
changeset
|
990 TriggerMacroRecordList[ macro ].pos = 0; |
8ceb1a0582ee
Adding more RAM optimizations
Jacob Alexander <haata@kiibohd.com>
parents:
216
diff
changeset
|
991 TriggerMacroRecordList[ macro ].state = TriggerMacro_Waiting; |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
992 } |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
993 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
994 // Initialize ResultMacro states |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
995 for ( var_uint_t macro = 0; macro < ResultMacroNum; macro++ ) |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
996 { |
217
8ceb1a0582ee
Adding more RAM optimizations
Jacob Alexander <haata@kiibohd.com>
parents:
216
diff
changeset
|
997 ResultMacroRecordList[ macro ].pos = 0; |
8ceb1a0582ee
Adding more RAM optimizations
Jacob Alexander <haata@kiibohd.com>
parents:
216
diff
changeset
|
998 ResultMacroRecordList[ macro ].state = 0; |
8ceb1a0582ee
Adding more RAM optimizations
Jacob Alexander <haata@kiibohd.com>
parents:
216
diff
changeset
|
999 ResultMacroRecordList[ macro ].stateType = 0; |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
1000 } |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
1001 } |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
1002 |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
1003 |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
1004 // ----- CLI Command Functions ----- |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
1005 |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
1006 void cliFunc_capList( char* args ) |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
1007 { |
180
ed56f7873645
Added capabilities list debug option
Jacob Alexander <haata@kiibohd.com>
parents:
179
diff
changeset
|
1008 print( NL ); |
271
e6c753528873
More mk20dx256vlh7 preparation.
Jacob Alexander <haata@kiibohd.com>
parents:
265
diff
changeset
|
1009 info_msg("Capabilities List "); |
192
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1010 printHex( CapabilitiesNum ); |
180
ed56f7873645
Added capabilities list debug option
Jacob Alexander <haata@kiibohd.com>
parents:
179
diff
changeset
|
1011 |
ed56f7873645
Added capabilities list debug option
Jacob Alexander <haata@kiibohd.com>
parents:
179
diff
changeset
|
1012 // Iterate through all of the capabilities and display them |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
1013 for ( var_uint_t cap = 0; cap < CapabilitiesNum; cap++ ) |
180
ed56f7873645
Added capabilities list debug option
Jacob Alexander <haata@kiibohd.com>
parents:
179
diff
changeset
|
1014 { |
ed56f7873645
Added capabilities list debug option
Jacob Alexander <haata@kiibohd.com>
parents:
179
diff
changeset
|
1015 print( NL "\t" ); |
ed56f7873645
Added capabilities list debug option
Jacob Alexander <haata@kiibohd.com>
parents:
179
diff
changeset
|
1016 printHex( cap ); |
ed56f7873645
Added capabilities list debug option
Jacob Alexander <haata@kiibohd.com>
parents:
179
diff
changeset
|
1017 print(" - "); |
ed56f7873645
Added capabilities list debug option
Jacob Alexander <haata@kiibohd.com>
parents:
179
diff
changeset
|
1018 |
ed56f7873645
Added capabilities list debug option
Jacob Alexander <haata@kiibohd.com>
parents:
179
diff
changeset
|
1019 // Display/Lookup Capability Name (utilize debug mode of capability) |
182
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1020 void (*capability)(uint8_t, uint8_t, uint8_t*) = (void(*)(uint8_t, uint8_t, uint8_t*))(CapabilitiesList[ cap ].func); |
180
ed56f7873645
Added capabilities list debug option
Jacob Alexander <haata@kiibohd.com>
parents:
179
diff
changeset
|
1021 capability( 0xFF, 0xFF, 0 ); |
ed56f7873645
Added capabilities list debug option
Jacob Alexander <haata@kiibohd.com>
parents:
179
diff
changeset
|
1022 } |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
1023 } |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
1024 |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
1025 void cliFunc_capSelect( char* args ) |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
1026 { |
126
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
1027 // Parse code from argument |
182
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1028 char* curArgs; |
126
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
1029 char* arg1Ptr; |
182
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1030 char* arg2Ptr = args; |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1031 |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1032 // Total number of args to scan (must do a lookup if a keyboard capability is selected) |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
1033 var_uint_t totalArgs = 2; // Always at least two args |
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
1034 var_uint_t cap = 0; |
126
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
1035 |
182
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1036 // Arguments used for keyboard capability function |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
1037 var_uint_t argSetCount = 0; |
182
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1038 uint8_t *argSet = (uint8_t*)args; |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1039 |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1040 // Process all args |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
1041 for ( var_uint_t c = 0; argSetCount < totalArgs; c++ ) |
126
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
1042 { |
182
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1043 curArgs = arg2Ptr; |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1044 CLI_argumentIsolation( curArgs, &arg1Ptr, &arg2Ptr ); |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1045 |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1046 // Stop processing args if no more are found |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1047 // Extra arguments are ignored |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1048 if ( *arg1Ptr == '\0' ) |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1049 break; |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1050 |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1051 // For the first argument, choose the capability |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1052 if ( c == 0 ) switch ( arg1Ptr[0] ) |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1053 { |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1054 // Keyboard Capability |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1055 case 'K': |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1056 // Determine capability index |
195
58cfcb7bac88
Changing decToInt to numToInt (adds support for Hex number interpreter)
Jacob Alexander <haata@kiibohd.com>
parents:
192
diff
changeset
|
1057 cap = numToInt( &arg1Ptr[1] ); |
182
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1058 |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1059 // Lookup the number of args |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1060 totalArgs += CapabilitiesList[ cap ].argCount; |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1061 continue; |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1062 } |
126
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
1063 |
182
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1064 // Because allocating memory isn't doable, and the argument count is arbitrary |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1065 // The argument pointer is repurposed as the argument list (much smaller anyways) |
195
58cfcb7bac88
Changing decToInt to numToInt (adds support for Hex number interpreter)
Jacob Alexander <haata@kiibohd.com>
parents:
192
diff
changeset
|
1066 argSet[ argSetCount++ ] = (uint8_t)numToInt( arg1Ptr ); |
182
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1067 |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1068 // Once all the arguments are prepared, call the keyboard capability function |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1069 if ( argSetCount == totalArgs ) |
126
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
1070 { |
182
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1071 // Indicate that the capability was called |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1072 print( NL ); |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1073 info_msg("K"); |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1074 printInt8( cap ); |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1075 print(" - "); |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1076 printHex( argSet[0] ); |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1077 print(" - "); |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1078 printHex( argSet[1] ); |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1079 print(" - "); |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1080 printHex( argSet[2] ); |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1081 print( "..." NL ); |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1082 |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1083 void (*capability)(uint8_t, uint8_t, uint8_t*) = (void(*)(uint8_t, uint8_t, uint8_t*))(CapabilitiesList[ cap ].func); |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1084 capability( argSet[0], argSet[1], &argSet[2] ); |
126
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
1085 } |
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
1086 } |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
1087 } |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
1088 |
192
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1089 void cliFunc_keyHold( char* args ) |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1090 { |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1091 // Parse codes from arguments |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1092 char* curArgs; |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1093 char* arg1Ptr; |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1094 char* arg2Ptr = args; |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1095 |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1096 // Process all args |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1097 for ( ;; ) |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1098 { |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1099 curArgs = arg2Ptr; |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1100 CLI_argumentIsolation( curArgs, &arg1Ptr, &arg2Ptr ); |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1101 |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1102 // Stop processing args if no more are found |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1103 if ( *arg1Ptr == '\0' ) |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1104 break; |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1105 |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1106 // Ignore non-Scancode numbers |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1107 switch ( arg1Ptr[0] ) |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1108 { |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1109 // Scancode |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1110 case 'S': |
195
58cfcb7bac88
Changing decToInt to numToInt (adds support for Hex number interpreter)
Jacob Alexander <haata@kiibohd.com>
parents:
192
diff
changeset
|
1111 Macro_keyState( (uint8_t)numToInt( &arg1Ptr[1] ), 0x02 ); // Hold scancode |
192
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1112 break; |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1113 } |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1114 } |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1115 } |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1116 |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1117 void cliFunc_keyPress( char* args ) |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
1118 { |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1119 // Parse codes from arguments |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1120 char* curArgs; |
126
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
1121 char* arg1Ptr; |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1122 char* arg2Ptr = args; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1123 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1124 // Process all args |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1125 for ( ;; ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1126 { |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1127 curArgs = arg2Ptr; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1128 CLI_argumentIsolation( curArgs, &arg1Ptr, &arg2Ptr ); |
126
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
1129 |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1130 // Stop processing args if no more are found |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1131 if ( *arg1Ptr == '\0' ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1132 break; |
126
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
1133 |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1134 // Ignore non-Scancode numbers |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1135 switch ( arg1Ptr[0] ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1136 { |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1137 // Scancode |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1138 case 'S': |
195
58cfcb7bac88
Changing decToInt to numToInt (adds support for Hex number interpreter)
Jacob Alexander <haata@kiibohd.com>
parents:
192
diff
changeset
|
1139 Macro_keyState( (uint8_t)numToInt( &arg1Ptr[1] ), 0x01 ); // Press scancode |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1140 break; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1141 } |
126
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
1142 } |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
1143 } |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
1144 |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1145 void cliFunc_keyRelease( char* args ) |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
1146 { |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1147 // Parse codes from arguments |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1148 char* curArgs; |
126
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
1149 char* arg1Ptr; |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1150 char* arg2Ptr = args; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1151 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1152 // Process all args |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1153 for ( ;; ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1154 { |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1155 curArgs = arg2Ptr; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1156 CLI_argumentIsolation( curArgs, &arg1Ptr, &arg2Ptr ); |
126
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
1157 |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1158 // Stop processing args if no more are found |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1159 if ( *arg1Ptr == '\0' ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1160 break; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1161 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1162 // Ignore non-Scancode numbers |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1163 switch ( arg1Ptr[0] ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1164 { |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1165 // Scancode |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1166 case 'S': |
195
58cfcb7bac88
Changing decToInt to numToInt (adds support for Hex number interpreter)
Jacob Alexander <haata@kiibohd.com>
parents:
192
diff
changeset
|
1167 Macro_keyState( (uint8_t)numToInt( &arg1Ptr[1] ), 0x03 ); // Release scancode |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1168 break; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1169 } |
126
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
1170 } |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
1171 } |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
1172 |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1173 void cliFunc_layerList( char* args ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1174 { |
183
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1175 print( NL ); |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1176 info_msg("Layer List"); |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1177 |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1178 // Iterate through all of the layers and display them |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
1179 for ( uint16_t layer = 0; layer < LayerNum; layer++ ) |
183
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1180 { |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1181 print( NL "\t" ); |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1182 printHex( layer ); |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1183 print(" - "); |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1184 |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1185 // Display layer name |
192
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1186 dPrint( (char*)LayerIndex[ layer ].name ); |
183
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1187 |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1188 // Default map |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1189 if ( layer == 0 ) |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1190 print(" \033[1m(default)\033[0m"); |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1191 |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1192 // Layer State |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1193 print( NL "\t\t Layer State: " ); |
214
5a5404338b9f
Adding support for layer packing
Jacob Alexander <haata@kiibohd.com>
parents:
205
diff
changeset
|
1194 printHex( LayerState[ layer ] ); |
183
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1195 |
214
5a5404338b9f
Adding support for layer packing
Jacob Alexander <haata@kiibohd.com>
parents:
205
diff
changeset
|
1196 // First -> Last Indices |
5a5404338b9f
Adding support for layer packing
Jacob Alexander <haata@kiibohd.com>
parents:
205
diff
changeset
|
1197 print(" First -> Last Indices: "); |
5a5404338b9f
Adding support for layer packing
Jacob Alexander <haata@kiibohd.com>
parents:
205
diff
changeset
|
1198 printHex( LayerIndex[ layer ].first ); |
5a5404338b9f
Adding support for layer packing
Jacob Alexander <haata@kiibohd.com>
parents:
205
diff
changeset
|
1199 print(" -> "); |
5a5404338b9f
Adding support for layer packing
Jacob Alexander <haata@kiibohd.com>
parents:
205
diff
changeset
|
1200 printHex( LayerIndex[ layer ].last ); |
183
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1201 } |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1202 } |
126
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
1203 |
183
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1204 void cliFunc_layerState( char* args ) |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1205 { |
183
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1206 // Parse codes from arguments |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1207 char* curArgs; |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1208 char* arg1Ptr; |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1209 char* arg2Ptr = args; |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1210 |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1211 uint8_t arg1 = 0; |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1212 uint8_t arg2 = 0; |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1213 |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1214 // Process first two args |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1215 for ( uint8_t c = 0; c < 2; c++ ) |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1216 { |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1217 curArgs = arg2Ptr; |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1218 CLI_argumentIsolation( curArgs, &arg1Ptr, &arg2Ptr ); |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1219 |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1220 // Stop processing args if no more are found |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1221 if ( *arg1Ptr == '\0' ) |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1222 break; |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1223 |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1224 switch ( c ) |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1225 { |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1226 // First argument (e.g. L1) |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1227 case 0: |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1228 if ( arg1Ptr[0] != 'L' ) |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1229 return; |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1230 |
195
58cfcb7bac88
Changing decToInt to numToInt (adds support for Hex number interpreter)
Jacob Alexander <haata@kiibohd.com>
parents:
192
diff
changeset
|
1231 arg1 = (uint8_t)numToInt( &arg1Ptr[1] ); |
183
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1232 break; |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1233 // Second argument (e.g. 4) |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1234 case 1: |
195
58cfcb7bac88
Changing decToInt to numToInt (adds support for Hex number interpreter)
Jacob Alexander <haata@kiibohd.com>
parents:
192
diff
changeset
|
1235 arg2 = (uint8_t)numToInt( arg1Ptr ); |
183
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1236 |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1237 // Display operation (to indicate that it worked) |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1238 print( NL ); |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1239 info_msg("Setting Layer L"); |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1240 printInt8( arg1 ); |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1241 print(" to - "); |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1242 printHex( arg2 ); |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1243 |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1244 // Set the layer state |
214
5a5404338b9f
Adding support for layer packing
Jacob Alexander <haata@kiibohd.com>
parents:
205
diff
changeset
|
1245 LayerState[ arg1 ] = arg2; |
183
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1246 break; |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1247 } |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
1248 } |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
1249 } |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
1250 |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
1251 void cliFunc_macroDebug( char* args ) |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
1252 { |
126
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
1253 // Toggle macro debug mode |
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
1254 macroDebugMode = macroDebugMode ? 0 : 1; |
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
1255 |
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
1256 print( NL ); |
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
1257 info_msg("Macro Debug Mode: "); |
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
1258 printInt8( macroDebugMode ); |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
1259 } |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
1260 |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1261 void cliFunc_macroList( char* args ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1262 { |
192
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1263 // Show pending key events |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1264 print( NL ); |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1265 info_msg("Pending Key Events: "); |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1266 printInt16( (uint16_t)macroTriggerListBufferSize ); |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1267 print(" : "); |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1268 for ( uint8_t key = 0; key < macroTriggerListBufferSize; key++ ) |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1269 { |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1270 printHex( macroTriggerListBuffer[ key ].scanCode ); |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1271 print(" "); |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1272 } |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1273 |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1274 // Show pending trigger macros |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1275 print( NL ); |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1276 info_msg("Pending Trigger Macros: "); |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1277 printInt16( (uint16_t)macroTriggerMacroPendingListSize ); |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1278 print(" : "); |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
1279 for ( var_uint_t macro = 0; macro < macroTriggerMacroPendingListSize; macro++ ) |
192
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1280 { |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1281 printHex( macroTriggerMacroPendingList[ macro ] ); |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1282 print(" "); |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1283 } |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1284 |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1285 // Show pending result macros |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1286 print( NL ); |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1287 info_msg("Pending Result Macros: "); |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1288 printInt16( (uint16_t)macroResultMacroPendingListSize ); |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1289 print(" : "); |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
1290 for ( var_uint_t macro = 0; macro < macroResultMacroPendingListSize; macro++ ) |
192
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1291 { |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1292 printHex( macroResultMacroPendingList[ macro ] ); |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1293 print(" "); |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1294 } |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1295 |
181
80a44dcdafaf
Adding macroList debug function
Jacob Alexander <haata@kiibohd.com>
parents:
180
diff
changeset
|
1296 // Show available trigger macro indices |
80a44dcdafaf
Adding macroList debug function
Jacob Alexander <haata@kiibohd.com>
parents:
180
diff
changeset
|
1297 print( NL ); |
80a44dcdafaf
Adding macroList debug function
Jacob Alexander <haata@kiibohd.com>
parents:
180
diff
changeset
|
1298 info_msg("Trigger Macros Range: T0 -> T"); |
80a44dcdafaf
Adding macroList debug function
Jacob Alexander <haata@kiibohd.com>
parents:
180
diff
changeset
|
1299 printInt16( (uint16_t)TriggerMacroNum - 1 ); // Hopefully large enough :P (can't assume 32-bit) |
80a44dcdafaf
Adding macroList debug function
Jacob Alexander <haata@kiibohd.com>
parents:
180
diff
changeset
|
1300 |
80a44dcdafaf
Adding macroList debug function
Jacob Alexander <haata@kiibohd.com>
parents:
180
diff
changeset
|
1301 // Show available result macro indices |
80a44dcdafaf
Adding macroList debug function
Jacob Alexander <haata@kiibohd.com>
parents:
180
diff
changeset
|
1302 print( NL ); |
80a44dcdafaf
Adding macroList debug function
Jacob Alexander <haata@kiibohd.com>
parents:
180
diff
changeset
|
1303 info_msg("Result Macros Range: R0 -> R"); |
80a44dcdafaf
Adding macroList debug function
Jacob Alexander <haata@kiibohd.com>
parents:
180
diff
changeset
|
1304 printInt16( (uint16_t)ResultMacroNum - 1 ); // Hopefully large enough :P (can't assume 32-bit) |
80a44dcdafaf
Adding macroList debug function
Jacob Alexander <haata@kiibohd.com>
parents:
180
diff
changeset
|
1305 |
80a44dcdafaf
Adding macroList debug function
Jacob Alexander <haata@kiibohd.com>
parents:
180
diff
changeset
|
1306 // Show Trigger to Result Macro Links |
80a44dcdafaf
Adding macroList debug function
Jacob Alexander <haata@kiibohd.com>
parents:
180
diff
changeset
|
1307 print( NL ); |
80a44dcdafaf
Adding macroList debug function
Jacob Alexander <haata@kiibohd.com>
parents:
180
diff
changeset
|
1308 info_msg("Trigger : Result Macro Pairs"); |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
1309 for ( var_uint_t macro = 0; macro < TriggerMacroNum; macro++ ) |
181
80a44dcdafaf
Adding macroList debug function
Jacob Alexander <haata@kiibohd.com>
parents:
180
diff
changeset
|
1310 { |
80a44dcdafaf
Adding macroList debug function
Jacob Alexander <haata@kiibohd.com>
parents:
180
diff
changeset
|
1311 print( NL ); |
80a44dcdafaf
Adding macroList debug function
Jacob Alexander <haata@kiibohd.com>
parents:
180
diff
changeset
|
1312 print("\tT"); |
80a44dcdafaf
Adding macroList debug function
Jacob Alexander <haata@kiibohd.com>
parents:
180
diff
changeset
|
1313 printInt16( (uint16_t)macro ); // Hopefully large enough :P (can't assume 32-bit) |
80a44dcdafaf
Adding macroList debug function
Jacob Alexander <haata@kiibohd.com>
parents:
180
diff
changeset
|
1314 print(" : R"); |
80a44dcdafaf
Adding macroList debug function
Jacob Alexander <haata@kiibohd.com>
parents:
180
diff
changeset
|
1315 printInt16( (uint16_t)TriggerMacroList[ macro ].result ); // Hopefully large enough :P (can't assume 32-bit) |
80a44dcdafaf
Adding macroList debug function
Jacob Alexander <haata@kiibohd.com>
parents:
180
diff
changeset
|
1316 } |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1317 } |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1318 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1319 void cliFunc_macroProc( char* args ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1320 { |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1321 // Toggle macro pause mode |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1322 macroPauseMode = macroPauseMode ? 0 : 1; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1323 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1324 print( NL ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1325 info_msg("Macro Processing Mode: "); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1326 printInt8( macroPauseMode ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1327 } |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1328 |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
1329 void macroDebugShowTrigger( var_uint_t index ) |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1330 { |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1331 // Only proceed if the macro exists |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1332 if ( index >= TriggerMacroNum ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1333 return; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1334 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1335 // Trigger Macro Show |
217
8ceb1a0582ee
Adding more RAM optimizations
Jacob Alexander <haata@kiibohd.com>
parents:
216
diff
changeset
|
1336 const TriggerMacro *macro = &TriggerMacroList[ index ]; |
8ceb1a0582ee
Adding more RAM optimizations
Jacob Alexander <haata@kiibohd.com>
parents:
216
diff
changeset
|
1337 TriggerMacroRecord *record = &TriggerMacroRecordList[ index ]; |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1338 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1339 print( NL ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1340 info_msg("Trigger Macro Index: "); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1341 printInt16( (uint16_t)index ); // Hopefully large enough :P (can't assume 32-bit) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1342 print( NL ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1343 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1344 // Read the comboLength for combo in the sequence (sequence of combos) |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
1345 var_uint_t pos = 0; |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1346 uint8_t comboLength = macro->guide[ pos ]; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1347 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1348 // Iterate through and interpret the guide |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1349 while ( comboLength != 0 ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1350 { |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1351 // Initial position of the combo |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
1352 var_uint_t comboPos = ++pos; |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1353 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1354 // Iterate through the combo |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1355 while ( pos < comboLength * TriggerGuideSize + comboPos ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1356 { |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1357 // Assign TriggerGuide element (key type, state and scancode) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1358 TriggerGuide *guide = (TriggerGuide*)(¯o->guide[ pos ]); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1359 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1360 // Display guide information about trigger key |
184
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
1361 printHex( guide->scanCode ); |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1362 print("|"); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1363 printHex( guide->type ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1364 print("|"); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1365 printHex( guide->state ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1366 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1367 // Increment position |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1368 pos += TriggerGuideSize; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1369 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1370 // Only show combo separator if there are combos left in the sequence element |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1371 if ( pos < comboLength * TriggerGuideSize + comboPos ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1372 print("+"); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1373 } |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1374 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1375 // Read the next comboLength |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1376 comboLength = macro->guide[ pos ]; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1377 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1378 // Only show sequence separator if there is another combo to process |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1379 if ( comboLength != 0 ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1380 print(";"); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1381 } |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1382 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1383 // Display current position |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1384 print( NL "Position: " ); |
217
8ceb1a0582ee
Adding more RAM optimizations
Jacob Alexander <haata@kiibohd.com>
parents:
216
diff
changeset
|
1385 printInt16( (uint16_t)record->pos ); // Hopefully large enough :P (can't assume 32-bit) |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1386 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1387 // Display result macro index |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1388 print( NL "Result Macro Index: " ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1389 printInt16( (uint16_t)macro->result ); // Hopefully large enough :P (can't assume 32-bit) |
196
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
1390 |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
1391 // Display trigger macro state |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
1392 print( NL "Trigger Macro State: " ); |
217
8ceb1a0582ee
Adding more RAM optimizations
Jacob Alexander <haata@kiibohd.com>
parents:
216
diff
changeset
|
1393 switch ( record->state ) |
196
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
1394 { |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
1395 case TriggerMacro_Press: print("Press"); break; |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
1396 case TriggerMacro_Release: print("Release"); break; |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
1397 case TriggerMacro_Waiting: print("Waiting"); break; |
8ecfdaa27234
Basic Trigger and Result Macros are now working.
Jacob Alexander <haata@kiibohd.com>
parents:
195
diff
changeset
|
1398 } |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1399 } |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1400 |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
1401 void macroDebugShowResult( var_uint_t index ) |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1402 { |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1403 // Only proceed if the macro exists |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1404 if ( index >= ResultMacroNum ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1405 return; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1406 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1407 // Trigger Macro Show |
217
8ceb1a0582ee
Adding more RAM optimizations
Jacob Alexander <haata@kiibohd.com>
parents:
216
diff
changeset
|
1408 const ResultMacro *macro = &ResultMacroList[ index ]; |
8ceb1a0582ee
Adding more RAM optimizations
Jacob Alexander <haata@kiibohd.com>
parents:
216
diff
changeset
|
1409 ResultMacroRecord *record = &ResultMacroRecordList[ index ]; |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1410 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1411 print( NL ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1412 info_msg("Result Macro Index: "); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1413 printInt16( (uint16_t)index ); // Hopefully large enough :P (can't assume 32-bit) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1414 print( NL ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1415 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1416 // Read the comboLength for combo in the sequence (sequence of combos) |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
1417 var_uint_t pos = 0; |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1418 uint8_t comboLength = macro->guide[ pos++ ]; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1419 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1420 // Iterate through and interpret the guide |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1421 while ( comboLength != 0 ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1422 { |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1423 // Function Counter, used to keep track of the combos processed |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
1424 var_uint_t funcCount = 0; |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1425 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1426 // Iterate through the combo |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1427 while ( funcCount < comboLength ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1428 { |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1429 // Assign TriggerGuide element (key type, state and scancode) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1430 ResultGuide *guide = (ResultGuide*)(¯o->guide[ pos ]); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1431 |
180
ed56f7873645
Added capabilities list debug option
Jacob Alexander <haata@kiibohd.com>
parents:
179
diff
changeset
|
1432 // Display Function Index |
ed56f7873645
Added capabilities list debug option
Jacob Alexander <haata@kiibohd.com>
parents:
179
diff
changeset
|
1433 printHex( guide->index ); |
ed56f7873645
Added capabilities list debug option
Jacob Alexander <haata@kiibohd.com>
parents:
179
diff
changeset
|
1434 print("|"); |
ed56f7873645
Added capabilities list debug option
Jacob Alexander <haata@kiibohd.com>
parents:
179
diff
changeset
|
1435 |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1436 // Display Function Ptr Address |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
1437 printHex( (nat_ptr_t)CapabilitiesList[ guide->index ].func ); |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1438 print("|"); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1439 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1440 // Display/Lookup Capability Name (utilize debug mode of capability) |
182
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1441 void (*capability)(uint8_t, uint8_t, uint8_t*) = (void(*)(uint8_t, uint8_t, uint8_t*))(CapabilitiesList[ guide->index ].func); |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1442 capability( 0xFF, 0xFF, 0 ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1443 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1444 // Display Argument(s) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1445 print("("); |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
1446 for ( var_uint_t arg = 0; arg < CapabilitiesList[ guide->index ].argCount; arg++ ) |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1447 { |
180
ed56f7873645
Added capabilities list debug option
Jacob Alexander <haata@kiibohd.com>
parents:
179
diff
changeset
|
1448 // Arguments are only 8 bit values |
ed56f7873645
Added capabilities list debug option
Jacob Alexander <haata@kiibohd.com>
parents:
179
diff
changeset
|
1449 printHex( (&guide->args)[ arg ] ); |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1450 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1451 // Only show arg separator if there are args left |
182
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1452 if ( arg + 1 < CapabilitiesList[ guide->index ].argCount ) |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1453 print(","); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1454 } |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1455 print(")"); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1456 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1457 // Increment position |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1458 pos += ResultGuideSize( guide ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1459 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1460 // Increment function count |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1461 funcCount++; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1462 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1463 // Only show combo separator if there are combos left in the sequence element |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1464 if ( funcCount < comboLength ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1465 print("+"); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1466 } |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1467 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1468 // Read the next comboLength |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1469 comboLength = macro->guide[ pos++ ]; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1470 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1471 // Only show sequence separator if there is another combo to process |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1472 if ( comboLength != 0 ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1473 print(";"); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1474 } |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1475 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1476 // Display current position |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1477 print( NL "Position: " ); |
217
8ceb1a0582ee
Adding more RAM optimizations
Jacob Alexander <haata@kiibohd.com>
parents:
216
diff
changeset
|
1478 printInt16( (uint16_t)record->pos ); // Hopefully large enough :P (can't assume 32-bit) |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1479 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1480 // Display final trigger state/type |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1481 print( NL "Final Trigger State (State/Type): " ); |
217
8ceb1a0582ee
Adding more RAM optimizations
Jacob Alexander <haata@kiibohd.com>
parents:
216
diff
changeset
|
1482 printHex( record->state ); |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1483 print("/"); |
217
8ceb1a0582ee
Adding more RAM optimizations
Jacob Alexander <haata@kiibohd.com>
parents:
216
diff
changeset
|
1484 printHex( record->stateType ); |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1485 } |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1486 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1487 void cliFunc_macroShow( char* args ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1488 { |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1489 // Parse codes from arguments |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1490 char* curArgs; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1491 char* arg1Ptr; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1492 char* arg2Ptr = args; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1493 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1494 // Process all args |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1495 for ( ;; ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1496 { |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1497 curArgs = arg2Ptr; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1498 CLI_argumentIsolation( curArgs, &arg1Ptr, &arg2Ptr ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1499 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1500 // Stop processing args if no more are found |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1501 if ( *arg1Ptr == '\0' ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1502 break; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1503 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1504 // Ignore invalid codes |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1505 switch ( arg1Ptr[0] ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1506 { |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1507 // Indexed Trigger Macro |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1508 case 'T': |
195
58cfcb7bac88
Changing decToInt to numToInt (adds support for Hex number interpreter)
Jacob Alexander <haata@kiibohd.com>
parents:
192
diff
changeset
|
1509 macroDebugShowTrigger( numToInt( &arg1Ptr[1] ) ); |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1510 break; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1511 // Indexed Result Macro |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1512 case 'R': |
195
58cfcb7bac88
Changing decToInt to numToInt (adds support for Hex number interpreter)
Jacob Alexander <haata@kiibohd.com>
parents:
192
diff
changeset
|
1513 macroDebugShowResult( numToInt( &arg1Ptr[1] ) ); |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1514 break; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1515 } |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1516 } |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1517 } |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1518 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1519 void cliFunc_macroStep( char* args ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1520 { |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1521 // Parse number from argument |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1522 // NOTE: Only first argument is used |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1523 char* arg1Ptr; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1524 char* arg2Ptr; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1525 CLI_argumentIsolation( args, &arg1Ptr, &arg2Ptr ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1526 |
192
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1527 // Default to 1, if no argument given |
204
b718fdb741c3
Updating PartialLayer code to support varying counter widths.
Jacob Alexander <haata@kiibohd.com>
parents:
202
diff
changeset
|
1528 var_uint_t count = (var_uint_t)numToInt( arg1Ptr ); |
192
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1529 |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1530 if ( count == 0 ) |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1531 count = 1; |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1532 |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1533 // Set the macro step counter, negative int's are cast to uint |
192
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1534 macroStepCounter = count; |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1535 } |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1536 |