louis/kiibohd-controller: Macro/PartialMap/macro.c annotate

annotate Macro/PartialMap/macro.c @ 241:9f62492034c7

Fixing bug that locks up the keyboard if shifting to a layer that doesn't exist.

author	Jacob Alexander <haata@kiibohd.com>
date	Wed, 15 Oct 2014 10:39:39 -0700
parents	2a4c99da1276
children	e79f2b9c39cf

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

Mercurial > louis > kiibohd-controller

annotate Macro/PartialMap/macro.c @ 241:9f62492034c7