Mercurial > louis > kiibohd-controller
annotate Macro/PartialMap/macro.c @ 192:6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
- Changed static variables to const that should have been const
- Updated CMake files to prepare for MCHCK custom bootloader
- Changed the USB ID numbers and ID number for bootloader
- Only generate DFU or Teensy binary image, not both
- Fixed RAM and FLASH calculator
- Added missing license in delay.c/h (much of it was taken from Teensy source though I've changed a bunch of it)
- Prepared mk20dx.c for upcoming bootloader addition
- mk20dx.h cleanup
- Reduced the MCHCK based flash size for the application image (bootloader changes requires more flash space)
- Fixed bugs in macro.c
- Added keyHold cli command
- Added show pending events debug message for PartialMap macro module
author | Jacob Alexander <haata@kiibohd.com> |
---|---|
date | Fri, 15 Aug 2014 10:42:12 -0700 |
parents | 3404be65670b |
children | 58cfcb7bac88 |
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" |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
30 #include <defaultMap.h> |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
31 #include "generatedKeymap.h" // TODO Use actual generated version |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
32 |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
33 // Local Includes |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
34 #include "macro.h" |
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 |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
38 // ----- Function Declarations ----- |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
39 |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
40 void cliFunc_capList ( char* args ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
41 void cliFunc_capSelect ( char* args ); |
192
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
42 void cliFunc_keyHold ( char* args ); |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
43 void cliFunc_keyPress ( char* args ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
44 void cliFunc_keyRelease( char* args ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
45 void cliFunc_layerList ( char* args ); |
183
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
46 void cliFunc_layerState( char* args ); |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
47 void cliFunc_macroDebug( char* args ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
48 void cliFunc_macroList ( char* args ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
49 void cliFunc_macroProc ( char* args ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
50 void cliFunc_macroShow ( char* args ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
51 void cliFunc_macroStep ( char* args ); |
125
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 |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
54 |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
55 // ----- Enums ----- |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
56 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
57 // 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
|
58 typedef enum TriggerMacroVote { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
59 TriggerMacroVote_Release = 0x8, // Correct key |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
60 TriggerMacroVote_PassRelease = 0xC, // Correct key (both pass and release) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
61 TriggerMacroVote_Pass = 0x4, // Correct key |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
62 TriggerMacroVote_DoNothing = 0x2, // Incorrect key |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
63 TriggerMacroVote_Fail = 0x1, // Incorrect key |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
64 TriggerMacroVote_Invalid = 0x0, // Invalid state |
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 |
192
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
84 const char macroCLIDictName[] = "Macro Module Commands"; |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
85 const CLIDictItem macroCLIDict[] = { |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
86 { "capList", "Prints an indexed list of all non USB keycode capabilities.", cliFunc_capList }, |
182
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
87 { "capSelect", "Triggers the specified capabilities. First two args are state and stateType." NL "\t\t\033[35mK11\033[0m Keyboard Capability 0x0B", cliFunc_capSelect }, |
192
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
88 { "keyHold", "Send key-hold events to the macro module. Duplicates have undefined behaviour." NL "\t\t\033[35mS10\033[0m Scancode 0x0A", cliFunc_keyHold }, |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
89 { "keyPress", "Send key-press events to the macro module. Duplicates have undefined behaviour." NL "\t\t\033[35mS10\033[0m Scancode 0x0A", cliFunc_keyPress }, |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
90 { "keyRelease", "Send key-release event to macro module. Duplicates have undefined behaviour." NL "\t\t\033[35mS10\033[0m Scancode 0x0A", cliFunc_keyRelease }, |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
91 { "layerList", "List available layers.", cliFunc_layerList }, |
183
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
92 { "layerState", "Modify specified indexed layer state <layer> <state byte>." NL "\t\t\033[35mL2\033[0m Indexed Layer 0x02" NL "\t\t0 Off, 1 Shift, 2 Latch, 4 Lock States", cliFunc_layerState }, |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
93 { "macroDebug", "Disables/Enables sending USB keycodes to the Output Module and prints U/K codes.", cliFunc_macroDebug }, |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
94 { "macroList", "List the defined trigger and result macros.", cliFunc_macroList }, |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
95 { "macroProc", "Pause/Resume macro processing.", cliFunc_macroProc }, |
181
80a44dcdafaf
Adding macroList debug function
Jacob Alexander <haata@kiibohd.com>
parents:
180
diff
changeset
|
96 { "macroShow", "Show the macro corresponding to the given index." NL "\t\t\033[35mT16\033[0m Indexed Trigger Macro 0x10, \033[35mR12\033[0m Indexed Result Macro 0x0C", cliFunc_macroShow }, |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
97 { "macroStep", "Do N macro processing steps. Defaults to 1.", cliFunc_macroStep }, |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
98 { 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
|
99 }; |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
100 |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
101 |
126
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
102 // 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
|
103 uint8_t macroDebugMode = 0; |
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
104 |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
105 // 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
|
106 uint8_t macroPauseMode = 0; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
107 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
108 // Macro step counter - If non-zero, the step counter counts down every time the macro module does one processing loop |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
109 unsigned int macroStepCounter = 0; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
110 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
111 |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
112 // Key Trigger List Buffer |
184
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
113 TriggerGuide macroTriggerListBuffer[ MaxScanCode ]; |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
114 uint8_t macroTriggerListBufferSize = 0; |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
115 |
184
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
116 // Pending Trigger Macro Index List |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
117 // * 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
|
118 // 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
|
119 // 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
|
120 // XXX It may be possible to calculate the worst case using the KLL compiler |
184
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
121 unsigned int macroTriggerMacroPendingList[ TriggerMacroNum ] = { 0 }; |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
122 unsigned int macroTriggerMacroPendingListSize = 0; |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
123 |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
124 // Layer Index Stack |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
125 // * When modifying layer state and the state is non-0x0, the stack must be adjusted |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
126 unsigned int macroLayerIndexStack[ LayerNum ] = { 0 }; |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
127 unsigned int macroLayerIndexStackSize = 0; |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
128 |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
129 // Pending Result Macro Index List |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
130 // * Any result macro that needs processing from a previous macro processing loop |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
131 unsigned int macroResultMacroPendingList[ ResultMacroNum ] = { 0 }; |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
132 unsigned int macroResultMacroPendingListSize = 0; |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
133 |
126
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
134 |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
135 |
191
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
136 // ----- Capabilities ----- |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
137 |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
138 // Modifies the specified Layer control byte |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
139 // Argument #1: Layer Index -> unsigned int |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
140 // Argument #2: Toggle byte -> uint8_t |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
141 void Macro_layerStateToggle_capability( uint8_t state, uint8_t stateType, uint8_t *args ) |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
142 { |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
143 // Display capability name |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
144 if ( stateType == 0xFF && state == 0xFF ) |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
145 { |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
146 print("Macro_layerState(layerIndex,toggleByte)"); |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
147 return; |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
148 } |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
149 |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
150 // Get layer index from arguments |
192
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
151 // Cast pointer to uint8_t to unsigned int then access that memory location |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
152 unsigned int layer = *(unsigned int*)(&args[0]); |
191
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
153 |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
154 // Get layer toggle byte |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
155 uint8_t toggleByte = args[ sizeof(unsigned int) ]; |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
156 |
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; |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
159 unsigned int stackItem = 0; |
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 |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
174 if ( LayerIndex[ layer ].state & toggleByte ) |
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 |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
177 LayerIndex[ layer ].state &= ~toggleByte; |
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 |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
182 LayerIndex[ layer ].state |= toggleByte; |
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 |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
192 if ( LayerIndex[ layer ].state == 0x00 && inLayerIndexStack ) |
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 |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
207 |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
208 |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
209 // ----- Functions ----- |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
210 |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
211 // 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
|
212 // NOTE: Calling function must handle the NULL pointer case |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
213 unsigned int *Macro_layerLookup( uint8_t scanCode ) |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
214 { |
184
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
215 // If no trigger macro is defined at the given layer, fallthrough to the next layer |
191
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
216 for ( unsigned int layerIndex = 0; layerIndex < macroLayerIndexStackSize; layerIndex++ ) |
184
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
217 { |
191
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
218 // Lookup Layer |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
219 Layer *layer = &LayerIndex[ macroLayerIndexStack[ layerIndex ] ]; |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
220 |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
221 // 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
|
222 // XXX Regardless of whether a key is found, the latch is removed on first lookup |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
223 uint8_t latch = layer->state & 0x02; |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
224 if ( latch ) |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
225 { |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
226 layer->state &= ~0x02; |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
227 } |
184
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
228 |
191
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
229 // 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
|
230 // XOR each of the state bits |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
231 // If only two are enabled, do not use this state |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
232 if ( (layer->state & 0x01) ^ (latch>>1) ^ ((layer->state & 0x04)>>2) ) |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
233 { |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
234 // Lookup layer |
192
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
235 unsigned int **map = (unsigned int**)layer->triggerMap; |
191
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
236 |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
237 // Determine if layer has key defined |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
238 if ( map != 0 && *map[ scanCode ] != 0 ) |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
239 return map[ scanCode ]; |
3404be65670b
Adding generic layerToggle and USB Key Output capabilities.
Jacob Alexander <haata@kiibohd.com>
parents:
190
diff
changeset
|
240 } |
184
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
241 } |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
242 |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
243 // Do lookup on default layer |
192
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
244 unsigned int **map = (unsigned int**)LayerIndex[0].triggerMap; |
184
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
245 |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
246 // Determine if layer has key defined |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
247 if ( map == 0 && *map[ scanCode ] == 0 ) |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
248 { |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
249 erro_msg("Scan Code has no defined Trigger Macro: "); |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
250 printHex( scanCode ); |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
251 return 0; |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
252 } |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
253 |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
254 // Return lookup result |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
255 return map[ scanCode ]; |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
256 } |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
257 |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
258 |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
259 // Update the scancode key state |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
260 // States: |
184
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
261 // * 0x00 - Off |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
262 // * 0x01 - Pressed |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
263 // * 0x02 - Held |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
264 // * 0x03 - Released |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
265 // * 0x04 - Unpressed (this is currently ignored) |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
266 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
|
267 { |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
268 // 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
|
269 switch ( state ) |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
270 { |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
271 case 0x01: // Pressed |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
272 case 0x02: // Held |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
273 case 0x03: // Released |
184
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
274 macroTriggerListBuffer[ macroTriggerListBufferSize ].scanCode = scanCode; |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
275 macroTriggerListBuffer[ macroTriggerListBufferSize ].state = state; |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
276 macroTriggerListBuffer[ macroTriggerListBufferSize ].type = 0x00; // Normal key |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
277 macroTriggerListBufferSize++; |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
278 break; |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
279 } |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
280 } |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
281 |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
282 |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
283 // Update the scancode analog state |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
284 // States: |
184
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
285 // * 0x00 - Off |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
286 // * 0x01 - Released |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
287 // * 0x02-0xFF - Analog value (low to high) |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
288 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
|
289 { |
184
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
290 // Only add to macro trigger list if non-off |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
291 if ( state != 0x00 ) |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
292 { |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
293 macroTriggerListBuffer[ macroTriggerListBufferSize ].scanCode = scanCode; |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
294 macroTriggerListBuffer[ macroTriggerListBufferSize ].state = state; |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
295 macroTriggerListBuffer[ macroTriggerListBufferSize ].type = 0x02; // Analog key |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
296 macroTriggerListBufferSize++; |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
297 } |
166
2fba36caf039
Initial work for KLL macro support
Jacob Alexander <haata@kiibohd.com>
parents:
159
diff
changeset
|
298 } |
2fba36caf039
Initial work for KLL macro support
Jacob Alexander <haata@kiibohd.com>
parents:
159
diff
changeset
|
299 |
2fba36caf039
Initial work for KLL macro support
Jacob Alexander <haata@kiibohd.com>
parents:
159
diff
changeset
|
300 |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
301 // Update led state |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
302 // States: |
184
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
303 // * 0x00 - Off |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
304 // * 0x01 - On |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
305 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
|
306 { |
184
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
307 // Only add to macro trigger list if non-off |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
308 if ( state != 0x00 ) |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
309 { |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
310 macroTriggerListBuffer[ macroTriggerListBufferSize ].scanCode = ledCode; |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
311 macroTriggerListBuffer[ macroTriggerListBufferSize ].state = state; |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
312 macroTriggerListBuffer[ macroTriggerListBufferSize ].type = 0x01; // LED key |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
313 macroTriggerListBufferSize++; |
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
314 } |
166
2fba36caf039
Initial work for KLL macro support
Jacob Alexander <haata@kiibohd.com>
parents:
159
diff
changeset
|
315 } |
2fba36caf039
Initial work for KLL macro support
Jacob Alexander <haata@kiibohd.com>
parents:
159
diff
changeset
|
316 |
2fba36caf039
Initial work for KLL macro support
Jacob Alexander <haata@kiibohd.com>
parents:
159
diff
changeset
|
317 |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
318 // Append result macro to pending list, checking for duplicates |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
319 // Do nothing if duplicate |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
320 inline void Macro_appendResultMacroToPendingList( unsigned int resultMacroIndex ) |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
321 { |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
322 // Iterate through result macro pending list, making sure this macro hasn't been added yet |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
323 for ( unsigned int macro = 0; macro < macroResultMacroPendingListSize; macro++ ) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
324 { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
325 // If duplicate found, do nothing |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
326 if ( macroResultMacroPendingList[ macro ] == resultMacroIndex ) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
327 return; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
328 } |
166
2fba36caf039
Initial work for KLL macro support
Jacob Alexander <haata@kiibohd.com>
parents:
159
diff
changeset
|
329 |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
330 // No duplicates found, add to pending list |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
331 macroResultMacroPendingList[ macroResultMacroPendingListSize++ ] = resultMacroIndex; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
332 } |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
333 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
334 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
335 // Determine if long ResultMacro (more than 1 seqence element) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
336 inline uint8_t Macro_isLongResultMacro( ResultMacro *macro ) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
337 { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
338 // Check the second sequence combo length |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
339 // If non-zero return 1 (long sequence) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
340 // 0 otherwise (short sequence) |
190
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
341 return macro->guide[ macro->guide[0] * ResultGuideSize( (ResultGuide*)macro->guide ) ] > 0 ? 1 : 0; |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
342 } |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
343 |
166
2fba36caf039
Initial work for KLL macro support
Jacob Alexander <haata@kiibohd.com>
parents:
159
diff
changeset
|
344 |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
345 // Votes on the given key vs. guide |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
346 inline TriggerMacroVote Macro_evalTriggerMacroVote( TriggerGuide *key, TriggerGuide *guide ) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
347 { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
348 // Depending on key type |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
349 switch ( guide->type ) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
350 { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
351 // Normal State Type |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
352 case 0x00: |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
353 // Depending on the state of the buffered key, make voting decision |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
354 // Incorrect key |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
355 if ( guide->scanCode != key->scanCode ) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
356 { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
357 switch ( key->state ) |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
358 { |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
359 // Wrong key, pressed, fail |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
360 case 0x01: |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
361 return TriggerMacroVote_Fail; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
362 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
363 // Wrong key, held or released, do not pass (no effect) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
364 case 0x02: |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
365 case 0x03: |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
366 return TriggerMacroVote_DoNothing; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
367 } |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
368 } |
166
2fba36caf039
Initial work for KLL macro support
Jacob Alexander <haata@kiibohd.com>
parents:
159
diff
changeset
|
369 |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
370 // Correct key |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
371 else |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
372 { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
373 switch ( key->state ) |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
374 { |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
375 // Correct key, pressed, possible passing |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
376 case 0x01: |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
377 return TriggerMacroVote_Pass; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
378 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
379 // Correct key, held, possible passing or release |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
380 case 0x02: |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
381 return TriggerMacroVote_PassRelease; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
382 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
383 // Correct key, released, possible release |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
384 case 0x03: |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
385 return TriggerMacroVote_Release; |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
386 } |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
387 } |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
388 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
389 break; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
390 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
391 // LED State Type |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
392 case 0x01: |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
393 erro_print("LED State Type - Not implemented..."); |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
394 break; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
395 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
396 // Analog State Type |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
397 case 0x02: |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
398 erro_print("Analog State Type - Not implemented..."); |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
399 break; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
400 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
401 // Invalid State Type |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
402 default: |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
403 erro_print("Invalid State Type. This is a bug."); |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
404 break; |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
405 } |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
406 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
407 // XXX Shouldn't reach here |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
408 return TriggerMacroVote_Invalid; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
409 } |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
410 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
411 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
412 // Evaluate/Update TriggerMacro |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
413 inline TriggerMacroEval Macro_evalTriggerMacro( unsigned int triggerMacroIndex ) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
414 { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
415 // Lookup TriggerMacro |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
416 TriggerMacro *macro = &TriggerMacroList[ triggerMacroIndex ]; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
417 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
418 // Check if macro has finished and should be incremented sequence elements |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
419 if ( macro->state == TriggerMacro_Release ) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
420 { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
421 macro->state = TriggerMacro_Waiting; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
422 macro->pos = macro->pos + macro->guide[ macro->pos ] * TriggerGuideSize; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
423 } |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
424 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
425 // Current Macro position |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
426 unsigned int pos = macro->pos; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
427 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
428 // Length of the combo being processed |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
429 uint8_t comboLength = macro->guide[ pos ]; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
430 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
431 // 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
|
432 if ( comboLength == 0 ) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
433 { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
434 return TriggerMacroEval_Remove; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
435 } |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
436 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
437 // Iterate through the key buffer, comparing to each key in the combo |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
438 // 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
|
439 // |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
440 // 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
|
441 // 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
|
442 // 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
|
443 // On scan after position increment, change to TriggerMacro_Waiting state |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
444 // TODO Add support for system LED states (NumLock, CapsLock, etc.) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
445 // TODO Add support for analog key states |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
446 // 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
|
447 // 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
|
448 TriggerMacroVote overallVote = TriggerMacroVote_Invalid; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
449 for ( uint8_t key = 0; key < macroTriggerListBufferSize; key++ ) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
450 { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
451 // Lookup key information |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
452 TriggerGuide *keyInfo = ¯oTriggerListBuffer[ key ]; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
453 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
454 // Iterate through the items in the combo, voting the on the key state |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
455 TriggerMacroVote vote = TriggerMacroVote_Invalid; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
456 for ( uint8_t comboItem = pos + 1; comboItem < pos + comboLength + 1; comboItem += TriggerGuideSize ) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
457 { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
458 // Assign TriggerGuide element (key type, state and scancode) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
459 TriggerGuide *guide = (TriggerGuide*)(¯o->guide[ comboItem ]); |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
460 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
461 // 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
|
462 // Also mask all of the non-passing votes |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
463 vote |= Macro_evalTriggerMacroVote( keyInfo, guide ); |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
464 if ( vote >= TriggerMacroVote_Pass ) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
465 { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
466 vote &= TriggerMacroVote_Release | TriggerMacroVote_PassRelease | TriggerMacroVote_Pass; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
467 break; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
468 } |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
469 } |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
470 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
471 // After voting, append to overall vote |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
472 overallVote |= vote; |
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 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
475 // Decide new state of macro after voting |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
476 // Fail macro, remove from pending list |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
477 if ( overallVote & TriggerMacroVote_Fail ) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
478 { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
479 return TriggerMacroEval_Remove; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
480 } |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
481 // Do nothing, incorrect key is being held or released |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
482 else if ( overallVote & TriggerMacroVote_DoNothing ) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
483 { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
484 // Just doing nothing :) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
485 } |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
486 // If passing and in Waiting state, set macro state to Press |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
487 else if ( overallVote & TriggerMacroVote_Pass && macro->state == TriggerMacro_Waiting ) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
488 { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
489 macro->state = TriggerMacro_Press; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
490 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
491 // 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
|
492 // 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
|
493 // If this result macro has more than 1 key, only send once |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
494 // TODO Add option to have macro repeat rate |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
495 if ( macro->guide[ pos + comboLength ] == 0 ) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
496 { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
497 // Long Macro, only send once (more than 1 sequence item) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
498 // Short Macro (only 1 sequence item) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
499 return Macro_isLongResultMacro( &ResultMacroList[ macro->result ] ) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
500 ? TriggerMacroEval_DoResult |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
501 : TriggerMacroEval_DoResultAndRemove; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
502 } |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
503 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
504 } |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
505 // If ready for transition and in Press state, set to Waiting and increment combo position |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
506 // Position is incremented (and possibly remove the macro from the pending list) on the next iteration |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
507 else if ( overallVote & TriggerMacroVote_Release && macro->state == TriggerMacro_Press ) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
508 { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
509 macro->state = TriggerMacro_Release; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
510 } |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
511 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
512 return TriggerMacroEval_DoNothing; |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
513 } |
166
2fba36caf039
Initial work for KLL macro support
Jacob Alexander <haata@kiibohd.com>
parents:
159
diff
changeset
|
514 |
2fba36caf039
Initial work for KLL macro support
Jacob Alexander <haata@kiibohd.com>
parents:
159
diff
changeset
|
515 |
185 | 516 // Evaluate/Update ResultMacro |
190
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
517 inline ResultMacroEval Macro_evalResultMacro( unsigned int resultMacroIndex ) |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
518 { |
190
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
519 // Lookup ResultMacro |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
520 ResultMacro *macro = &ResultMacroList[ resultMacroIndex ]; |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
521 |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
522 // Current Macro position |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
523 unsigned int pos = macro->pos; |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
524 |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
525 // Length of combo being processed |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
526 uint8_t comboLength = macro->guide[ pos ]; |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
527 |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
528 // If no combo items are left, remove the ResultMacro from the pending list |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
529 if ( comboLength == 0 ) |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
530 { |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
531 return ResultMacroEval_Remove; |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
532 } |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
533 |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
534 // Function Counter, used to keep track of the combo items processed |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
535 unsigned int funcCount = 0; |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
536 |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
537 // Combo Item Position within the guide |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
538 unsigned int comboItem = pos + 1; |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
539 |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
540 // Iterate through the Result Combo |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
541 while ( funcCount < comboLength ) |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
542 { |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
543 // Assign TriggerGuide element (key type, state and scancode) |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
544 ResultGuide *guide = (ResultGuide*)(¯o->guide[ pos ]); |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
545 |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
546 // Do lookup on capability function |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
547 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
|
548 |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
549 // Call capability |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
550 capability( macro->state, macro->stateType, &guide->args ); |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
551 |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
552 // Increment counters |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
553 funcCount++; |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
554 comboItem += ResultGuideSize( (ResultGuide*)(¯o->guide[ comboItem ]) ); |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
555 } |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
556 |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
557 // Move to next item in the sequence |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
558 macro->pos = comboItem; |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
559 |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
560 // If the ResultMacro is finished, it will be removed on the next iteration |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
561 return ResultMacroEval_DoNothing; |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
562 } |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
563 |
159
84beeecd2c94
Kishsaver is fully working with DPH!
Jacob Alexander <haata@kiibohd.com>
parents:
150
diff
changeset
|
564 |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
565 // Update pending trigger list |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
566 void Macro_updateTriggerMacroPendingList() |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
567 { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
568 // 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
|
569 for ( uint8_t key = 0; key < macroTriggerListBufferSize; key++ ) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
570 { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
571 // Lookup Trigger List |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
572 unsigned int *triggerList = Macro_layerLookup( macroTriggerListBuffer[ key ].scanCode ); |
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 // Number of Triggers in list |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
575 unsigned int triggerListSize = triggerList[0]; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
576 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
577 // 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
|
578 // First item is the number of items in the TriggerList |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
579 for ( unsigned int macro = 1; macro < triggerListSize + 1; macro++ ) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
580 { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
581 // Lookup trigger macro index |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
582 unsigned int triggerMacroIndex = triggerList[ macro ]; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
583 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
584 // 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
|
585 // triggerList needs to be added |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
586 unsigned int pending = 0; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
587 for ( ; pending < macroTriggerMacroPendingListSize; pending++ ) |
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 // 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
|
590 if ( macroTriggerMacroPendingList[ pending ] == triggerMacroIndex ) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
591 break; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
592 } |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
593 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
594 // If the triggerMacroIndex (macro) was not found in the macroTriggerMacroPendingList |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
595 // Add it to the list |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
596 if ( pending == macroTriggerMacroPendingListSize ) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
597 { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
598 macroTriggerMacroPendingList[ macroTriggerMacroPendingListSize++ ] = triggerMacroIndex; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
599 } |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
600 } |
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 } |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
603 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
604 |
185 | 605 // Macro Procesing Loop |
606 // 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
|
607 inline void Macro_process() |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
608 { |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
609 // 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
|
610 if ( USBKeys_Sent != 0 ) |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
611 return; |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
612 |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
613 // 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
|
614 if ( macroPauseMode ) |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
615 { |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
616 if ( macroStepCounter == 0 ) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
617 return; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
618 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
619 // Proceed, decrementing the step counter |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
620 macroStepCounter--; |
192
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
621 dbug_print("Macro Step"); |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
622 } |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
623 |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
624 // Update pending trigger list, before processing TriggerMacros |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
625 Macro_updateTriggerMacroPendingList(); |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
626 |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
627 // Tail pointer for macroTriggerMacroPendingList |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
628 // Macros must be explicitly re-added |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
629 unsigned int macroTriggerMacroPendingListTail = 0; |
185 | 630 |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
631 // Iterate through the pending TriggerMacros, processing each of them |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
632 for ( unsigned int macro = 0; macro < macroTriggerMacroPendingListSize; macro++ ) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
633 { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
634 switch ( Macro_evalTriggerMacro( macroTriggerMacroPendingList[ macro ] ) ) |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
635 { |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
636 // Trigger Result Macro (purposely falling through) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
637 case TriggerMacroEval_DoResult: |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
638 // Append ResultMacro to PendingList |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
639 Macro_appendResultMacroToPendingList( TriggerMacroList[ macroTriggerMacroPendingList[ macro ] ].result ); |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
640 |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
641 // Otherwise, just re-add |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
642 default: |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
643 macroTriggerMacroPendingList[ macroTriggerMacroPendingListTail++ ] = macroTriggerMacroPendingList[ macro ]; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
644 break; |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
645 |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
646 // Trigger Result Macro and Remove (purposely falling through) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
647 case TriggerMacroEval_DoResultAndRemove: |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
648 // Append ResultMacro to PendingList |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
649 Macro_appendResultMacroToPendingList( TriggerMacroList[ macroTriggerMacroPendingList[ macro ] ].result ); |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
650 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
651 // Remove Macro from Pending List, nothing to do, removing by default |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
652 case TriggerMacroEval_Remove: |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
653 break; |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
654 } |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
655 } |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
656 |
190
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
657 // Update the macroTriggerMacroPendingListSize with the tail pointer |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
658 macroTriggerMacroPendingListSize = macroTriggerMacroPendingListTail; |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
659 |
190
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
660 |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
661 // Tail pointer for macroResultMacroPendingList |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
662 // Macros must be explicitly re-added |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
663 unsigned int macroResultMacroPendingListTail = 0; |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
664 |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
665 // Iterate through the pending ResultMacros, processing each of them |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
666 for ( unsigned int macro = 0; macro < macroResultMacroPendingListSize; macro++ ) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
667 { |
190
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
668 switch ( Macro_evalResultMacro( macroResultMacroPendingList[ macro ] ) ) |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
669 { |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
670 // Re-add macros to pending list |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
671 case ResultMacroEval_DoNothing: |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
672 default: |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
673 macroResultMacroPendingList[ macroResultMacroPendingListTail++ ] = macroResultMacroPendingList[ macro ]; |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
674 break; |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
675 |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
676 // 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
|
677 case ResultMacroEval_Remove: |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
678 break; |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
679 } |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
680 } |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
681 |
190
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
682 // Update the macroResultMacroPendingListSize with the tail pointer |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
683 macroResultMacroPendingListSize = macroResultMacroPendingListTail; |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
684 |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
685 // Signal buffer that we've used it |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
686 Scan_finishedWithMacro( macroTriggerListBufferSize ); |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
687 |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
688 // Reset TriggerList buffer |
7a71c6e38d56
Macro processing is now feature complete.
Jacob Alexander <haata@kiibohd.com>
parents:
189
diff
changeset
|
689 macroTriggerListBufferSize = 0; |
126
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
690 |
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
691 // 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
|
692 if ( macroDebugMode ) |
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
693 { |
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
694 USBKeys_Modifiers = 0; |
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
695 USBKeys_Sent = 0; |
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
696 } |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
697 } |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
698 |
185 | 699 |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
700 inline void Macro_setup() |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
701 { |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
702 // Register Macro CLI dictionary |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
703 CLI_registerDictionary( macroCLIDict, macroCLIDictName ); |
126
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
704 |
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
705 // Disable Macro debug mode |
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
706 macroDebugMode = 0; |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
707 |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
708 // Disable Macro pause flag |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
709 macroPauseMode = 0; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
710 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
711 // Set Macro step counter to zero |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
712 macroStepCounter = 0; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
713 |
176
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
714 // Make sure macro trigger buffer is empty |
d3ae6b409cfa
Initial work for partial layers and macros.
Jacob Alexander <haata@kiibohd.com>
parents:
166
diff
changeset
|
715 macroTriggerListBufferSize = 0; |
189
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
716 |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
717 // Initialize TriggerMacro states |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
718 for ( unsigned int macro = 0; macro < TriggerMacroNum; macro++ ) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
719 { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
720 TriggerMacroList[ macro ].pos = 0; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
721 TriggerMacroList[ macro ].state = TriggerMacro_Waiting; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
722 } |
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 // Initialize ResultMacro states |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
725 for ( unsigned int macro = 0; macro < ResultMacroNum; macro++ ) |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
726 { |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
727 ResultMacroList[ macro ].pos = 0; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
728 ResultMacroList[ macro ].state = 0; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
729 ResultMacroList[ macro ].stateType = 0; |
4493d8d2c959
Adding TriggerMacro processing.
Jacob Alexander <haata@kiibohd.com>
parents:
186
diff
changeset
|
730 } |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
731 } |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
732 |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
733 |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
734 // ----- CLI Command Functions ----- |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
735 |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
736 void cliFunc_capList( char* args ) |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
737 { |
180
ed56f7873645
Added capabilities list debug option
Jacob Alexander <haata@kiibohd.com>
parents:
179
diff
changeset
|
738 print( NL ); |
ed56f7873645
Added capabilities list debug option
Jacob Alexander <haata@kiibohd.com>
parents:
179
diff
changeset
|
739 info_msg("Capabilities List"); |
192
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
740 printHex( CapabilitiesNum ); |
180
ed56f7873645
Added capabilities list debug option
Jacob Alexander <haata@kiibohd.com>
parents:
179
diff
changeset
|
741 |
ed56f7873645
Added capabilities list debug option
Jacob Alexander <haata@kiibohd.com>
parents:
179
diff
changeset
|
742 // Iterate through all of the capabilities and display them |
ed56f7873645
Added capabilities list debug option
Jacob Alexander <haata@kiibohd.com>
parents:
179
diff
changeset
|
743 for ( unsigned int cap = 0; cap < CapabilitiesNum; cap++ ) |
ed56f7873645
Added capabilities list debug option
Jacob Alexander <haata@kiibohd.com>
parents:
179
diff
changeset
|
744 { |
ed56f7873645
Added capabilities list debug option
Jacob Alexander <haata@kiibohd.com>
parents:
179
diff
changeset
|
745 print( NL "\t" ); |
ed56f7873645
Added capabilities list debug option
Jacob Alexander <haata@kiibohd.com>
parents:
179
diff
changeset
|
746 printHex( cap ); |
ed56f7873645
Added capabilities list debug option
Jacob Alexander <haata@kiibohd.com>
parents:
179
diff
changeset
|
747 print(" - "); |
ed56f7873645
Added capabilities list debug option
Jacob Alexander <haata@kiibohd.com>
parents:
179
diff
changeset
|
748 |
ed56f7873645
Added capabilities list debug option
Jacob Alexander <haata@kiibohd.com>
parents:
179
diff
changeset
|
749 // 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
|
750 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
|
751 capability( 0xFF, 0xFF, 0 ); |
ed56f7873645
Added capabilities list debug option
Jacob Alexander <haata@kiibohd.com>
parents:
179
diff
changeset
|
752 } |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
753 } |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
754 |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
755 void cliFunc_capSelect( char* args ) |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
756 { |
126
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
757 // 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
|
758 char* curArgs; |
126
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
759 char* arg1Ptr; |
182
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
760 char* arg2Ptr = args; |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
761 |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
762 // Total number of args to scan (must do a lookup if a keyboard capability is selected) |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
763 unsigned int totalArgs = 2; // Always at least two args |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
764 unsigned int cap = 0; |
126
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
765 |
182
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
766 // Arguments used for keyboard capability function |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
767 unsigned int argSetCount = 0; |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
768 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
|
769 |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
770 // Process all args |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
771 for ( unsigned int c = 0; argSetCount < totalArgs; c++ ) |
126
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
772 { |
182
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
773 curArgs = arg2Ptr; |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
774 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
|
775 |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
776 // 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
|
777 // Extra arguments are ignored |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
778 if ( *arg1Ptr == '\0' ) |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
779 break; |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
780 |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
781 // 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
|
782 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
|
783 { |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
784 // Keyboard Capability |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
785 case 'K': |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
786 // Determine capability index |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
787 cap = decToInt( &arg1Ptr[1] ); |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
788 |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
789 // 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
|
790 totalArgs += CapabilitiesList[ cap ].argCount; |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
791 continue; |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
792 } |
126
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
793 |
182
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
794 // 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
|
795 // The argument pointer is repurposed as the argument list (much smaller anyways) |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
796 argSet[ argSetCount++ ] = (uint8_t)decToInt( arg1Ptr ); |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
797 |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
798 // 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
|
799 if ( argSetCount == totalArgs ) |
126
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
800 { |
182
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
801 // 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
|
802 print( NL ); |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
803 info_msg("K"); |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
804 printInt8( cap ); |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
805 print(" - "); |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
806 printHex( argSet[0] ); |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
807 print(" - "); |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
808 printHex( argSet[1] ); |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
809 print(" - "); |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
810 printHex( argSet[2] ); |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
811 print( "..." NL ); |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
812 |
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
813 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
|
814 capability( argSet[0], argSet[1], &argSet[2] ); |
126
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
815 } |
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
816 } |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
817 } |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
818 |
192
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
819 void cliFunc_keyHold( char* args ) |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
820 { |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
821 // Parse codes from arguments |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
822 char* curArgs; |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
823 char* arg1Ptr; |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
824 char* arg2Ptr = args; |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
825 |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
826 // Process all args |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
827 for ( ;; ) |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
828 { |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
829 curArgs = arg2Ptr; |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
830 CLI_argumentIsolation( curArgs, &arg1Ptr, &arg2Ptr ); |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
831 |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
832 // 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
|
833 if ( *arg1Ptr == '\0' ) |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
834 break; |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
835 |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
836 // Ignore non-Scancode numbers |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
837 switch ( arg1Ptr[0] ) |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
838 { |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
839 // Scancode |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
840 case 'S': |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
841 Macro_keyState( (uint8_t)decToInt( &arg1Ptr[1] ), 0x02 ); // Hold scancode |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
842 break; |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
843 } |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
844 } |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
845 } |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
846 |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
847 void cliFunc_keyPress( char* args ) |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
848 { |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
849 // Parse codes from arguments |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
850 char* curArgs; |
126
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
851 char* arg1Ptr; |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
852 char* arg2Ptr = args; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
853 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
854 // Process all args |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
855 for ( ;; ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
856 { |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
857 curArgs = arg2Ptr; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
858 CLI_argumentIsolation( curArgs, &arg1Ptr, &arg2Ptr ); |
126
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
859 |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
860 // Stop processing args if no more are found |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
861 if ( *arg1Ptr == '\0' ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
862 break; |
126
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
863 |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
864 // Ignore non-Scancode numbers |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
865 switch ( arg1Ptr[0] ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
866 { |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
867 // Scancode |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
868 case 'S': |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
869 Macro_keyState( (uint8_t)decToInt( &arg1Ptr[1] ), 0x01 ); // Press scancode |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
870 break; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
871 } |
126
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
872 } |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
873 } |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
874 |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
875 void cliFunc_keyRelease( char* args ) |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
876 { |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
877 // Parse codes from arguments |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
878 char* curArgs; |
126
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
879 char* arg1Ptr; |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
880 char* arg2Ptr = args; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
881 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
882 // Process all args |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
883 for ( ;; ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
884 { |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
885 curArgs = arg2Ptr; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
886 CLI_argumentIsolation( curArgs, &arg1Ptr, &arg2Ptr ); |
126
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
887 |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
888 // Stop processing args if no more are found |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
889 if ( *arg1Ptr == '\0' ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
890 break; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
891 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
892 // Ignore non-Scancode numbers |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
893 switch ( arg1Ptr[0] ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
894 { |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
895 // Scancode |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
896 case 'S': |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
897 Macro_keyState( (uint8_t)decToInt( &arg1Ptr[1] ), 0x03 ); // Release scancode |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
898 break; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
899 } |
126
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
900 } |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
901 } |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
902 |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
903 void cliFunc_layerList( char* args ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
904 { |
183
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
905 print( NL ); |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
906 info_msg("Layer List"); |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
907 |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
908 // Iterate through all of the layers and display them |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
909 for ( unsigned int layer = 0; layer < LayerNum; layer++ ) |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
910 { |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
911 print( NL "\t" ); |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
912 printHex( layer ); |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
913 print(" - "); |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
914 |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
915 // Display layer name |
192
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
916 dPrint( (char*)LayerIndex[ layer ].name ); |
183
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
917 |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
918 // Default map |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
919 if ( layer == 0 ) |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
920 print(" \033[1m(default)\033[0m"); |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
921 |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
922 // Layer State |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
923 print( NL "\t\t Layer State: " ); |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
924 printHex( LayerIndex[ layer ].state ); |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
925 |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
926 // Max Index |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
927 print(" Max Index: "); |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
928 printHex( LayerIndex[ layer ].max ); |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
929 } |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
930 } |
126
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
931 |
183
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
932 void cliFunc_layerState( char* args ) |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
933 { |
183
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
934 // Parse codes from arguments |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
935 char* curArgs; |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
936 char* arg1Ptr; |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
937 char* arg2Ptr = args; |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
938 |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
939 uint8_t arg1 = 0; |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
940 uint8_t arg2 = 0; |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
941 |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
942 // Process first two args |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
943 for ( uint8_t c = 0; c < 2; c++ ) |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
944 { |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
945 curArgs = arg2Ptr; |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
946 CLI_argumentIsolation( curArgs, &arg1Ptr, &arg2Ptr ); |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
947 |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
948 // Stop processing args if no more are found |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
949 if ( *arg1Ptr == '\0' ) |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
950 break; |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
951 |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
952 switch ( c ) |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
953 { |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
954 // First argument (e.g. L1) |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
955 case 0: |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
956 if ( arg1Ptr[0] != 'L' ) |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
957 return; |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
958 |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
959 arg1 = (uint8_t)decToInt( &arg1Ptr[1] ); |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
960 break; |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
961 // Second argument (e.g. 4) |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
962 case 1: |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
963 arg2 = (uint8_t)decToInt( arg1Ptr ); |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
964 |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
965 // Display operation (to indicate that it worked) |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
966 print( NL ); |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
967 info_msg("Setting Layer L"); |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
968 printInt8( arg1 ); |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
969 print(" to - "); |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
970 printHex( arg2 ); |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
971 |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
972 // Set the layer state |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
973 LayerIndex[ arg1 ].state = arg2; |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
974 break; |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
975 } |
bb96551a3065
Added layerList and layerState functions
Jacob Alexander <haata@kiibohd.com>
parents:
182
diff
changeset
|
976 } |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
977 } |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
978 |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
979 void cliFunc_macroDebug( char* args ) |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
980 { |
126
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
981 // Toggle macro debug mode |
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
982 macroDebugMode = macroDebugMode ? 0 : 1; |
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
983 |
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
984 print( NL ); |
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
985 info_msg("Macro Debug Mode: "); |
670fc9c3a739
Added CLI DefaultMap lookup command.
Jacob Alexander <haata@kiibohd.com>
parents:
125
diff
changeset
|
986 printInt8( macroDebugMode ); |
125
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
987 } |
8dab4014c398
Major code cleanup and preparation for PartialMap Macro Module
Jacob Alexander <haata@kiibohd.com>
parents:
diff
changeset
|
988 |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
989 void cliFunc_macroList( char* args ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
990 { |
192
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
991 // Show pending key events |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
992 print( NL ); |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
993 info_msg("Pending Key Events: "); |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
994 printInt16( (uint16_t)macroTriggerListBufferSize ); |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
995 print(" : "); |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
996 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
|
997 { |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
998 printHex( macroTriggerListBuffer[ key ].scanCode ); |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
999 print(" "); |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1000 } |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1001 |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1002 // Show pending trigger macros |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1003 print( NL ); |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1004 info_msg("Pending Trigger Macros: "); |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1005 printInt16( (uint16_t)macroTriggerMacroPendingListSize ); |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1006 print(" : "); |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1007 for ( unsigned int macro = 0; macro < macroTriggerMacroPendingListSize; macro++ ) |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1008 { |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1009 printHex( macroTriggerMacroPendingList[ macro ] ); |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1010 print(" "); |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1011 } |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1012 |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1013 // Show pending result macros |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1014 print( NL ); |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1015 info_msg("Pending Result Macros: "); |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1016 printInt16( (uint16_t)macroResultMacroPendingListSize ); |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1017 print(" : "); |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1018 for ( unsigned int macro = 0; macro < macroResultMacroPendingListSize; macro++ ) |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1019 { |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1020 printHex( macroResultMacroPendingList[ macro ] ); |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1021 print(" "); |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1022 } |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1023 |
181
80a44dcdafaf
Adding macroList debug function
Jacob Alexander <haata@kiibohd.com>
parents:
180
diff
changeset
|
1024 // Show available trigger macro indices |
80a44dcdafaf
Adding macroList debug function
Jacob Alexander <haata@kiibohd.com>
parents:
180
diff
changeset
|
1025 print( NL ); |
80a44dcdafaf
Adding macroList debug function
Jacob Alexander <haata@kiibohd.com>
parents:
180
diff
changeset
|
1026 info_msg("Trigger Macros Range: T0 -> T"); |
80a44dcdafaf
Adding macroList debug function
Jacob Alexander <haata@kiibohd.com>
parents:
180
diff
changeset
|
1027 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
|
1028 |
80a44dcdafaf
Adding macroList debug function
Jacob Alexander <haata@kiibohd.com>
parents:
180
diff
changeset
|
1029 // Show available result macro indices |
80a44dcdafaf
Adding macroList debug function
Jacob Alexander <haata@kiibohd.com>
parents:
180
diff
changeset
|
1030 print( NL ); |
80a44dcdafaf
Adding macroList debug function
Jacob Alexander <haata@kiibohd.com>
parents:
180
diff
changeset
|
1031 info_msg("Result Macros Range: R0 -> R"); |
80a44dcdafaf
Adding macroList debug function
Jacob Alexander <haata@kiibohd.com>
parents:
180
diff
changeset
|
1032 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
|
1033 |
80a44dcdafaf
Adding macroList debug function
Jacob Alexander <haata@kiibohd.com>
parents:
180
diff
changeset
|
1034 // Show Trigger to Result Macro Links |
80a44dcdafaf
Adding macroList debug function
Jacob Alexander <haata@kiibohd.com>
parents:
180
diff
changeset
|
1035 print( NL ); |
80a44dcdafaf
Adding macroList debug function
Jacob Alexander <haata@kiibohd.com>
parents:
180
diff
changeset
|
1036 info_msg("Trigger : Result Macro Pairs"); |
80a44dcdafaf
Adding macroList debug function
Jacob Alexander <haata@kiibohd.com>
parents:
180
diff
changeset
|
1037 for ( unsigned int macro = 0; macro < TriggerMacroNum; macro++ ) |
80a44dcdafaf
Adding macroList debug function
Jacob Alexander <haata@kiibohd.com>
parents:
180
diff
changeset
|
1038 { |
80a44dcdafaf
Adding macroList debug function
Jacob Alexander <haata@kiibohd.com>
parents:
180
diff
changeset
|
1039 print( NL ); |
80a44dcdafaf
Adding macroList debug function
Jacob Alexander <haata@kiibohd.com>
parents:
180
diff
changeset
|
1040 print("\tT"); |
80a44dcdafaf
Adding macroList debug function
Jacob Alexander <haata@kiibohd.com>
parents:
180
diff
changeset
|
1041 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
|
1042 print(" : R"); |
80a44dcdafaf
Adding macroList debug function
Jacob Alexander <haata@kiibohd.com>
parents:
180
diff
changeset
|
1043 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
|
1044 } |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1045 } |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1046 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1047 void cliFunc_macroProc( char* args ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1048 { |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1049 // Toggle macro pause mode |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1050 macroPauseMode = macroPauseMode ? 0 : 1; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1051 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1052 print( NL ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1053 info_msg("Macro Processing Mode: "); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1054 printInt8( macroPauseMode ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1055 } |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1056 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1057 void macroDebugShowTrigger( unsigned int index ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1058 { |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1059 // Only proceed if the macro exists |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1060 if ( index >= TriggerMacroNum ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1061 return; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1062 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1063 // Trigger Macro Show |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1064 TriggerMacro *macro = &TriggerMacroList[ index ]; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1065 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1066 print( NL ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1067 info_msg("Trigger Macro Index: "); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1068 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
|
1069 print( NL ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1070 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1071 // Read the comboLength for combo in the sequence (sequence of combos) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1072 unsigned int pos = 0; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1073 uint8_t comboLength = macro->guide[ pos ]; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1074 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1075 // Iterate through and interpret the guide |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1076 while ( comboLength != 0 ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1077 { |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1078 // Initial position of the combo |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1079 unsigned int comboPos = ++pos; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1080 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1081 // Iterate through the combo |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1082 while ( pos < comboLength * TriggerGuideSize + comboPos ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1083 { |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1084 // Assign TriggerGuide element (key type, state and scancode) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1085 TriggerGuide *guide = (TriggerGuide*)(¯o->guide[ pos ]); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1086 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1087 // Display guide information about trigger key |
184
f9ef267ccc8b
Adding layer fall-through lookup
Jacob Alexander <haata@kiibohd.com>
parents:
183
diff
changeset
|
1088 printHex( guide->scanCode ); |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1089 print("|"); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1090 printHex( guide->type ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1091 print("|"); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1092 printHex( guide->state ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1093 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1094 // Increment position |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1095 pos += TriggerGuideSize; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1096 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1097 // 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
|
1098 if ( pos < comboLength * TriggerGuideSize + comboPos ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1099 print("+"); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1100 } |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1101 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1102 // Read the next comboLength |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1103 comboLength = macro->guide[ pos ]; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1104 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1105 // 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
|
1106 if ( comboLength != 0 ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1107 print(";"); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1108 } |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1109 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1110 // Display current position |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1111 print( NL "Position: " ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1112 printInt16( (uint16_t)macro->pos ); // 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
|
1113 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1114 // Display result macro index |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1115 print( NL "Result Macro Index: " ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1116 printInt16( (uint16_t)macro->result ); // 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
|
1117 } |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1118 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1119 void macroDebugShowResult( unsigned int index ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1120 { |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1121 // Only proceed if the macro exists |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1122 if ( index >= ResultMacroNum ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1123 return; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1124 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1125 // Trigger Macro Show |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1126 ResultMacro *macro = &ResultMacroList[ index ]; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1127 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1128 print( NL ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1129 info_msg("Result Macro Index: "); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1130 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
|
1131 print( NL ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1132 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1133 // Read the comboLength for combo in the sequence (sequence of combos) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1134 unsigned int pos = 0; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1135 uint8_t comboLength = macro->guide[ pos++ ]; |
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 // Iterate through and interpret the guide |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1138 while ( comboLength != 0 ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1139 { |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1140 // Function Counter, used to keep track of the combos processed |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1141 unsigned int funcCount = 0; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1142 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1143 // Iterate through the combo |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1144 while ( funcCount < comboLength ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1145 { |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1146 // Assign TriggerGuide element (key type, state and scancode) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1147 ResultGuide *guide = (ResultGuide*)(¯o->guide[ pos ]); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1148 |
180
ed56f7873645
Added capabilities list debug option
Jacob Alexander <haata@kiibohd.com>
parents:
179
diff
changeset
|
1149 // Display Function Index |
ed56f7873645
Added capabilities list debug option
Jacob Alexander <haata@kiibohd.com>
parents:
179
diff
changeset
|
1150 printHex( guide->index ); |
ed56f7873645
Added capabilities list debug option
Jacob Alexander <haata@kiibohd.com>
parents:
179
diff
changeset
|
1151 print("|"); |
ed56f7873645
Added capabilities list debug option
Jacob Alexander <haata@kiibohd.com>
parents:
179
diff
changeset
|
1152 |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1153 // Display Function Ptr Address |
182
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1154 printHex( (unsigned int)CapabilitiesList[ guide->index ].func ); |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1155 print("|"); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1156 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1157 // 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
|
1158 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
|
1159 capability( 0xFF, 0xFF, 0 ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1160 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1161 // Display Argument(s) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1162 print("("); |
182
880c33236cd1
Added capSelect function that can arbitrary run a keyboard capability
Jacob Alexander <haata@kiibohd.com>
parents:
181
diff
changeset
|
1163 for ( unsigned int 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
|
1164 { |
180
ed56f7873645
Added capabilities list debug option
Jacob Alexander <haata@kiibohd.com>
parents:
179
diff
changeset
|
1165 // Arguments are only 8 bit values |
ed56f7873645
Added capabilities list debug option
Jacob Alexander <haata@kiibohd.com>
parents:
179
diff
changeset
|
1166 printHex( (&guide->args)[ arg ] ); |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1167 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1168 // 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
|
1169 if ( arg + 1 < CapabilitiesList[ guide->index ].argCount ) |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1170 print(","); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1171 } |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1172 print(")"); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1173 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1174 // Increment position |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1175 pos += ResultGuideSize( guide ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1176 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1177 // Increment function count |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1178 funcCount++; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1179 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1180 // 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
|
1181 if ( funcCount < comboLength ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1182 print("+"); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1183 } |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1184 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1185 // Read the next comboLength |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1186 comboLength = macro->guide[ pos++ ]; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1187 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1188 // 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
|
1189 if ( comboLength != 0 ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1190 print(";"); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1191 } |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1192 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1193 // Display current position |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1194 print( NL "Position: " ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1195 printInt16( (uint16_t)macro->pos ); // 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
|
1196 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1197 // Display final trigger state/type |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1198 print( NL "Final Trigger State (State/Type): " ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1199 printHex( macro->state ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1200 print("/"); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1201 printHex( macro->stateType ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1202 } |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1203 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1204 void cliFunc_macroShow( char* args ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1205 { |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1206 // Parse codes from arguments |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1207 char* curArgs; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1208 char* arg1Ptr; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1209 char* arg2Ptr = args; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1210 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1211 // Process all args |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1212 for ( ;; ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1213 { |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1214 curArgs = arg2Ptr; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1215 CLI_argumentIsolation( curArgs, &arg1Ptr, &arg2Ptr ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1216 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1217 // Stop processing args if no more are found |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1218 if ( *arg1Ptr == '\0' ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1219 break; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1220 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1221 // Ignore invalid codes |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1222 switch ( arg1Ptr[0] ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1223 { |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1224 // Indexed Trigger Macro |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1225 case 'T': |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1226 macroDebugShowTrigger( decToInt( &arg1Ptr[1] ) ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1227 break; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1228 // Indexed Result Macro |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1229 case 'R': |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1230 macroDebugShowResult( decToInt( &arg1Ptr[1] ) ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1231 break; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1232 } |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1233 } |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1234 } |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1235 |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1236 void cliFunc_macroStep( char* args ) |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1237 { |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1238 // Parse number from argument |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1239 // NOTE: Only first argument is used |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1240 char* arg1Ptr; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1241 char* arg2Ptr; |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1242 CLI_argumentIsolation( args, &arg1Ptr, &arg2Ptr ); |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1243 |
192
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1244 // Default to 1, if no argument given |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1245 unsigned int count = (unsigned int)decToInt( arg1Ptr ); |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1246 |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1247 if ( count == 0 ) |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1248 count = 1; |
6ac92b8614c0
Fixing RAM calculator and reduced actual SRAM usage
Jacob Alexander <haata@kiibohd.com>
parents:
191
diff
changeset
|
1249 |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1250 // 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
|
1251 macroStepCounter = count; |
179
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1252 } |
e5cf79b516e4
Basic debug trigger/result macro viewer
Jacob Alexander <haata@kiibohd.com>
parents:
176
diff
changeset
|
1253 |