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

annotate Macro/PartialMap/macro.c @ 239:2a4c99da1276

HUGE AVR RAM optimization (~28%). - It's possible to get even more, but this is probably as far as I'll go - PROGMEM is really annoying to use, and makes the code look like ass - Now the Teensy 2++ should have enough RAM to use PartialMap easily

author	Jacob Alexander <haata@kiibohd.com>
date	Thu, 02 Oct 2014 22:09:34 -0700
parents	8ceb1a0582ee
children	9f62492034c7

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 {
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	153 // Is layer in the LayerIndexStack?
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	154 uint8_t inLayerIndexStack = 0;
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	155 uint16_t stackItem = 0;
191 3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	156 while ( stackItem < macroLayerIndexStackSize )
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	157 {
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	158 // 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	159 if ( macroLayerIndexStack[ stackItem ] == layer )
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	160 {
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	161 inLayerIndexStack = 1;
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	162 break;
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	163 }
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 // Increment to next item
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	166 stackItem++;
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 // Toggle Layer State Byte
214 5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	170 if ( LayerState[ layer ] & layerState )
191 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 // Unset
214 5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	173 LayerState[ layer ] &= ~layerState;
191 3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	174 }
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	175 else
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	176 {
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	177 // Set
214 5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	178 LayerState[ layer ] \|= layerState;
191 3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	179 }
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 // 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	182 if ( !inLayerIndexStack )
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 macroLayerIndexStack[ macroLayerIndexStackSize++ ] = layer;
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	185 }
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	186
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	187 // 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	188 if ( LayerState[ layer ] == 0x00 && inLayerIndexStack )
191 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 // Remove the layer from the LayerIndexStack
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	191 // 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	192 while ( stackItem < macroLayerIndexStackSize )
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 macroLayerIndexStack[ stackItem ] = macroLayerIndexStack[ stackItem + 1 ];
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	195 stackItem++;
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	196 }
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 // Reduce LayerIndexStack size
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	199 macroLayerIndexStackSize--;
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
199 559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	203 // Modifies the specified Layer control byte
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	204 // Argument #1: Layer Index -> uint16_t
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	205 // Argument #2: Layer State -> uint8_t
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	206 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	207 {
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	208 // Display capability name
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	209 if ( stateType == 0xFF && state == 0xFF )
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	210 {
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	211 print("Macro_layerState(layerIndex,layerState)");
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	212 return;
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	213 }
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	214
201 326f75709d10 Fixing release state for keys Jacob Alexander <jacob.alexander@virtualinstruments.com> parents: 199 diff changeset	215 // Only use capability on press or release
326f75709d10 Fixing release state for keys Jacob Alexander <jacob.alexander@virtualinstruments.com> parents: 199 diff changeset	216 // TODO Analog
326f75709d10 Fixing release state for keys Jacob Alexander <jacob.alexander@virtualinstruments.com> parents: 199 diff changeset	217 // 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	218 if ( stateType == 0x00 && state == 0x02 ) // Hold condition
326f75709d10 Fixing release state for keys Jacob Alexander <jacob.alexander@virtualinstruments.com> parents: 199 diff changeset	219 return;
326f75709d10 Fixing release state for keys Jacob Alexander <jacob.alexander@virtualinstruments.com> parents: 199 diff changeset	220
199 559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	221 // Get layer index from arguments
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	222 // 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	223 uint16_t layer = (uint16_t)(&args[0]);
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	224
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	225 // Get layer toggle byte
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	226 uint8_t layerState = args[ sizeof(uint16_t) ];
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	227
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	228 Macro_layerState( state, stateType, layer, layerState );
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	229 }
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	230
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 // Latches given layer
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	233 // Argument #1: Layer Index -> uint16_t
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	234 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	235 {
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	236 // Display capability name
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	237 if ( stateType == 0xFF && state == 0xFF )
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	238 {
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	239 print("Macro_layerLatch(layerIndex)");
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	240 return;
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	241 }
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	242
201 326f75709d10 Fixing release state for keys Jacob Alexander <jacob.alexander@virtualinstruments.com> parents: 199 diff changeset	243 // Only use capability on press
326f75709d10 Fixing release state for keys Jacob Alexander <jacob.alexander@virtualinstruments.com> parents: 199 diff changeset	244 // TODO Analog
326f75709d10 Fixing release state for keys Jacob Alexander <jacob.alexander@virtualinstruments.com> parents: 199 diff changeset	245 // 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	246 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	247 return;
326f75709d10 Fixing release state for keys Jacob Alexander <jacob.alexander@virtualinstruments.com> parents: 199 diff changeset	248
199 559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	249 // Get layer index from arguments
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	250 // 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	251 uint16_t layer = (uint16_t)(&args[0]);
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	252
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	253 Macro_layerState( state, stateType, layer, 0x02 );
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	254 }
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	255
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	256
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	257 // Locks given layer
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	258 // Argument #1: Layer Index -> uint16_t
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	259 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	260 {
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	261 // Display capability name
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	262 if ( stateType == 0xFF && state == 0xFF )
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	263 {
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	264 print("Macro_layerLock(layerIndex)");
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	265 return;
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	266 }
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	267
201 326f75709d10 Fixing release state for keys Jacob Alexander <jacob.alexander@virtualinstruments.com> parents: 199 diff changeset	268 // Only use capability on press
326f75709d10 Fixing release state for keys Jacob Alexander <jacob.alexander@virtualinstruments.com> parents: 199 diff changeset	269 // TODO Analog
326f75709d10 Fixing release state for keys Jacob Alexander <jacob.alexander@virtualinstruments.com> parents: 199 diff changeset	270 // 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	271 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	272 return;
326f75709d10 Fixing release state for keys Jacob Alexander <jacob.alexander@virtualinstruments.com> parents: 199 diff changeset	273
199 559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	274 // Get layer index from arguments
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	275 // 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	276 uint16_t layer = (uint16_t)(&args[0]);
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	277
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	278 Macro_layerState( state, stateType, layer, 0x04 );
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	279 }
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	280
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	281
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	282 // Shifts given layer
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	283 // Argument #1: Layer Index -> uint16_t
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	284 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	285 {
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	286 // Display capability name
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	287 if ( stateType == 0xFF && state == 0xFF )
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	288 {
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	289 print("Macro_layerShift(layerIndex)");
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	290 return;
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	291 }
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	292
201 326f75709d10 Fixing release state for keys Jacob Alexander <jacob.alexander@virtualinstruments.com> parents: 199 diff changeset	293 // Only use capability on press or release
326f75709d10 Fixing release state for keys Jacob Alexander <jacob.alexander@virtualinstruments.com> parents: 199 diff changeset	294 // TODO Analog
326f75709d10 Fixing release state for keys Jacob Alexander <jacob.alexander@virtualinstruments.com> parents: 199 diff changeset	295 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	296 return;
326f75709d10 Fixing release state for keys Jacob Alexander <jacob.alexander@virtualinstruments.com> parents: 199 diff changeset	297
199 559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	298 // Get layer index from arguments
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	299 // 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	300 uint16_t layer = (uint16_t)(&args[0]);
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	301
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	302 Macro_layerState( state, stateType, layer, 0x01 );
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	303 }
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	304
191 3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	305
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	306
125 8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	307 // ----- Functions -----
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	308
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	309 // 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	310 // 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	311 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	312 {
184 f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	313 // 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	314 for ( uint16_t layerIndex = 0; layerIndex < macroLayerIndexStackSize; layerIndex++ )
184 f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	315 {
191 3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	316 // Lookup Layer
214 5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	317 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	318
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	319 // 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	320 // 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	321 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	322 if ( latch )
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	323 {
214 5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	324 LayerState[ layerIndex ] &= ~0x02;
191 3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	325 }
184 f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	326
191 3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	327 // 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	328 // XOR each of the state bits
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	329 // 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	330 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	331 {
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	332 // Lookup layer
202 1a68a9a04ad3 Adding variable width state variable width. Jacob Alexander <haata@kiibohd.com> parents: 201 diff changeset	333 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	334
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	335 // Determine if layer has key defined
214 5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	336 // 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	337 if ( map != 0
215 00a8c7f491d4 Fixing first and last element bug for layers. Jacob Alexander <haata@kiibohd.com> parents: 214 diff changeset	338 && scanCode <= layer->last
00a8c7f491d4 Fixing first and last element bug for layers. Jacob Alexander <haata@kiibohd.com> parents: 214 diff changeset	339 && scanCode >= layer->first
214 5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	340 && *map[ scanCode - layer->first ] != 0 )
5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	341 {
5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	342 return map[ scanCode - layer->first ];
5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	343 }
191 3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	344 }
184 f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	345 }
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	346
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	347 // Do lookup on default layer
202 1a68a9a04ad3 Adding variable width state variable width. Jacob Alexander <haata@kiibohd.com> parents: 201 diff changeset	348 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	349
214 5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	350 // Lookup default layer
216 738445f38639 DPH controller now working with the kishsaver and macros Jacob Alexander <haata@kiibohd.com> parents: 215 diff changeset	351 const Layer *layer = &LayerIndex[0];
214 5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	352
5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	353 // 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	354 if ( map != 0
215 00a8c7f491d4 Fixing first and last element bug for layers. Jacob Alexander <haata@kiibohd.com> parents: 214 diff changeset	355 && scanCode <= layer->last
00a8c7f491d4 Fixing first and last element bug for layers. Jacob Alexander <haata@kiibohd.com> parents: 214 diff changeset	356 && scanCode >= layer->first
214 5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	357 && *map[ scanCode - layer->first ] != 0 )
184 f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	358 {
214 5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	359 return map[ scanCode - layer->first ];
184 f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	360 }
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	361
214 5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	362 // Otherwise no defined Trigger Macro
5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	363 erro_msg("Scan Code has no defined Trigger Macro: ");
5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	364 printHex( scanCode );
5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	365 return 0;
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	366 }
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	367
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	368
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	369 // Update the scancode key state
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	370 // States:
184 f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	371 // * 0x00 - Off
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	372 // * 0x01 - Pressed
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	373 // * 0x02 - Held
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	374 // * 0x03 - Released
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	375 // * 0x04 - Unpressed (this is currently ignored)
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	376 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	377 {
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	378 // 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	379 switch ( state )
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	380 {
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	381 case 0x01: // Pressed
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	382 case 0x02: // Held
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	383 case 0x03: // Released
184 f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	384 macroTriggerListBuffer[ macroTriggerListBufferSize ].scanCode = scanCode;
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	385 macroTriggerListBuffer[ macroTriggerListBufferSize ].state = state;
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	386 macroTriggerListBuffer[ macroTriggerListBufferSize ].type = 0x00; // Normal key
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	387 macroTriggerListBufferSize++;
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	388 break;
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	389 }
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	390 }
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	391
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	392
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	393 // Update the scancode analog state
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	394 // States:
184 f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	395 // * 0x00 - Off
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	396 // * 0x01 - Released
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	397 // * 0x02-0xFF - Analog value (low to high)
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	398 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	399 {
184 f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	400 // Only add to macro trigger list if non-off
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	401 if ( state != 0x00 )
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	402 {
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	403 macroTriggerListBuffer[ macroTriggerListBufferSize ].scanCode = scanCode;
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	404 macroTriggerListBuffer[ macroTriggerListBufferSize ].state = state;
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	405 macroTriggerListBuffer[ macroTriggerListBufferSize ].type = 0x02; // Analog key
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	406 macroTriggerListBufferSize++;
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	407 }
166 2fba36caf039 Initial work for KLL macro support Jacob Alexander <haata@kiibohd.com> parents: 159 diff changeset	408 }
2fba36caf039 Initial work for KLL macro support Jacob Alexander <haata@kiibohd.com> parents: 159 diff changeset	409
2fba36caf039 Initial work for KLL macro support Jacob Alexander <haata@kiibohd.com> parents: 159 diff changeset	410
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	411 // Update led state
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	412 // States:
184 f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	413 // * 0x00 - Off
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	414 // * 0x01 - On
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	415 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	416 {
184 f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	417 // Only add to macro trigger list if non-off
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	418 if ( state != 0x00 )
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	419 {
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	420 macroTriggerListBuffer[ macroTriggerListBufferSize ].scanCode = ledCode;
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	421 macroTriggerListBuffer[ macroTriggerListBufferSize ].state = state;
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	422 macroTriggerListBuffer[ macroTriggerListBufferSize ].type = 0x01; // LED key
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	423 macroTriggerListBufferSize++;
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	424 }
166 2fba36caf039 Initial work for KLL macro support Jacob Alexander <haata@kiibohd.com> parents: 159 diff changeset	425 }
2fba36caf039 Initial work for KLL macro support Jacob Alexander <haata@kiibohd.com> parents: 159 diff changeset	426
2fba36caf039 Initial work for KLL macro support Jacob Alexander <haata@kiibohd.com> parents: 159 diff changeset	427
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	428 // Append result macro to pending list, checking for duplicates
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	429 // Do nothing if duplicate
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	430 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	431 {
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	432 // Lookup result macro index
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	433 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	434
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	435 // 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	436 for ( var_uint_t macro = 0; macro < macroResultMacroPendingListSize; macro++ )
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	437 {
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	438 // If duplicate found, do nothing
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	439 if ( macroResultMacroPendingList[ macro ] == resultMacroIndex )
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	440 return;
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	441 }
166 2fba36caf039 Initial work for KLL macro support Jacob Alexander <haata@kiibohd.com> parents: 159 diff changeset	442
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	443 // No duplicates found, add to pending list
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	444 macroResultMacroPendingList[ macroResultMacroPendingListSize++ ] = resultMacroIndex;
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	445
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	446 // 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	447 var_uint_t pos = 0;
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	448 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	449 {
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	450 pos += TriggerGuideSize * comboLength + 1;
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	451 comboLength = triggerMacro->guide[ pos ];
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	452 }
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	453
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	454 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	455
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	456 // 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	457 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	458 {
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	459 if ( macroTriggerListBuffer[ keyIndex ].scanCode == scanCode )
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	460 {
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	461 ResultMacroRecordList[ resultMacroIndex ].state = macroTriggerListBuffer[ keyIndex ].state;
8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	462 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	463 }
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	464 }
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	465
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	466 // Reset the macro position
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	467 ResultMacroRecordList[ resultMacroIndex ].pos = 0;
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	468 }
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	469
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	470
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	471 // Determine if long ResultMacro (more than 1 seqence element)
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	472 inline uint8_t Macro_isLongResultMacro( const ResultMacro *macro )
189 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 // 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	475 // If non-zero return non-zero (long sequence)
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	476 // 0 otherwise (short sequence)
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	477 var_uint_t position = 1;
b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	478 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	479 position += ResultGuideSize( (ResultGuide*)&macro->guide[ position ] );
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	480 return macro->guide[ position ];
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	481 }
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	482
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	483
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	484 // Determine if long TriggerMacro (more than 1 sequence element)
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	485 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	486 {
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	487 // Check the second sequence combo length
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	488 // 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	489 // 0 otherwise (short sequence)
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	490 return macro->guide[ macro->guide[0] * TriggerGuideSize + 1 ];
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	491 }
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	492
166 2fba36caf039 Initial work for KLL macro support Jacob Alexander <haata@kiibohd.com> parents: 159 diff changeset	493
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	494 // 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	495 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	496 {
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	497 // Depending on key type
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	498 switch ( guide->type )
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	499 {
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	500 // Normal State Type
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	501 case 0x00:
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	502 // 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	503 if ( guide->scanCode == key->scanCode )
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	504 {
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	505 switch ( key->state )
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	506 {
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	507 // Correct key, pressed, possible passing
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	508 case 0x01:
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	509 return TriggerMacroVote_Pass;
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, held, possible passing or release
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	512 case 0x02:
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	513 return TriggerMacroVote_PassRelease;
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, released, possible release
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	516 case 0x03:
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	517 return TriggerMacroVote_Release;
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 }
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	520
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	521 return TriggerMacroVote_DoNothing;
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 // LED State Type
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	524 case 0x01:
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	525 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	526 break;
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	527
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	528 // Analog State Type
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	529 case 0x02:
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	530 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	531 break;
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	532
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	533 // Invalid State Type
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	534 default:
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	535 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	536 break;
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	537 }
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	538
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	539 // XXX Shouldn't reach here
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	540 return TriggerMacroVote_Invalid;
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
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	544 // 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	545 // 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	546 inline TriggerMacroVote Macro_evalLongTriggerMacroVote( TriggerGuide key, TriggerGuide guide )
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	547 {
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	548 // Depending on key type
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	549 switch ( guide->type )
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	550 {
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	551 // Normal State Type
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	552 case 0x00:
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	553 // Depending on the state of the buffered key, make voting decision
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	554 // Incorrect key
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	555 if ( guide->scanCode != key->scanCode )
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	556 {
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	557 switch ( key->state )
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	558 {
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	559 // Wrong key, pressed, fail
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	560 case 0x01:
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	561 return TriggerMacroVote_Fail;
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	562
197 1ebb6fb5f74f All basic macros tested and working! Jacob Alexander <haata@kiibohd.com> parents: 196 diff changeset	563 // Wrong key, held, do not pass (no effect)
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	564 case 0x02:
197 1ebb6fb5f74f All basic macros tested and working! Jacob Alexander <haata@kiibohd.com> parents: 196 diff changeset	565 return TriggerMacroVote_DoNothing;
1ebb6fb5f74f All basic macros tested and working! Jacob Alexander <haata@kiibohd.com> parents: 196 diff changeset	566
1ebb6fb5f74f All basic macros tested and working! Jacob Alexander <haata@kiibohd.com> parents: 196 diff changeset	567 // Wrong key released, fail out if pos == 0
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	568 case 0x03:
197 1ebb6fb5f74f All basic macros tested and working! Jacob Alexander <haata@kiibohd.com> parents: 196 diff changeset	569 return TriggerMacroVote_DoNothing \| TriggerMacroVote_DoNothingRelease;
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	570 }
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	571 }
166 2fba36caf039 Initial work for KLL macro support Jacob Alexander <haata@kiibohd.com> parents: 159 diff changeset	572
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	573 // Correct key
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	574 else
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	575 {
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	576 switch ( key->state )
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	577 {
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	578 // Correct key, pressed, possible passing
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	579 case 0x01:
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	580 return TriggerMacroVote_Pass;
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	581
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	582 // Correct key, held, possible passing or release
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	583 case 0x02:
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	584 return TriggerMacroVote_PassRelease;
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, released, possible release
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	587 case 0x03:
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	588 return TriggerMacroVote_Release;
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	589 }
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	590 }
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	591
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	592 break;
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	593
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	594 // LED State Type
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	595 case 0x01:
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	596 erro_print("LED State Type - Not implemented...");
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	597 break;
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	598
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	599 // Analog State Type
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	600 case 0x02:
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	601 erro_print("Analog State Type - Not implemented...");
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	602 break;
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	603
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	604 // Invalid State Type
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	605 default:
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	606 erro_print("Invalid State Type. This is a bug.");
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	607 break;
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	608 }
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	609
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	610 // XXX Shouldn't reach here
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	611 return TriggerMacroVote_Invalid;
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	612 }
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	613
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	614
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	615 // Evaluate/Update TriggerMacro
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	616 inline TriggerMacroEval Macro_evalTriggerMacro( var_uint_t triggerMacroIndex )
189 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 // Lookup TriggerMacro
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	619 const TriggerMacro *macro = &TriggerMacroList[ triggerMacroIndex ];
8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	620 TriggerMacroRecord *record = &TriggerMacroRecordList[ 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 // 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	623 if ( record->state == TriggerMacro_Release )
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	624 {
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	625 record->state = TriggerMacro_Waiting;
8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	626 record->pos = record->pos + macro->guide[ record->pos ] * TriggerGuideSize + 1;
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	627 }
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	628
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	629 // Current Macro position
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	630 var_uint_t pos = record->pos;
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 // 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	633 uint8_t comboLength = macro->guide[ pos ] * TriggerGuideSize;
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	634
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	635 // 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	636 if ( comboLength == 0 )
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	637 {
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	638 return TriggerMacroEval_Remove;
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	639 }
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	640
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	641 // 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	642 uint8_t longMacro = Macro_isLongTriggerMacro( macro );
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	643
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	644 // 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	645 // 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	646 //
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	647 // 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	648 // 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	649 // 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	650 // On scan after position increment, change to TriggerMacro_Waiting state
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	651 // TODO Add support for system LED states (NumLock, CapsLock, etc.)
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	652 // TODO Add support for analog key states
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	653 // 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	654 // 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	655 TriggerMacroVote overallVote = TriggerMacroVote_Invalid;
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	656 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	657 {
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	658 // 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	659 TriggerGuide guide = (TriggerGuide)(&macro->guide[ comboItem ]);
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	660
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	661 TriggerMacroVote vote = TriggerMacroVote_Invalid;
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	662 // 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	663 for ( uint8_t key = 0; key < macroTriggerListBufferSize; key++ )
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	664 {
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	665 // Lookup key information
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	666 TriggerGuide *keyInfo = &macroTriggerListBuffer[ key ];
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	667
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	668 // 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	669 // 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	670 vote \|= longMacro
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	671 ? Macro_evalLongTriggerMacroVote( keyInfo, guide )
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	672 : Macro_evalShortTriggerMacroVote( keyInfo, guide );
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	673 if ( vote >= TriggerMacroVote_Pass )
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	674 {
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	675 vote &= TriggerMacroVote_Release \| TriggerMacroVote_PassRelease \| TriggerMacroVote_Pass;
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	676 break;
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	677 }
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	678 }
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	679
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	680 // 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	681 // 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	682 if ( !longMacro && vote < TriggerMacroVote_Pass )
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	683 vote \|= TriggerMacroVote_Fail;
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	684
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	685 // After voting, append to overall vote
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	686 overallVote \|= vote;
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	687 }
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	688
197 1ebb6fb5f74f All basic macros tested and working! Jacob Alexander <haata@kiibohd.com> parents: 196 diff changeset	689 // 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	690 // 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	691 if ( longMacro && overallVote & TriggerMacroVote_DoNothingRelease && pos == 0 )
1ebb6fb5f74f All basic macros tested and working! Jacob Alexander <haata@kiibohd.com> parents: 196 diff changeset	692 overallVote \|= TriggerMacroVote_Fail;
1ebb6fb5f74f All basic macros tested and working! Jacob Alexander <haata@kiibohd.com> parents: 196 diff changeset	693
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	694 // Decide new state of macro after voting
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	695 // Fail macro, remove from pending list
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	696 if ( overallVote & TriggerMacroVote_Fail )
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	697 {
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	698 return TriggerMacroEval_Remove;
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	699 }
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	700 // 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	701 else if ( overallVote & TriggerMacroVote_DoNothing && longMacro )
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	702 {
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	703 // Just doing nothing :)
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	704 }
216 738445f38639 DPH controller now working with the kishsaver and macros Jacob Alexander <haata@kiibohd.com> parents: 215 diff changeset	705 // 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	706 // 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	707 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	708 {
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	709 record->state = TriggerMacro_Release;
216 738445f38639 DPH controller now working with the kishsaver and macros Jacob Alexander <haata@kiibohd.com> parents: 215 diff changeset	710
738445f38639 DPH controller now working with the kishsaver and macros Jacob Alexander <haata@kiibohd.com> parents: 215 diff changeset	711 // 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	712 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	713 return TriggerMacroEval_DoResultAndRemove;
738445f38639 DPH controller now working with the kishsaver and macros Jacob Alexander <haata@kiibohd.com> parents: 215 diff changeset	714 }
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	715 // 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	716 else if ( overallVote & TriggerMacroVote_Pass
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	717 && ( record->state == TriggerMacro_Waiting \|\| record->state == TriggerMacro_Press ) )
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	718 {
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	719 record->state = TriggerMacro_Press;
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	720
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	721 // 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	722 // 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	723 // 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	724 // 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	725 if ( macro->guide[ pos + comboLength + 1 ] == 0 )
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	726 {
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	727 // 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	728 if ( Macro_isLongResultMacro( &ResultMacroList[ macro->result ] ) )
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	729 {
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	730 // 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	731 if ( overallVote == TriggerMacroVote_Pass )
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	732 {
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	733 return TriggerMacroEval_DoResultAndRemove;
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	734 }
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	735 }
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	736 // Short result macro
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	737 else
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 // 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	740 if ( Macro_isLongTriggerMacro( macro ) )
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	741 {
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	742 return TriggerMacroEval_DoResultAndRemove;
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	743 }
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	744 // Otherwise, trigger result continuously
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	745 else
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	746 {
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	747 return TriggerMacroEval_DoResult;
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	748 }
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	749 }
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	750 }
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	751 }
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	752 // 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	753 // 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	754 else if ( overallVote & TriggerMacroVote_Release )
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	755 {
201 326f75709d10 Fixing release state for keys Jacob Alexander <jacob.alexander@virtualinstruments.com> parents: 199 diff changeset	756 return TriggerMacroEval_DoResultAndRemove;
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	757 }
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	758
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	759 // 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	760 // 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	761 if ( !longMacro )
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	762 return TriggerMacroEval_Remove;
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	763
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	764 return TriggerMacroEval_DoNothing;
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	765 }
166 2fba36caf039 Initial work for KLL macro support Jacob Alexander <haata@kiibohd.com> parents: 159 diff changeset	766
2fba36caf039 Initial work for KLL macro support Jacob Alexander <haata@kiibohd.com> parents: 159 diff changeset	767
185 68f3dc0cddd0 Macro cleanup. Jacob Alexander <haata@kiibohd.com> parents: 184 diff changeset	768 // Evaluate/Update ResultMacro
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	769 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	770 {
190 7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	771 // Lookup ResultMacro
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	772 const ResultMacro *macro = &ResultMacroList[ resultMacroIndex ];
8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	773 ResultMacroRecord *record = &ResultMacroRecordList[ resultMacroIndex ];
190 7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	774
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	775 // Current Macro position
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	776 var_uint_t pos = record->pos;
190 7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	777
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	778 // Length of combo being processed
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	779 uint8_t comboLength = macro->guide[ pos ];
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	780
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	781 // 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	782 var_uint_t funcCount = 0;
190 7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	783
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	784 // 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	785 var_uint_t comboItem = pos + 1;
190 7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	786
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	787 // Iterate through the Result Combo
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	788 while ( funcCount < comboLength )
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	789 {
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	790 // 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	791 ResultGuide guide = (ResultGuide)(&macro->guide[ comboItem ]);
190 7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	792
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	793 // Do lookup on capability function
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	794 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	795
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	796 // Call capability
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	797 capability( record->state, record->stateType, &guide->args );
190 7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	798
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	799 // Increment counters
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	800 funcCount++;
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	801 comboItem += ResultGuideSize( (ResultGuide*)(&macro->guide[ comboItem ]) );
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
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	804 // Move to next item in the sequence
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	805 record->pos = comboItem;
190 7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	806
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	807 // If the ResultMacro is finished, remove
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	808 if ( macro->guide[ comboItem ] == 0 )
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	809 {
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	810 record->pos = 0;
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	811 return ResultMacroEval_Remove;
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	812 }
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	813
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	814 // Otherwise leave the macro in the list
190 7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	815 return ResultMacroEval_DoNothing;
125 8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	816 }
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	817
159 84beeecd2c94 Kishsaver is fully working with DPH! Jacob Alexander <haata@kiibohd.com> parents: 150 diff changeset	818
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	819 // Update pending trigger list
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	820 inline void Macro_updateTriggerMacroPendingList()
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	821 {
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	822 // 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	823 for ( uint8_t key = 0; key < macroTriggerListBufferSize; key++ )
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	824 {
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	825 // TODO LED States
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	826 // TODO Analog Switches
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	827 // 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	828 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	829 continue;
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	830
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	831 // Lookup Trigger List
202 1a68a9a04ad3 Adding variable width state variable width. Jacob Alexander <haata@kiibohd.com> parents: 201 diff changeset	832 nat_ptr_t *triggerList = Macro_layerLookup( macroTriggerListBuffer[ key ].scanCode );
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	833
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	834 // Number of Triggers in list
202 1a68a9a04ad3 Adding variable width state variable width. Jacob Alexander <haata@kiibohd.com> parents: 201 diff changeset	835 nat_ptr_t triggerListSize = triggerList[0];
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	836
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	837 // 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	838 // 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	839 for ( var_uint_t macro = 1; macro < triggerListSize + 1; macro++ )
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 // Lookup trigger macro index
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	842 var_uint_t triggerMacroIndex = triggerList[ macro ];
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	843
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	844 // Iterate over macroTriggerMacroPendingList to see if any macro in the scancode's
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	845 // triggerList needs to be added
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	846 var_uint_t pending = 0;
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	847 for ( ; pending < macroTriggerMacroPendingListSize; pending++ )
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	848 {
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	849 // 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	850 if ( macroTriggerMacroPendingList[ pending ] == triggerMacroIndex )
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	851 break;
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
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	854 // If the triggerMacroIndex (macro) was not found in the macroTriggerMacroPendingList
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	855 // Add it to the list
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	856 if ( pending == macroTriggerMacroPendingListSize )
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 macroTriggerMacroPendingList[ macroTriggerMacroPendingListSize++ ] = triggerMacroIndex;
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	859
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	860 // Reset macro position
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	861 TriggerMacroRecordList[ triggerMacroIndex ].pos = 0;
8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	862 TriggerMacroRecordList[ triggerMacroIndex ].state = TriggerMacro_Waiting;
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	863 }
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	864 }
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	865 }
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	866 }
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
185 68f3dc0cddd0 Macro cleanup. Jacob Alexander <haata@kiibohd.com> parents: 184 diff changeset	869 // Macro Procesing Loop
68f3dc0cddd0 Macro cleanup. Jacob Alexander <haata@kiibohd.com> parents: 184 diff changeset	870 // 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	871 inline void Macro_process()
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	872 {
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	873 // 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	874 if ( USBKeys_Sent != 0 )
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	875 return;
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	876
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	877 // 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	878 if ( macroPauseMode )
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	879 {
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	880 if ( macroStepCounter == 0 )
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	881 return;
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	882
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	883 // Proceed, decrementing the step counter
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	884 macroStepCounter--;
192 6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	885 dbug_print("Macro Step");
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	886 }
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	887
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	888 // Update pending trigger list, before processing TriggerMacros
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	889 Macro_updateTriggerMacroPendingList();
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	890
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	891 // Tail pointer for macroTriggerMacroPendingList
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	892 // 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	893 var_uint_t macroTriggerMacroPendingListTail = 0;
185 68f3dc0cddd0 Macro cleanup. Jacob Alexander <haata@kiibohd.com> parents: 184 diff changeset	894
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	895 // 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	896 for ( var_uint_t macro = 0; macro < macroTriggerMacroPendingListSize; macro++ )
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	897 {
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	898 switch ( Macro_evalTriggerMacro( macroTriggerMacroPendingList[ macro ] ) )
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	899 {
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	900 // Trigger Result Macro (purposely falling through)
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	901 case TriggerMacroEval_DoResult:
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	902 // Append ResultMacro to PendingList
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	903 Macro_appendResultMacroToPendingList( &TriggerMacroList[ macroTriggerMacroPendingList[ macro ] ] );
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	904
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	905 default:
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	906 macroTriggerMacroPendingList[ macroTriggerMacroPendingListTail++ ] = macroTriggerMacroPendingList[ macro ];
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	907 break;
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 // Trigger Result Macro and Remove (purposely falling through)
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	910 case TriggerMacroEval_DoResultAndRemove:
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	911 // Append ResultMacro to PendingList
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	912 Macro_appendResultMacroToPendingList( &TriggerMacroList[ macroTriggerMacroPendingList[ macro ] ] );
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	913
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	914 // Remove Macro from Pending List, nothing to do, removing by default
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	915 case TriggerMacroEval_Remove:
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	916 break;
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	917 }
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	918 }
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	919
190 7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	920 // Update the macroTriggerMacroPendingListSize with the tail pointer
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	921 macroTriggerMacroPendingListSize = macroTriggerMacroPendingListTail;
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	922
190 7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	923
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	924 // Tail pointer for macroResultMacroPendingList
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	925 // 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	926 var_uint_t macroResultMacroPendingListTail = 0;
190 7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	927
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	928 // 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	929 for ( var_uint_t macro = 0; macro < macroResultMacroPendingListSize; macro++ )
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	930 {
190 7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	931 switch ( Macro_evalResultMacro( macroResultMacroPendingList[ macro ] ) )
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	932 {
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	933 // Re-add macros to pending list
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	934 case ResultMacroEval_DoNothing:
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	935 default:
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	936 macroResultMacroPendingList[ macroResultMacroPendingListTail++ ] = macroResultMacroPendingList[ macro ];
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	937 break;
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	938
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	939 // 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	940 case ResultMacroEval_Remove:
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 }
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	943 }
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	944
190 7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	945 // Update the macroResultMacroPendingListSize with the tail pointer
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	946 macroResultMacroPendingListSize = macroResultMacroPendingListTail;
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	947
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	948 // Signal buffer that we've used it
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	949 Scan_finishedWithMacro( macroTriggerListBufferSize );
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	950
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	951 // Reset TriggerList buffer
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	952 macroTriggerListBufferSize = 0;
126 670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	953
670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	954 // 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	955 if ( macroDebugMode )
670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	956 {
670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	957 USBKeys_Modifiers = 0;
670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	958 USBKeys_Sent = 0;
670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	959 }
125 8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	960 }
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	961
185 68f3dc0cddd0 Macro cleanup. Jacob Alexander <haata@kiibohd.com> parents: 184 diff changeset	962
125 8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	963 inline void Macro_setup()
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 // Register Macro CLI dictionary
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	966 CLI_registerDictionary( macroCLIDict, macroCLIDictName );
126 670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	967
670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	968 // Disable Macro debug mode
670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	969 macroDebugMode = 0;
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	970
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	971 // Disable Macro pause flag
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	972 macroPauseMode = 0;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	973
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	974 // Set Macro step counter to zero
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	975 macroStepCounter = 0;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	976
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	977 // Make sure macro trigger buffer is empty
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	978 macroTriggerListBufferSize = 0;
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	979
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	980 // Initialize TriggerMacro states
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	981 for ( var_uint_t macro = 0; macro < TriggerMacroNum; macro++ )
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	982 {
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	983 TriggerMacroRecordList[ macro ].pos = 0;
8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	984 TriggerMacroRecordList[ macro ].state = TriggerMacro_Waiting;
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	985 }
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	986
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	987 // Initialize ResultMacro states
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	988 for ( var_uint_t macro = 0; macro < ResultMacroNum; macro++ )
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	989 {
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	990 ResultMacroRecordList[ macro ].pos = 0;
8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	991 ResultMacroRecordList[ macro ].state = 0;
8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	992 ResultMacroRecordList[ macro ].stateType = 0;
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	993 }
125 8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	994 }
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	995
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	996
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	997 // ----- CLI Command Functions -----
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 void cliFunc_capList( char* args )
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1000 {
180 ed56f7873645 Added capabilities list debug option Jacob Alexander <haata@kiibohd.com> parents: 179 diff changeset	1001 print( NL );
ed56f7873645 Added capabilities list debug option Jacob Alexander <haata@kiibohd.com> parents: 179 diff changeset	1002 info_msg("Capabilities List");
192 6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1003 printHex( CapabilitiesNum );
180 ed56f7873645 Added capabilities list debug option Jacob Alexander <haata@kiibohd.com> parents: 179 diff changeset	1004
ed56f7873645 Added capabilities list debug option Jacob Alexander <haata@kiibohd.com> parents: 179 diff changeset	1005 // 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	1006 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	1007 {
ed56f7873645 Added capabilities list debug option Jacob Alexander <haata@kiibohd.com> parents: 179 diff changeset	1008 print( NL "\t" );
ed56f7873645 Added capabilities list debug option Jacob Alexander <haata@kiibohd.com> parents: 179 diff changeset	1009 printHex( cap );
ed56f7873645 Added capabilities list debug option Jacob Alexander <haata@kiibohd.com> parents: 179 diff changeset	1010 print(" - ");
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 // 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	1013 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	1014 capability( 0xFF, 0xFF, 0 );
ed56f7873645 Added capabilities list debug option Jacob Alexander <haata@kiibohd.com> parents: 179 diff changeset	1015 }
125 8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1016 }
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1017
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1018 void cliFunc_capSelect( char* args )
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1019 {
126 670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1020 // 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	1021 char* curArgs;
126 670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1022 char* arg1Ptr;
182 880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1023 char* arg2Ptr = args;
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1024
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1025 // 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	1026 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	1027 var_uint_t cap = 0;
126 670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1028
182 880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1029 // 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	1030 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	1031 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	1032
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1033 // Process all args
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	1034 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	1035 {
182 880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1036 curArgs = arg2Ptr;
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1037 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	1038
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1039 // 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	1040 // Extra arguments are ignored
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1041 if ( *arg1Ptr == '\0' )
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1042 break;
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1043
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1044 // 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	1045 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	1046 {
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1047 // Keyboard Capability
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1048 case 'K':
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1049 // Determine capability index
195 58cfcb7bac88 Changing decToInt to numToInt (adds support for Hex number interpreter) Jacob Alexander <haata@kiibohd.com> parents: 192 diff changeset	1050 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	1051
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1052 // 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	1053 totalArgs += CapabilitiesList[ cap ].argCount;
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1054 continue;
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1055 }
126 670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1056
182 880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1057 // 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	1058 // 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	1059 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	1060
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1061 // 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	1062 if ( argSetCount == totalArgs )
126 670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1063 {
182 880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1064 // 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	1065 print( NL );
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1066 info_msg("K");
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1067 printInt8( cap );
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1068 print(" - ");
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1069 printHex( argSet[0] );
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1070 print(" - ");
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1071 printHex( argSet[1] );
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[2] );
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1074 print( "..." NL );
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1075
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1076 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	1077 capability( argSet[0], argSet[1], &argSet[2] );
126 670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1078 }
670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1079 }
125 8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1080 }
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1081
192 6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1082 void cliFunc_keyHold( char* args )
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1083 {
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1084 // Parse codes from arguments
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1085 char* curArgs;
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1086 char* arg1Ptr;
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1087 char* arg2Ptr = args;
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1088
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1089 // Process all args
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1090 for ( ;; )
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1091 {
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1092 curArgs = arg2Ptr;
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1093 CLI_argumentIsolation( curArgs, &arg1Ptr, &arg2Ptr );
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1094
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1095 // 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	1096 if ( *arg1Ptr == '\0' )
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1097 break;
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 // Ignore non-Scancode numbers
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1100 switch ( arg1Ptr[0] )
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1101 {
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1102 // Scancode
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1103 case 'S':
195 58cfcb7bac88 Changing decToInt to numToInt (adds support for Hex number interpreter) Jacob Alexander <haata@kiibohd.com> parents: 192 diff changeset	1104 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	1105 break;
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1106 }
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1107 }
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1108 }
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1109
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1110 void cliFunc_keyPress( char* args )
125 8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1111 {
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1112 // Parse codes from arguments
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1113 char* curArgs;
126 670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1114 char* arg1Ptr;
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1115 char* arg2Ptr = args;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1116
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1117 // Process all args
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1118 for ( ;; )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1119 {
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1120 curArgs = arg2Ptr;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1121 CLI_argumentIsolation( curArgs, &arg1Ptr, &arg2Ptr );
126 670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1122
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1123 // Stop processing args if no more are found
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1124 if ( *arg1Ptr == '\0' )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1125 break;
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 // Ignore non-Scancode numbers
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1128 switch ( arg1Ptr[0] )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1129 {
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1130 // Scancode
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1131 case 'S':
195 58cfcb7bac88 Changing decToInt to numToInt (adds support for Hex number interpreter) Jacob Alexander <haata@kiibohd.com> parents: 192 diff changeset	1132 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	1133 break;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1134 }
126 670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1135 }
125 8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1136 }
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1137
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1138 void cliFunc_keyRelease( char* args )
125 8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1139 {
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1140 // Parse codes from arguments
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1141 char* curArgs;
126 670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1142 char* arg1Ptr;
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1143 char* arg2Ptr = args;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1144
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1145 // Process all args
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1146 for ( ;; )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1147 {
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1148 curArgs = arg2Ptr;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1149 CLI_argumentIsolation( curArgs, &arg1Ptr, &arg2Ptr );
126 670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1150
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1151 // Stop processing args if no more are found
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1152 if ( *arg1Ptr == '\0' )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1153 break;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1154
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1155 // Ignore non-Scancode numbers
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1156 switch ( arg1Ptr[0] )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1157 {
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1158 // Scancode
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1159 case 'S':
195 58cfcb7bac88 Changing decToInt to numToInt (adds support for Hex number interpreter) Jacob Alexander <haata@kiibohd.com> parents: 192 diff changeset	1160 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	1161 break;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1162 }
126 670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1163 }
125 8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1164 }
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1165
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1166 void cliFunc_layerList( char* args )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1167 {
183 bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1168 print( NL );
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1169 info_msg("Layer List");
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1170
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1171 // 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	1172 for ( uint16_t layer = 0; layer < LayerNum; layer++ )
183 bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1173 {
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1174 print( NL "\t" );
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1175 printHex( layer );
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1176 print(" - ");
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 // Display layer name
192 6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1179 dPrint( (char*)LayerIndex[ layer ].name );
183 bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1180
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1181 // Default map
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1182 if ( layer == 0 )
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1183 print(" \033[1m(default)\033[0m");
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 // Layer State
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1186 print( NL "\t\t Layer State: " );
214 5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	1187 printHex( LayerState[ layer ] );
183 bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1188
214 5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	1189 // First -> Last Indices
5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	1190 print(" First -> Last Indices: ");
5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	1191 printHex( LayerIndex[ layer ].first );
5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	1192 print(" -> ");
5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	1193 printHex( LayerIndex[ layer ].last );
183 bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1194 }
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1195 }
126 670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1196
183 bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1197 void cliFunc_layerState( char* args )
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1198 {
183 bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1199 // Parse codes from arguments
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1200 char* curArgs;
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1201 char* arg1Ptr;
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1202 char* arg2Ptr = args;
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1203
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1204 uint8_t arg1 = 0;
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1205 uint8_t arg2 = 0;
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1206
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1207 // Process first two args
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1208 for ( uint8_t c = 0; c < 2; c++ )
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1209 {
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1210 curArgs = arg2Ptr;
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1211 CLI_argumentIsolation( curArgs, &arg1Ptr, &arg2Ptr );
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1212
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1213 // Stop processing args if no more are found
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1214 if ( *arg1Ptr == '\0' )
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1215 break;
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 switch ( c )
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1218 {
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1219 // First argument (e.g. L1)
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1220 case 0:
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1221 if ( arg1Ptr[0] != 'L' )
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1222 return;
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1223
195 58cfcb7bac88 Changing decToInt to numToInt (adds support for Hex number interpreter) Jacob Alexander <haata@kiibohd.com> parents: 192 diff changeset	1224 arg1 = (uint8_t)numToInt( &arg1Ptr[1] );
183 bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1225 break;
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1226 // Second argument (e.g. 4)
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1227 case 1:
195 58cfcb7bac88 Changing decToInt to numToInt (adds support for Hex number interpreter) Jacob Alexander <haata@kiibohd.com> parents: 192 diff changeset	1228 arg2 = (uint8_t)numToInt( arg1Ptr );
183 bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1229
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1230 // Display operation (to indicate that it worked)
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1231 print( NL );
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1232 info_msg("Setting Layer L");
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1233 printInt8( arg1 );
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1234 print(" to - ");
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1235 printHex( arg2 );
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1236
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1237 // Set the layer state
214 5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	1238 LayerState[ arg1 ] = arg2;
183 bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1239 break;
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 }
125 8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1242 }
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1243
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1244 void cliFunc_macroDebug( char* args )
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1245 {
126 670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1246 // Toggle macro debug mode
670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1247 macroDebugMode = macroDebugMode ? 0 : 1;
670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1248
670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1249 print( NL );
670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1250 info_msg("Macro Debug Mode: ");
670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1251 printInt8( macroDebugMode );
125 8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1252 }
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1253
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1254 void cliFunc_macroList( char* args )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1255 {
192 6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1256 // Show pending key events
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1257 print( NL );
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1258 info_msg("Pending Key Events: ");
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1259 printInt16( (uint16_t)macroTriggerListBufferSize );
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1260 print(" : ");
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1261 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	1262 {
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1263 printHex( macroTriggerListBuffer[ key ].scanCode );
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 }
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 // Show pending trigger macros
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1268 print( NL );
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1269 info_msg("Pending Trigger Macros: ");
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1270 printInt16( (uint16_t)macroTriggerMacroPendingListSize );
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1271 print(" : ");
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	1272 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	1273 {
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1274 printHex( macroTriggerMacroPendingList[ macro ] );
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1275 print(" ");
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1276 }
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 // Show pending result macros
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1279 print( NL );
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1280 info_msg("Pending Result Macros: ");
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1281 printInt16( (uint16_t)macroResultMacroPendingListSize );
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1282 print(" : ");
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	1283 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	1284 {
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1285 printHex( macroResultMacroPendingList[ macro ] );
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1286 print(" ");
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1287 }
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1288
181 80a44dcdafaf Adding macroList debug function Jacob Alexander <haata@kiibohd.com> parents: 180 diff changeset	1289 // Show available trigger macro indices
80a44dcdafaf Adding macroList debug function Jacob Alexander <haata@kiibohd.com> parents: 180 diff changeset	1290 print( NL );
80a44dcdafaf Adding macroList debug function Jacob Alexander <haata@kiibohd.com> parents: 180 diff changeset	1291 info_msg("Trigger Macros Range: T0 -> T");
80a44dcdafaf Adding macroList debug function Jacob Alexander <haata@kiibohd.com> parents: 180 diff changeset	1292 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	1293
80a44dcdafaf Adding macroList debug function Jacob Alexander <haata@kiibohd.com> parents: 180 diff changeset	1294 // Show available result macro indices
80a44dcdafaf Adding macroList debug function Jacob Alexander <haata@kiibohd.com> parents: 180 diff changeset	1295 print( NL );
80a44dcdafaf Adding macroList debug function Jacob Alexander <haata@kiibohd.com> parents: 180 diff changeset	1296 info_msg("Result Macros Range: R0 -> R");
80a44dcdafaf Adding macroList debug function Jacob Alexander <haata@kiibohd.com> parents: 180 diff changeset	1297 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	1298
80a44dcdafaf Adding macroList debug function Jacob Alexander <haata@kiibohd.com> parents: 180 diff changeset	1299 // Show Trigger to Result Macro Links
80a44dcdafaf Adding macroList debug function Jacob Alexander <haata@kiibohd.com> parents: 180 diff changeset	1300 print( NL );
80a44dcdafaf Adding macroList debug function Jacob Alexander <haata@kiibohd.com> parents: 180 diff changeset	1301 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	1302 for ( var_uint_t macro = 0; macro < TriggerMacroNum; macro++ )
181 80a44dcdafaf Adding macroList debug function Jacob Alexander <haata@kiibohd.com> parents: 180 diff changeset	1303 {
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 print("\tT");
80a44dcdafaf Adding macroList debug function Jacob Alexander <haata@kiibohd.com> parents: 180 diff changeset	1306 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	1307 print(" : R");
80a44dcdafaf Adding macroList debug function Jacob Alexander <haata@kiibohd.com> parents: 180 diff changeset	1308 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	1309 }
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1310 }
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1311
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1312 void cliFunc_macroProc( char* args )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1313 {
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1314 // Toggle macro pause mode
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1315 macroPauseMode = macroPauseMode ? 0 : 1;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1316
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1317 print( NL );
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1318 info_msg("Macro Processing Mode: ");
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1319 printInt8( macroPauseMode );
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
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	1322 void macroDebugShowTrigger( var_uint_t index )
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1323 {
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1324 // Only proceed if the macro exists
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1325 if ( index >= TriggerMacroNum )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1326 return;
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 // Trigger Macro Show
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	1329 const TriggerMacro *macro = &TriggerMacroList[ index ];
8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	1330 TriggerMacroRecord *record = &TriggerMacroRecordList[ index ];
179 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 print( NL );
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1333 info_msg("Trigger Macro Index: ");
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1334 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	1335 print( NL );
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1336
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1337 // 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	1338 var_uint_t pos = 0;
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1339 uint8_t comboLength = macro->guide[ pos ];
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 // Iterate through and interpret the guide
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1342 while ( comboLength != 0 )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1343 {
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1344 // Initial position of the combo
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	1345 var_uint_t comboPos = ++pos;
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1346
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1347 // Iterate through the combo
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1348 while ( pos < comboLength * TriggerGuideSize + comboPos )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1349 {
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1350 // Assign TriggerGuide element (key type, state and scancode)
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1351 TriggerGuide guide = (TriggerGuide)(&macro->guide[ pos ]);
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1352
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1353 // Display guide information about trigger key
184 f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	1354 printHex( guide->scanCode );
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1355 print("\|");
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1356 printHex( guide->type );
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1357 print("\|");
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1358 printHex( guide->state );
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1359
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1360 // Increment position
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1361 pos += TriggerGuideSize;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1362
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1363 // 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	1364 if ( pos < comboLength * TriggerGuideSize + comboPos )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1365 print("+");
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
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1368 // Read the next comboLength
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1369 comboLength = macro->guide[ pos ];
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 // 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	1372 if ( comboLength != 0 )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1373 print(";");
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
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1376 // Display current position
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1377 print( NL "Position: " );
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	1378 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	1379
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1380 // Display result macro index
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1381 print( NL "Result Macro Index: " );
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1382 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	1383
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	1384 // Display trigger macro state
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	1385 print( NL "Trigger Macro State: " );
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	1386 switch ( record->state )
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 case TriggerMacro_Press: print("Press"); break;
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	1389 case TriggerMacro_Release: print("Release"); break;
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	1390 case TriggerMacro_Waiting: print("Waiting"); break;
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	1391 }
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1392 }
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1393
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	1394 void macroDebugShowResult( var_uint_t index )
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1395 {
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1396 // Only proceed if the macro exists
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1397 if ( index >= ResultMacroNum )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1398 return;
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 // Trigger Macro Show
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	1401 const ResultMacro *macro = &ResultMacroList[ index ];
8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	1402 ResultMacroRecord *record = &ResultMacroRecordList[ index ];
179 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 print( NL );
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1405 info_msg("Result Macro Index: ");
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1406 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	1407 print( NL );
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1408
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1409 // 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	1410 var_uint_t pos = 0;
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1411 uint8_t comboLength = macro->guide[ pos++ ];
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 // Iterate through and interpret the guide
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1414 while ( comboLength != 0 )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1415 {
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1416 // 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	1417 var_uint_t funcCount = 0;
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1418
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1419 // Iterate through the combo
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1420 while ( funcCount < comboLength )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1421 {
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1422 // Assign TriggerGuide element (key type, state and scancode)
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1423 ResultGuide guide = (ResultGuide)(&macro->guide[ pos ]);
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1424
180 ed56f7873645 Added capabilities list debug option Jacob Alexander <haata@kiibohd.com> parents: 179 diff changeset	1425 // Display Function Index
ed56f7873645 Added capabilities list debug option Jacob Alexander <haata@kiibohd.com> parents: 179 diff changeset	1426 printHex( guide->index );
ed56f7873645 Added capabilities list debug option Jacob Alexander <haata@kiibohd.com> parents: 179 diff changeset	1427 print("\|");
ed56f7873645 Added capabilities list debug option Jacob Alexander <haata@kiibohd.com> parents: 179 diff changeset	1428
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1429 // Display Function Ptr Address
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	1430 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	1431 print("\|");
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1432
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1433 // 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	1434 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	1435 capability( 0xFF, 0xFF, 0 );
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 Argument(s)
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1438 print("(");
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	1439 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	1440 {
180 ed56f7873645 Added capabilities list debug option Jacob Alexander <haata@kiibohd.com> parents: 179 diff changeset	1441 // Arguments are only 8 bit values
ed56f7873645 Added capabilities list debug option Jacob Alexander <haata@kiibohd.com> parents: 179 diff changeset	1442 printHex( (&guide->args)[ arg ] );
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1443
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1444 // 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	1445 if ( arg + 1 < CapabilitiesList[ guide->index ].argCount )
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1446 print(",");
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 print(")");
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1449
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1450 // Increment position
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1451 pos += ResultGuideSize( guide );
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1452
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1453 // Increment function count
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1454 funcCount++;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1455
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1456 // 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	1457 if ( funcCount < comboLength )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1458 print("+");
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
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1461 // Read the next comboLength
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1462 comboLength = macro->guide[ pos++ ];
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 // 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	1465 if ( comboLength != 0 )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1466 print(";");
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
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1469 // Display current position
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1470 print( NL "Position: " );
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	1471 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	1472
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1473 // Display final trigger state/type
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1474 print( NL "Final Trigger State (State/Type): " );
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	1475 printHex( record->state );
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1476 print("/");
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	1477 printHex( record->stateType );
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1478 }
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1479
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1480 void cliFunc_macroShow( char* args )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1481 {
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1482 // Parse codes from arguments
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1483 char* curArgs;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1484 char* arg1Ptr;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1485 char* arg2Ptr = args;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1486
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1487 // Process all args
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1488 for ( ;; )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1489 {
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1490 curArgs = arg2Ptr;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1491 CLI_argumentIsolation( curArgs, &arg1Ptr, &arg2Ptr );
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1492
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1493 // Stop processing args if no more are found
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1494 if ( *arg1Ptr == '\0' )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1495 break;
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 // Ignore invalid codes
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1498 switch ( arg1Ptr[0] )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1499 {
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1500 // Indexed Trigger Macro
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1501 case 'T':
195 58cfcb7bac88 Changing decToInt to numToInt (adds support for Hex number interpreter) Jacob Alexander <haata@kiibohd.com> parents: 192 diff changeset	1502 macroDebugShowTrigger( numToInt( &arg1Ptr[1] ) );
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1503 break;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1504 // Indexed Result Macro
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1505 case 'R':
195 58cfcb7bac88 Changing decToInt to numToInt (adds support for Hex number interpreter) Jacob Alexander <haata@kiibohd.com> parents: 192 diff changeset	1506 macroDebugShowResult( 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 }
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1509 }
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1510 }
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1511
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1512 void cliFunc_macroStep( char* args )
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 // Parse number from argument
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1515 // NOTE: Only first argument is used
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1516 char* arg1Ptr;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1517 char* arg2Ptr;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1518 CLI_argumentIsolation( args, &arg1Ptr, &arg2Ptr );
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1519
192 6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1520 // 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	1521 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	1522
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1523 if ( count == 0 )
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1524 count = 1;
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1525
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1526 // 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	1527 macroStepCounter = count;
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1528 }
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1529

Mercurial > louis > kiibohd-controller

annotate Macro/PartialMap/macro.c @ 239:2a4c99da1276