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

annotate Macro/PartialMap/macro.c @ 361:7c6ac7b88cda

Working support for Interconnect - Supports up to 255 slave nodes (you'll run into ScanCode limitations before then) - Requires most recent kll compiler update - Additional debugging output and stats counters - Noise and parity checking - Fixed TxFIFO issue when sending buffers larger than the FIFO - Cleaned up defaultMap.kll - Added ScanCode caching (reduces interconnect traffic significantly) - Interconnect module code is conditionally compiled into PartialMap module if required

author	Jacob Alexander <haata@kiibohd.com>
date	Sat, 15 Aug 2015 21:53:59 -0700
parents	dbefb68411e1
children	e4be15c39cce

rev	line source
297 c86eb7d0a693 Fixing releasing Function key and holding layered key Jacob Alexander <haata@kiibohd.com> parents: 271 diff changeset	1 /* Copyright (C) 2014-2015 by Jacob Alexander
125 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
360 dbefb68411e1 Initial UARTConnect scancode support Jacob Alexander <haata@kiibohd.com> parents: 345 diff changeset	32 // Connect Includes
dbefb68411e1 Initial UARTConnect scancode support Jacob Alexander <haata@kiibohd.com> parents: 345 diff changeset	33 #if defined(ConnectEnabled_define)
dbefb68411e1 Initial UARTConnect scancode support Jacob Alexander <haata@kiibohd.com> parents: 345 diff changeset	34 #include <connect_scan.h>
dbefb68411e1 Initial UARTConnect scancode support Jacob Alexander <haata@kiibohd.com> parents: 345 diff changeset	35 #endif
dbefb68411e1 Initial UARTConnect scancode support Jacob Alexander <haata@kiibohd.com> parents: 345 diff changeset	36
125 8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	37 // Local Includes
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	38 #include "macro.h"
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	39
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	40
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	41
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	42 // ----- Function Declarations -----
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	43
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	44 void cliFunc_capList ( char* args );
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	45 void cliFunc_capSelect ( char* args );
192 6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	46 void cliFunc_keyHold ( char* args );
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	47 void cliFunc_keyPress ( char* args );
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	48 void cliFunc_keyRelease( char* args );
344 f04450004adf Adding layerDebug cli command Jacob Alexander <haata@kiibohd.com> parents: 307 diff changeset	49 void cliFunc_layerDebug( char* args );
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	50 void cliFunc_layerList ( char* args );
183 bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	51 void cliFunc_layerState( char* args );
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	52 void cliFunc_macroDebug( char* args );
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	53 void cliFunc_macroList ( char* args );
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	54 void cliFunc_macroProc ( char* args );
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	55 void cliFunc_macroShow ( char* args );
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	56 void cliFunc_macroStep ( char* args );
125 8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	57
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	58
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	59
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	60 // ----- Enums -----
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	61
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	62 // 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	63 typedef enum TriggerMacroVote {
197 1ebb6fb5f74f All basic macros tested and working! Jacob Alexander <haata@kiibohd.com> parents: 196 diff changeset	64 TriggerMacroVote_Release = 0x10, // Correct key
1ebb6fb5f74f All basic macros tested and working! Jacob Alexander <haata@kiibohd.com> parents: 196 diff changeset	65 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	66 TriggerMacroVote_Pass = 0x8, // Correct key
1ebb6fb5f74f All basic macros tested and working! Jacob Alexander <haata@kiibohd.com> parents: 196 diff changeset	67 TriggerMacroVote_DoNothingRelease = 0x4, // Incorrect key
1ebb6fb5f74f All basic macros tested and working! Jacob Alexander <haata@kiibohd.com> parents: 196 diff changeset	68 TriggerMacroVote_DoNothing = 0x2, // Incorrect key
1ebb6fb5f74f All basic macros tested and working! Jacob Alexander <haata@kiibohd.com> parents: 196 diff changeset	69 TriggerMacroVote_Fail = 0x1, // Incorrect key
1ebb6fb5f74f All basic macros tested and working! Jacob Alexander <haata@kiibohd.com> parents: 196 diff changeset	70 TriggerMacroVote_Invalid = 0x0, // Invalid state
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	71 } TriggerMacroVote;
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	72
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	73 typedef enum TriggerMacroEval {
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	74 TriggerMacroEval_DoNothing,
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	75 TriggerMacroEval_DoResult,
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	76 TriggerMacroEval_DoResultAndRemove,
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	77 TriggerMacroEval_Remove,
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	78 } TriggerMacroEval;
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	79
190 7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	80 typedef enum ResultMacroEval {
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	81 ResultMacroEval_DoNothing,
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	82 ResultMacroEval_Remove,
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	83 } ResultMacroEval;
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	84
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	85
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	86
125 8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	87 // ----- Variables -----
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	88
132 e08d7b586ea3 Adding analog.c lib from teensyduino. Jacob Alexander <haata@kiibohd.com> parents: 126 diff changeset	89 // Macro Module command dictionary
239 2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 217 diff changeset	90 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	91 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	92 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	93 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	94 CLIDict_Entry( keyRelease, "Send key-release event to macro module. Duplicates have undefined behaviour." NL "\t\t\033[35mS10\033[0m Scancode 0x0A" );
344 f04450004adf Adding layerDebug cli command Jacob Alexander <haata@kiibohd.com> parents: 307 diff changeset	95 CLIDict_Entry( layerDebug, "Layer debug mode. Shows layer stack and any changes." );
239 2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 217 diff changeset	96 CLIDict_Entry( layerList, "List available layers." );
2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 217 diff changeset	97 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	98 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	99 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	100 CLIDict_Entry( macroProc, "Pause/Resume macro processing." );
2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 217 diff changeset	101 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	102 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	103
2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 217 diff changeset	104 CLIDict_Def( macroCLIDict, "Macro Module Commands" ) = {
2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 217 diff changeset	105 CLIDict_Item( capList ),
2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 217 diff changeset	106 CLIDict_Item( capSelect ),
2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 217 diff changeset	107 CLIDict_Item( keyHold ),
2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 217 diff changeset	108 CLIDict_Item( keyPress ),
2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 217 diff changeset	109 CLIDict_Item( keyRelease ),
344 f04450004adf Adding layerDebug cli command Jacob Alexander <haata@kiibohd.com> parents: 307 diff changeset	110 CLIDict_Item( layerDebug ),
239 2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 217 diff changeset	111 CLIDict_Item( layerList ),
2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 217 diff changeset	112 CLIDict_Item( layerState ),
2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 217 diff changeset	113 CLIDict_Item( macroDebug ),
2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 217 diff changeset	114 CLIDict_Item( macroList ),
2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 217 diff changeset	115 CLIDict_Item( macroProc ),
2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 217 diff changeset	116 CLIDict_Item( macroShow ),
2a4c99da1276 HUGE AVR RAM optimization (~28%). Jacob Alexander <haata@kiibohd.com> parents: 217 diff changeset	117 CLIDict_Item( macroStep ),
125 8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	118 { 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	119 };
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	120
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	121
344 f04450004adf Adding layerDebug cli command Jacob Alexander <haata@kiibohd.com> parents: 307 diff changeset	122 // Layer debug flag - If set, displays any changes to layers and the full layer stack on change
f04450004adf Adding layerDebug cli command Jacob Alexander <haata@kiibohd.com> parents: 307 diff changeset	123 uint8_t layerDebugMode = 0;
f04450004adf Adding layerDebug cli command Jacob Alexander <haata@kiibohd.com> parents: 307 diff changeset	124
126 670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	125 // 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	126 uint8_t macroDebugMode = 0;
670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	127
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	128 // 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	129 uint8_t macroPauseMode = 0;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	130
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	131 // 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	132 uint16_t macroStepCounter = 0;
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	133
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	134
297 c86eb7d0a693 Fixing releasing Function key and holding layered key Jacob Alexander <haata@kiibohd.com> parents: 271 diff changeset	135 // Key Trigger List Buffer and Layer Cache
c86eb7d0a693 Fixing releasing Function key and holding layered key Jacob Alexander <haata@kiibohd.com> parents: 271 diff changeset	136 // The layer cache is set on press only, hold and release events refer to the value set on press
184 f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	137 TriggerGuide macroTriggerListBuffer[ MaxScanCode ];
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	138 uint8_t macroTriggerListBufferSize = 0;
297 c86eb7d0a693 Fixing releasing Function key and holding layered key Jacob Alexander <haata@kiibohd.com> parents: 271 diff changeset	139 var_uint_t macroTriggerListLayerCache[ MaxScanCode ];
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	140
184 f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	141 // Pending Trigger Macro Index List
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	142 // * 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	143 // 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	144 // 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	145 // 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	146 uint16_t macroTriggerMacroPendingList[ TriggerMacroNum ] = { 0 };
b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	147 uint16_t macroTriggerMacroPendingListSize = 0;
184 f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	148
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	149 // Layer Index Stack
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	150 // * 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	151 uint16_t macroLayerIndexStack[ LayerNum + 1 ] = { 0 };
b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	152 uint16_t macroLayerIndexStackSize = 0;
184 f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	153
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	154 // Pending Result Macro Index List
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	155 // * 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	156 uint16_t macroResultMacroPendingList[ ResultMacroNum ] = { 0 };
b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	157 uint16_t macroResultMacroPendingListSize = 0;
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	158
361 7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	159 // Interconnect ScanCode Cache
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	160 #if defined(ConnectEnabled_define)
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	161 // TODO This can be shrunk by the size of the max node 0 ScanCode
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	162 TriggerGuide macroInterconnectCache[ MaxScanCode ];
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	163 uint8_t macroInterconnectCacheSize = 0;
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	164 #endif
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	165
126 670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	166
125 8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	167
191 3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	168 // ----- Capabilities -----
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	169
199 559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	170 // Sets the given layer with the specified layerState
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	171 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	172 {
241 9f62492034c7 Fixing bug that locks up the keyboard if shifting to a layer that doesn't exist. Jacob Alexander <haata@kiibohd.com> parents: 239 diff changeset	173 // Ignore if layer does not exist
9f62492034c7 Fixing bug that locks up the keyboard if shifting to a layer that doesn't exist. Jacob Alexander <haata@kiibohd.com> parents: 239 diff changeset	174 if ( layer >= LayerNum )
9f62492034c7 Fixing bug that locks up the keyboard if shifting to a layer that doesn't exist. Jacob Alexander <haata@kiibohd.com> parents: 239 diff changeset	175 return;
9f62492034c7 Fixing bug that locks up the keyboard if shifting to a layer that doesn't exist. Jacob Alexander <haata@kiibohd.com> parents: 239 diff changeset	176
191 3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	177 // Is layer in the LayerIndexStack?
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	178 uint8_t inLayerIndexStack = 0;
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	179 uint16_t stackItem = 0;
191 3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	180 while ( stackItem < macroLayerIndexStackSize )
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	181 {
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	182 // 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	183 if ( macroLayerIndexStack[ stackItem ] == layer )
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	184 {
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	185 inLayerIndexStack = 1;
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	186 break;
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	187 }
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	188
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	189 // Increment to next item
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	190 stackItem++;
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	191 }
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	192
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	193 // Toggle Layer State Byte
214 5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	194 if ( LayerState[ layer ] & layerState )
191 3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	195 {
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	196 // Unset
214 5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	197 LayerState[ layer ] &= ~layerState;
191 3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	198 }
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	199 else
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 // Set
214 5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	202 LayerState[ layer ] \|= layerState;
191 3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	203 }
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	204
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	205 // 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	206 if ( !inLayerIndexStack )
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	207 {
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	208 macroLayerIndexStack[ macroLayerIndexStackSize++ ] = layer;
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	209 }
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	210
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	211 // 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	212 if ( LayerState[ layer ] == 0x00 && inLayerIndexStack )
191 3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	213 {
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	214 // Remove the layer from the LayerIndexStack
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	215 // 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	216 while ( stackItem < macroLayerIndexStackSize )
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	217 {
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	218 macroLayerIndexStack[ stackItem ] = macroLayerIndexStack[ stackItem + 1 ];
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	219 stackItem++;
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	220 }
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	221
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	222 // Reduce LayerIndexStack size
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	223 macroLayerIndexStackSize--;
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	224 }
344 f04450004adf Adding layerDebug cli command Jacob Alexander <haata@kiibohd.com> parents: 307 diff changeset	225
f04450004adf Adding layerDebug cli command Jacob Alexander <haata@kiibohd.com> parents: 307 diff changeset	226 // Layer Debug Mode
f04450004adf Adding layerDebug cli command Jacob Alexander <haata@kiibohd.com> parents: 307 diff changeset	227 if ( layerDebugMode )
f04450004adf Adding layerDebug cli command Jacob Alexander <haata@kiibohd.com> parents: 307 diff changeset	228 {
f04450004adf Adding layerDebug cli command Jacob Alexander <haata@kiibohd.com> parents: 307 diff changeset	229 dbug_msg("Layer ");
f04450004adf Adding layerDebug cli command Jacob Alexander <haata@kiibohd.com> parents: 307 diff changeset	230
f04450004adf Adding layerDebug cli command Jacob Alexander <haata@kiibohd.com> parents: 307 diff changeset	231 // Iterate over each of the layers displaying the state as a hex value
f04450004adf Adding layerDebug cli command Jacob Alexander <haata@kiibohd.com> parents: 307 diff changeset	232 for ( uint16_t index = 0; index < LayerNum; index++ )
f04450004adf Adding layerDebug cli command Jacob Alexander <haata@kiibohd.com> parents: 307 diff changeset	233 {
f04450004adf Adding layerDebug cli command Jacob Alexander <haata@kiibohd.com> parents: 307 diff changeset	234 printHex_op( LayerState[ index ], 0 );
f04450004adf Adding layerDebug cli command Jacob Alexander <haata@kiibohd.com> parents: 307 diff changeset	235 }
f04450004adf Adding layerDebug cli command Jacob Alexander <haata@kiibohd.com> parents: 307 diff changeset	236
f04450004adf Adding layerDebug cli command Jacob Alexander <haata@kiibohd.com> parents: 307 diff changeset	237 // Always show the default layer (it's always 0)
f04450004adf Adding layerDebug cli command Jacob Alexander <haata@kiibohd.com> parents: 307 diff changeset	238 print(" 0");
f04450004adf Adding layerDebug cli command Jacob Alexander <haata@kiibohd.com> parents: 307 diff changeset	239
f04450004adf Adding layerDebug cli command Jacob Alexander <haata@kiibohd.com> parents: 307 diff changeset	240 // Iterate over the layer stack starting from the bottom of the stack
345 2bcf6800b851 Fixing order of layer debug stack display Jacob Alexander <haata@kiibohd.com> parents: 344 diff changeset	241 for ( uint16_t index = macroLayerIndexStackSize; index > 0; index-- )
344 f04450004adf Adding layerDebug cli command Jacob Alexander <haata@kiibohd.com> parents: 307 diff changeset	242 {
f04450004adf Adding layerDebug cli command Jacob Alexander <haata@kiibohd.com> parents: 307 diff changeset	243 print(":");
345 2bcf6800b851 Fixing order of layer debug stack display Jacob Alexander <haata@kiibohd.com> parents: 344 diff changeset	244 printHex_op( macroLayerIndexStack[ index - 1 ], 0 );
344 f04450004adf Adding layerDebug cli command Jacob Alexander <haata@kiibohd.com> parents: 307 diff changeset	245 }
f04450004adf Adding layerDebug cli command Jacob Alexander <haata@kiibohd.com> parents: 307 diff changeset	246
f04450004adf Adding layerDebug cli command Jacob Alexander <haata@kiibohd.com> parents: 307 diff changeset	247 print( NL );
f04450004adf Adding layerDebug cli command Jacob Alexander <haata@kiibohd.com> parents: 307 diff changeset	248 }
191 3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	249 }
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	250
199 559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	251 // Modifies the specified Layer control byte
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	252 // Argument #1: Layer Index -> uint16_t
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	253 // Argument #2: Layer State -> uint8_t
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	254 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	255 {
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	256 // Display capability name
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	257 if ( stateType == 0xFF && state == 0xFF )
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	258 {
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	259 print("Macro_layerState(layerIndex,layerState)");
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	260 return;
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	261 }
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	262
201 326f75709d10 Fixing release state for keys Jacob Alexander <jacob.alexander@virtualinstruments.com> parents: 199 diff changeset	263 // Only use capability on press or release
326f75709d10 Fixing release state for keys Jacob Alexander <jacob.alexander@virtualinstruments.com> parents: 199 diff changeset	264 // TODO Analog
326f75709d10 Fixing release state for keys Jacob Alexander <jacob.alexander@virtualinstruments.com> parents: 199 diff changeset	265 // 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	266 if ( stateType == 0x00 && state == 0x02 ) // Hold condition
326f75709d10 Fixing release state for keys Jacob Alexander <jacob.alexander@virtualinstruments.com> parents: 199 diff changeset	267 return;
326f75709d10 Fixing release state for keys Jacob Alexander <jacob.alexander@virtualinstruments.com> parents: 199 diff changeset	268
199 559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	269 // Get layer index from arguments
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	270 // 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	271 uint16_t layer = (uint16_t)(&args[0]);
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	272
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	273 // Get layer toggle byte
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	274 uint8_t layerState = args[ sizeof(uint16_t) ];
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	275
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	276 Macro_layerState( state, stateType, layer, layerState );
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
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 // Latches given layer
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	281 // Argument #1: Layer Index -> uint16_t
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	282 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	283 {
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	284 // Display capability name
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	285 if ( stateType == 0xFF && state == 0xFF )
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	286 {
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	287 print("Macro_layerLatch(layerIndex)");
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	288 return;
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	289 }
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	290
201 326f75709d10 Fixing release state for keys Jacob Alexander <jacob.alexander@virtualinstruments.com> parents: 199 diff changeset	291 // Only use capability on press
326f75709d10 Fixing release state for keys Jacob Alexander <jacob.alexander@virtualinstruments.com> parents: 199 diff changeset	292 // TODO Analog
253 e79f2b9c39cf Fixing layer latch capability. Jacob Alexander <haata@kiibohd.com> parents: 241 diff changeset	293 if ( stateType == 0x00 && state != 0x03 ) // Only on release
201 326f75709d10 Fixing release state for keys Jacob Alexander <jacob.alexander@virtualinstruments.com> parents: 199 diff changeset	294 return;
326f75709d10 Fixing release state for keys Jacob Alexander <jacob.alexander@virtualinstruments.com> parents: 199 diff changeset	295
199 559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	296 // Get layer index from arguments
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	297 // 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	298 uint16_t layer = (uint16_t)(&args[0]);
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	299
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	300 Macro_layerState( state, stateType, layer, 0x02 );
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
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 // Locks given layer
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	305 // Argument #1: Layer Index -> uint16_t
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	306 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	307 {
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	308 // Display capability name
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	309 if ( stateType == 0xFF && state == 0xFF )
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	310 {
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	311 print("Macro_layerLock(layerIndex)");
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	312 return;
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	313 }
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	314
201 326f75709d10 Fixing release state for keys Jacob Alexander <jacob.alexander@virtualinstruments.com> parents: 199 diff changeset	315 // Only use capability on press
326f75709d10 Fixing release state for keys Jacob Alexander <jacob.alexander@virtualinstruments.com> parents: 199 diff changeset	316 // TODO Analog
326f75709d10 Fixing release state for keys Jacob Alexander <jacob.alexander@virtualinstruments.com> parents: 199 diff changeset	317 // 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	318 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	319 return;
326f75709d10 Fixing release state for keys Jacob Alexander <jacob.alexander@virtualinstruments.com> parents: 199 diff changeset	320
199 559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	321 // Get layer index from arguments
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	322 // 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	323 uint16_t layer = (uint16_t)(&args[0]);
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	324
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	325 Macro_layerState( state, stateType, layer, 0x04 );
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	326 }
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	327
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	328
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	329 // Shifts given layer
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	330 // Argument #1: Layer Index -> uint16_t
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	331 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	332 {
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	333 // Display capability name
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	334 if ( stateType == 0xFF && state == 0xFF )
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	335 {
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	336 print("Macro_layerShift(layerIndex)");
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	337 return;
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	338 }
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	339
201 326f75709d10 Fixing release state for keys Jacob Alexander <jacob.alexander@virtualinstruments.com> parents: 199 diff changeset	340 // Only use capability on press or release
326f75709d10 Fixing release state for keys Jacob Alexander <jacob.alexander@virtualinstruments.com> parents: 199 diff changeset	341 // TODO Analog
326f75709d10 Fixing release state for keys Jacob Alexander <jacob.alexander@virtualinstruments.com> parents: 199 diff changeset	342 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	343 return;
326f75709d10 Fixing release state for keys Jacob Alexander <jacob.alexander@virtualinstruments.com> parents: 199 diff changeset	344
199 559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	345 // Get layer index from arguments
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	346 // 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	347 uint16_t layer = (uint16_t)(&args[0]);
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	348
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	349 Macro_layerState( state, stateType, layer, 0x01 );
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	350 }
559a467f6d57 Preparing for kll compiler usage Jacob Alexander <haata@kiibohd.com> parents: 197 diff changeset	351
191 3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	352
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	353
125 8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	354 // ----- Functions -----
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	355
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	356 // 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	357 // NOTE: Calling function must handle the NULL pointer case
297 c86eb7d0a693 Fixing releasing Function key and holding layered key Jacob Alexander <haata@kiibohd.com> parents: 271 diff changeset	358 nat_ptr_t Macro_layerLookup( TriggerGuide guide, uint8_t latch_expire )
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	359 {
297 c86eb7d0a693 Fixing releasing Function key and holding layered key Jacob Alexander <haata@kiibohd.com> parents: 271 diff changeset	360 uint8_t scanCode = guide->scanCode;
c86eb7d0a693 Fixing releasing Function key and holding layered key Jacob Alexander <haata@kiibohd.com> parents: 271 diff changeset	361
c86eb7d0a693 Fixing releasing Function key and holding layered key Jacob Alexander <haata@kiibohd.com> parents: 271 diff changeset	362 // TODO Analog
c86eb7d0a693 Fixing releasing Function key and holding layered key Jacob Alexander <haata@kiibohd.com> parents: 271 diff changeset	363 // If a normal key, and not pressed, do a layer cache lookup
c86eb7d0a693 Fixing releasing Function key and holding layered key Jacob Alexander <haata@kiibohd.com> parents: 271 diff changeset	364 if ( guide->type == 0x00 && guide->state != 0x01 )
c86eb7d0a693 Fixing releasing Function key and holding layered key Jacob Alexander <haata@kiibohd.com> parents: 271 diff changeset	365 {
c86eb7d0a693 Fixing releasing Function key and holding layered key Jacob Alexander <haata@kiibohd.com> parents: 271 diff changeset	366 // Cached layer
c86eb7d0a693 Fixing releasing Function key and holding layered key Jacob Alexander <haata@kiibohd.com> parents: 271 diff changeset	367 var_uint_t cachedLayer = macroTriggerListLayerCache[ scanCode ];
c86eb7d0a693 Fixing releasing Function key and holding layered key Jacob Alexander <haata@kiibohd.com> parents: 271 diff changeset	368
c86eb7d0a693 Fixing releasing Function key and holding layered key Jacob Alexander <haata@kiibohd.com> parents: 271 diff changeset	369 // Lookup map, then layer
c86eb7d0a693 Fixing releasing Function key and holding layered key Jacob Alexander <haata@kiibohd.com> parents: 271 diff changeset	370 nat_ptr_t map = (nat_ptr_t)LayerIndex[ cachedLayer ].triggerMap;
c86eb7d0a693 Fixing releasing Function key and holding layered key Jacob Alexander <haata@kiibohd.com> parents: 271 diff changeset	371 const Layer *layer = &LayerIndex[ cachedLayer ];
c86eb7d0a693 Fixing releasing Function key and holding layered key Jacob Alexander <haata@kiibohd.com> parents: 271 diff changeset	372
c86eb7d0a693 Fixing releasing Function key and holding layered key Jacob Alexander <haata@kiibohd.com> parents: 271 diff changeset	373 return map[ scanCode - layer->first ];
c86eb7d0a693 Fixing releasing Function key and holding layered key Jacob Alexander <haata@kiibohd.com> parents: 271 diff changeset	374 }
c86eb7d0a693 Fixing releasing Function key and holding layered key Jacob Alexander <haata@kiibohd.com> parents: 271 diff changeset	375
184 f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	376 // 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	377 for ( uint16_t layerIndex = 0; layerIndex < macroLayerIndexStackSize; layerIndex++ )
184 f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	378 {
191 3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	379 // Lookup Layer
214 5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	380 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	381
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	382 // 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	383 // XXX Regardless of whether a key is found, the latch is removed on first lookup
253 e79f2b9c39cf Fixing layer latch capability. Jacob Alexander <haata@kiibohd.com> parents: 241 diff changeset	384 uint8_t latch = LayerState[ macroLayerIndexStack[ layerIndex ] ] & 0x02;
e79f2b9c39cf Fixing layer latch capability. Jacob Alexander <haata@kiibohd.com> parents: 241 diff changeset	385 if ( latch && latch_expire )
191 3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	386 {
253 e79f2b9c39cf Fixing layer latch capability. Jacob Alexander <haata@kiibohd.com> parents: 241 diff changeset	387 Macro_layerState( 0, 0, macroLayerIndexStack[ layerIndex ], 0x02 );
191 3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	388 }
184 f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	389
191 3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	390 // 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	391 // XOR each of the state bits
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	392 // 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	393 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	394 {
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	395 // Lookup layer
202 1a68a9a04ad3 Adding variable width state variable width. Jacob Alexander <haata@kiibohd.com> parents: 201 diff changeset	396 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	397
3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	398 // Determine if layer has key defined
214 5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	399 // 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	400 if ( map != 0
215 00a8c7f491d4 Fixing first and last element bug for layers. Jacob Alexander <haata@kiibohd.com> parents: 214 diff changeset	401 && scanCode <= layer->last
00a8c7f491d4 Fixing first and last element bug for layers. Jacob Alexander <haata@kiibohd.com> parents: 214 diff changeset	402 && scanCode >= layer->first
214 5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	403 && *map[ scanCode - layer->first ] != 0 )
5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	404 {
297 c86eb7d0a693 Fixing releasing Function key and holding layered key Jacob Alexander <haata@kiibohd.com> parents: 271 diff changeset	405 // Set the layer cache
c86eb7d0a693 Fixing releasing Function key and holding layered key Jacob Alexander <haata@kiibohd.com> parents: 271 diff changeset	406 macroTriggerListLayerCache[ scanCode ] = macroLayerIndexStack[ layerIndex ];
c86eb7d0a693 Fixing releasing Function key and holding layered key Jacob Alexander <haata@kiibohd.com> parents: 271 diff changeset	407
214 5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	408 return map[ scanCode - layer->first ];
5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	409 }
191 3404be65670b Adding generic layerToggle and USB Key Output capabilities. Jacob Alexander <haata@kiibohd.com> parents: 190 diff changeset	410 }
184 f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	411 }
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	412
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	413 // Do lookup on default layer
202 1a68a9a04ad3 Adding variable width state variable width. Jacob Alexander <haata@kiibohd.com> parents: 201 diff changeset	414 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	415
214 5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	416 // Lookup default layer
216 738445f38639 DPH controller now working with the kishsaver and macros Jacob Alexander <haata@kiibohd.com> parents: 215 diff changeset	417 const Layer *layer = &LayerIndex[0];
214 5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	418
5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	419 // 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	420 if ( map != 0
215 00a8c7f491d4 Fixing first and last element bug for layers. Jacob Alexander <haata@kiibohd.com> parents: 214 diff changeset	421 && scanCode <= layer->last
00a8c7f491d4 Fixing first and last element bug for layers. Jacob Alexander <haata@kiibohd.com> parents: 214 diff changeset	422 && scanCode >= layer->first
214 5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	423 && *map[ scanCode - layer->first ] != 0 )
184 f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	424 {
297 c86eb7d0a693 Fixing releasing Function key and holding layered key Jacob Alexander <haata@kiibohd.com> parents: 271 diff changeset	425 // Set the layer cache to default map
c86eb7d0a693 Fixing releasing Function key and holding layered key Jacob Alexander <haata@kiibohd.com> parents: 271 diff changeset	426 macroTriggerListLayerCache[ scanCode ] = 0;
c86eb7d0a693 Fixing releasing Function key and holding layered key Jacob Alexander <haata@kiibohd.com> parents: 271 diff changeset	427
214 5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	428 return map[ scanCode - layer->first ];
184 f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	429 }
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	430
214 5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	431 // Otherwise no defined Trigger Macro
5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	432 erro_msg("Scan Code has no defined Trigger Macro: ");
5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	433 printHex( scanCode );
361 7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	434 print( NL );
214 5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	435 return 0;
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	436 }
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	437
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	438
361 7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	439 // Add an interconnect ScanCode
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	440 // These are handled differently (less information is sent, hold/off states must be assumed)
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	441 #if defined(ConnectEnabled_define)
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	442 inline void Macro_interconnectAdd( void *trigger_ptr )
307 ecd2ae35d25c Initial commit for UARTConnect module Jacob Alexander <haata@kiibohd.com> parents: 297 diff changeset	443 {
361 7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	444 TriggerGuide trigger = (TriggerGuide)trigger_ptr;
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	445
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	446 // Error checking
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	447 uint8_t error = 0;
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	448 switch ( trigger->type )
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	449 {
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	450 case 0x00: // Normal key
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	451 switch ( trigger->state )
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	452 {
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	453 case 0x00:
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	454 case 0x01:
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	455 case 0x02:
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	456 case 0x03:
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	457 break;
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	458 default:
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	459 erro_print("Invalid key state");
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	460 error = 1;
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	461 break;
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	462 }
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	463 break;
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	464
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	465 // Invalid TriggerGuide type
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	466 default:
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	467 erro_print("Invalid type");
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	468 error = 1;
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	469 break;
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	470 }
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	471
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	472 // Display TriggerGuide
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	473 if ( error )
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	474 {
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	475 printHex( trigger->type );
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	476 print(" ");
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	477 printHex( trigger->state );
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	478 print(" ");
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	479 printHex( trigger->scanCode );
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	480 print( NL );
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	481 return;
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	482 }
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	483
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	484 // Add trigger to the Interconnect Cache
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	485 // During each processing loop, a scancode may be re-added depending on it's state
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	486 for ( uint8_t c = 0; c < macroInterconnectCacheSize; c++ )
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	487 {
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	488 // Check if the same ScanCode
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	489 if ( macroInterconnectCache[ c ].scanCode == trigger->scanCode )
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	490 {
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	491 // Update the state
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	492 macroInterconnectCache[ c ].state = trigger->state;
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	493 return;
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	494 }
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	495 }
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	496
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	497 // If not in the list, add it
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	498 macroInterconnectCache[ macroInterconnectCacheSize++ ] = *trigger;
307 ecd2ae35d25c Initial commit for UARTConnect module Jacob Alexander <haata@kiibohd.com> parents: 297 diff changeset	499 }
361 7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	500 #endif
307 ecd2ae35d25c Initial commit for UARTConnect module Jacob Alexander <haata@kiibohd.com> parents: 297 diff changeset	501
ecd2ae35d25c Initial commit for UARTConnect module Jacob Alexander <haata@kiibohd.com> parents: 297 diff changeset	502
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	503 // Update the scancode key state
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	504 // States:
184 f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	505 // * 0x00 - Off
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	506 // * 0x01 - Pressed
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	507 // * 0x02 - Held
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	508 // * 0x03 - Released
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	509 // * 0x04 - Unpressed (this is currently ignored)
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	510 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	511 {
361 7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	512 #if defined(ConnectEnabled_define)
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	513 // Only compile in if a Connect node module is available
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	514 if ( !Connect_master )
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	515 {
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	516 // ScanCodes are only added if there was a state change (on/off)
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	517 switch ( state )
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	518 {
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	519 case 0x00: // Off
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	520 case 0x02: // Held
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	521 return;
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	522 }
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	523 }
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	524 #endif
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	525
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	526 // 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	527 switch ( state )
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	528 {
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	529 case 0x01: // Pressed
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	530 case 0x02: // Held
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	531 case 0x03: // Released
184 f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	532 macroTriggerListBuffer[ macroTriggerListBufferSize ].scanCode = scanCode;
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	533 macroTriggerListBuffer[ macroTriggerListBufferSize ].state = state;
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	534 macroTriggerListBuffer[ macroTriggerListBufferSize ].type = 0x00; // Normal key
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	535 macroTriggerListBufferSize++;
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	536 break;
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	537 }
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	538 }
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	539
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	540
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	541 // Update the scancode analog state
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	542 // States:
184 f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	543 // * 0x00 - Off
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	544 // * 0x01 - Released
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	545 // * 0x02-0xFF - Analog value (low to high)
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	546 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	547 {
184 f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	548 // Only add to macro trigger list if non-off
361 7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	549 // TODO Handle change for interconnect
184 f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	550 if ( state != 0x00 )
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	551 {
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	552 macroTriggerListBuffer[ macroTriggerListBufferSize ].scanCode = scanCode;
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	553 macroTriggerListBuffer[ macroTriggerListBufferSize ].state = state;
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	554 macroTriggerListBuffer[ macroTriggerListBufferSize ].type = 0x02; // Analog key
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	555 macroTriggerListBufferSize++;
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	556 }
166 2fba36caf039 Initial work for KLL macro support Jacob Alexander <haata@kiibohd.com> parents: 159 diff changeset	557 }
2fba36caf039 Initial work for KLL macro support Jacob Alexander <haata@kiibohd.com> parents: 159 diff changeset	558
2fba36caf039 Initial work for KLL macro support Jacob Alexander <haata@kiibohd.com> parents: 159 diff changeset	559
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	560 // Update led state
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	561 // States:
184 f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	562 // * 0x00 - Off
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	563 // * 0x01 - On
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	564 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	565 {
184 f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	566 // Only add to macro trigger list if non-off
361 7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	567 // TODO Handle change for interconnect
184 f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	568 if ( state != 0x00 )
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	569 {
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	570 macroTriggerListBuffer[ macroTriggerListBufferSize ].scanCode = ledCode;
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	571 macroTriggerListBuffer[ macroTriggerListBufferSize ].state = state;
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	572 macroTriggerListBuffer[ macroTriggerListBufferSize ].type = 0x01; // LED key
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	573 macroTriggerListBufferSize++;
f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	574 }
166 2fba36caf039 Initial work for KLL macro support Jacob Alexander <haata@kiibohd.com> parents: 159 diff changeset	575 }
2fba36caf039 Initial work for KLL macro support Jacob Alexander <haata@kiibohd.com> parents: 159 diff changeset	576
2fba36caf039 Initial work for KLL macro support Jacob Alexander <haata@kiibohd.com> parents: 159 diff changeset	577
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	578 // Append result macro to pending list, checking for duplicates
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	579 // Do nothing if duplicate
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	580 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	581 {
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	582 // Lookup result macro index
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	583 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	584
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	585 // 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	586 for ( var_uint_t macro = 0; macro < macroResultMacroPendingListSize; macro++ )
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	587 {
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	588 // If duplicate found, do nothing
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	589 if ( macroResultMacroPendingList[ macro ] == resultMacroIndex )
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	590 return;
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	591 }
166 2fba36caf039 Initial work for KLL macro support Jacob Alexander <haata@kiibohd.com> parents: 159 diff changeset	592
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	593 // No duplicates found, add to pending list
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	594 macroResultMacroPendingList[ macroResultMacroPendingListSize++ ] = resultMacroIndex;
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	595
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	596 // 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	597 var_uint_t pos = 0;
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	598 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	599 {
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	600 pos += TriggerGuideSize * comboLength + 1;
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	601 comboLength = triggerMacro->guide[ pos ];
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	602 }
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	603
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	604 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	605
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	606 // 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	607 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	608 {
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	609 if ( macroTriggerListBuffer[ keyIndex ].scanCode == scanCode )
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	610 {
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	611 ResultMacroRecordList[ resultMacroIndex ].state = macroTriggerListBuffer[ keyIndex ].state;
8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	612 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	613 }
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	614 }
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	615
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	616 // Reset the macro position
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	617 ResultMacroRecordList[ resultMacroIndex ].pos = 0;
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	618 }
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	619
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	620
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	621 // Determine if long ResultMacro (more than 1 seqence element)
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	622 inline uint8_t Macro_isLongResultMacro( const ResultMacro *macro )
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	623 {
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	624 // 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	625 // If non-zero return non-zero (long sequence)
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	626 // 0 otherwise (short sequence)
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	627 var_uint_t position = 1;
b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	628 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	629 position += ResultGuideSize( (ResultGuide*)&macro->guide[ position ] );
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	630 return macro->guide[ position ];
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	631 }
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	632
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	633
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	634 // Determine if long TriggerMacro (more than 1 sequence element)
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	635 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	636 {
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	637 // Check the second sequence combo length
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	638 // 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	639 // 0 otherwise (short sequence)
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	640 return macro->guide[ macro->guide[0] * TriggerGuideSize + 1 ];
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	641 }
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	642
166 2fba36caf039 Initial work for KLL macro support Jacob Alexander <haata@kiibohd.com> parents: 159 diff changeset	643
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	644 // 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	645 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	646 {
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	647 // Depending on key type
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	648 switch ( guide->type )
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	649 {
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	650 // Normal State Type
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	651 case 0x00:
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	652 // 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	653 if ( guide->scanCode == key->scanCode )
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	654 {
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	655 switch ( key->state )
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	656 {
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	657 // Correct key, pressed, possible passing
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	658 case 0x01:
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	659 return TriggerMacroVote_Pass;
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	660
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	661 // 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	662 case 0x02:
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	663 return TriggerMacroVote_PassRelease;
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	664
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	665 // Correct key, released, possible release
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	666 case 0x03:
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	667 return TriggerMacroVote_Release;
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	668 }
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	669 }
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	670
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	671 return TriggerMacroVote_DoNothing;
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	672
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	673 // LED State Type
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	674 case 0x01:
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	675 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	676 break;
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	677
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	678 // Analog State Type
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	679 case 0x02:
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	680 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	681 break;
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	682
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	683 // Invalid State Type
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	684 default:
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	685 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	686 break;
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	687 }
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	688
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	689 // XXX Shouldn't reach here
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	690 return TriggerMacroVote_Invalid;
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	691 }
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	692
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	693
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	694 // 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	695 // 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	696 inline TriggerMacroVote Macro_evalLongTriggerMacroVote( TriggerGuide key, TriggerGuide guide )
189 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 // Depending on key type
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	699 switch ( guide->type )
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	700 {
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	701 // Normal State Type
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	702 case 0x00:
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	703 // Depending on the state of the buffered key, make voting decision
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	704 // Incorrect key
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	705 if ( guide->scanCode != key->scanCode )
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	706 {
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	707 switch ( key->state )
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	708 {
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	709 // Wrong key, pressed, fail
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	710 case 0x01:
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	711 return TriggerMacroVote_Fail;
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	712
197 1ebb6fb5f74f All basic macros tested and working! Jacob Alexander <haata@kiibohd.com> parents: 196 diff changeset	713 // Wrong key, held, do not pass (no effect)
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	714 case 0x02:
197 1ebb6fb5f74f All basic macros tested and working! Jacob Alexander <haata@kiibohd.com> parents: 196 diff changeset	715 return TriggerMacroVote_DoNothing;
1ebb6fb5f74f All basic macros tested and working! Jacob Alexander <haata@kiibohd.com> parents: 196 diff changeset	716
1ebb6fb5f74f All basic macros tested and working! Jacob Alexander <haata@kiibohd.com> parents: 196 diff changeset	717 // Wrong key released, fail out if pos == 0
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	718 case 0x03:
197 1ebb6fb5f74f All basic macros tested and working! Jacob Alexander <haata@kiibohd.com> parents: 196 diff changeset	719 return TriggerMacroVote_DoNothing \| TriggerMacroVote_DoNothingRelease;
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 }
166 2fba36caf039 Initial work for KLL macro support Jacob Alexander <haata@kiibohd.com> parents: 159 diff changeset	722
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	723 // Correct key
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	724 else
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	725 {
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	726 switch ( key->state )
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	727 {
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	728 // Correct key, pressed, possible passing
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	729 case 0x01:
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	730 return TriggerMacroVote_Pass;
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	731
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	732 // Correct key, held, possible passing or release
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	733 case 0x02:
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	734 return TriggerMacroVote_PassRelease;
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	735
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	736 // Correct key, released, possible release
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	737 case 0x03:
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	738 return TriggerMacroVote_Release;
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	739 }
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	740 }
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	741
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	742 break;
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	743
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	744 // LED State Type
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	745 case 0x01:
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	746 erro_print("LED State Type - Not implemented...");
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	747 break;
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	748
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	749 // Analog State Type
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	750 case 0x02:
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	751 erro_print("Analog State Type - Not implemented...");
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	752 break;
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	753
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	754 // Invalid State Type
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	755 default:
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	756 erro_print("Invalid State Type. This is a bug.");
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	757 break;
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	758 }
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	759
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	760 // XXX Shouldn't reach here
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	761 return TriggerMacroVote_Invalid;
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	762 }
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
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	765 // Evaluate/Update TriggerMacro
265 708af1b9bc55 Fixing warning messages found using clang. Jacob Alexander <haata@kiibohd.com> parents: 253 diff changeset	766 TriggerMacroEval Macro_evalTriggerMacro( var_uint_t triggerMacroIndex )
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	767 {
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	768 // Lookup TriggerMacro
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	769 const TriggerMacro *macro = &TriggerMacroList[ triggerMacroIndex ];
8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	770 TriggerMacroRecord *record = &TriggerMacroRecordList[ triggerMacroIndex ];
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	771
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	772 // 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	773 if ( record->state == TriggerMacro_Release )
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	774 {
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	775 record->state = TriggerMacro_Waiting;
8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	776 record->pos = record->pos + macro->guide[ record->pos ] * TriggerGuideSize + 1;
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	777 }
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	778
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	779 // Current Macro position
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	780 var_uint_t pos = record->pos;
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	781
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	782 // 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	783 uint8_t comboLength = macro->guide[ pos ] * TriggerGuideSize;
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	784
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	785 // 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	786 if ( comboLength == 0 )
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	787 {
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	788 return TriggerMacroEval_Remove;
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	789 }
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	790
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	791 // 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	792 uint8_t longMacro = Macro_isLongTriggerMacro( macro );
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	793
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	794 // 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	795 // 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	796 //
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	797 // 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	798 // 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	799 // 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	800 // On scan after position increment, change to TriggerMacro_Waiting state
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	801 // TODO Add support for system LED states (NumLock, CapsLock, etc.)
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	802 // TODO Add support for analog key states
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	803 // 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	804 // 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	805 TriggerMacroVote overallVote = TriggerMacroVote_Invalid;
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	806 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	807 {
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	808 // 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	809 TriggerGuide guide = (TriggerGuide)(&macro->guide[ comboItem ]);
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	810
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	811 TriggerMacroVote vote = TriggerMacroVote_Invalid;
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	812 // 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	813 for ( uint8_t key = 0; key < macroTriggerListBufferSize; key++ )
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	814 {
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	815 // Lookup key information
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	816 TriggerGuide *keyInfo = &macroTriggerListBuffer[ key ];
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	817
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	818 // 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	819 // 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	820 vote \|= longMacro
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	821 ? Macro_evalLongTriggerMacroVote( keyInfo, guide )
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	822 : Macro_evalShortTriggerMacroVote( keyInfo, guide );
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	823 if ( vote >= TriggerMacroVote_Pass )
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	824 {
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	825 vote &= TriggerMacroVote_Release \| TriggerMacroVote_PassRelease \| TriggerMacroVote_Pass;
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	826 break;
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	827 }
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	828 }
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	829
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	830 // 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	831 // 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	832 if ( !longMacro && vote < TriggerMacroVote_Pass )
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	833 vote \|= TriggerMacroVote_Fail;
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	834
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	835 // After voting, append to overall vote
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	836 overallVote \|= vote;
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	837 }
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	838
197 1ebb6fb5f74f All basic macros tested and working! Jacob Alexander <haata@kiibohd.com> parents: 196 diff changeset	839 // 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	840 // 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	841 if ( longMacro && overallVote & TriggerMacroVote_DoNothingRelease && pos == 0 )
1ebb6fb5f74f All basic macros tested and working! Jacob Alexander <haata@kiibohd.com> parents: 196 diff changeset	842 overallVote \|= TriggerMacroVote_Fail;
1ebb6fb5f74f All basic macros tested and working! Jacob Alexander <haata@kiibohd.com> parents: 196 diff changeset	843
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	844 // Decide new state of macro after voting
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	845 // Fail macro, remove from pending list
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	846 if ( overallVote & TriggerMacroVote_Fail )
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	847 {
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	848 return TriggerMacroEval_Remove;
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	849 }
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	850 // 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	851 else if ( overallVote & TriggerMacroVote_DoNothing && longMacro )
189 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 // Just doing nothing :)
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	854 }
216 738445f38639 DPH controller now working with the kishsaver and macros Jacob Alexander <haata@kiibohd.com> parents: 215 diff changeset	855 // 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	856 // 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	857 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	858 {
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	859 record->state = TriggerMacro_Release;
216 738445f38639 DPH controller now working with the kishsaver and macros Jacob Alexander <haata@kiibohd.com> parents: 215 diff changeset	860
738445f38639 DPH controller now working with the kishsaver and macros Jacob Alexander <haata@kiibohd.com> parents: 215 diff changeset	861 // 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	862 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	863 return TriggerMacroEval_DoResultAndRemove;
738445f38639 DPH controller now working with the kishsaver and macros Jacob Alexander <haata@kiibohd.com> parents: 215 diff changeset	864 }
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	865 // 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	866 else if ( overallVote & TriggerMacroVote_Pass
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	867 && ( record->state == TriggerMacro_Waiting \|\| record->state == TriggerMacro_Press ) )
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	868 {
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	869 record->state = TriggerMacro_Press;
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	870
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	871 // 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	872 // 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	873 // 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	874 // 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	875 if ( macro->guide[ pos + comboLength + 1 ] == 0 )
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	876 {
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	877 // 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	878 if ( Macro_isLongResultMacro( &ResultMacroList[ macro->result ] ) )
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	879 {
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	880 // 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	881 if ( overallVote == TriggerMacroVote_Pass )
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	882 {
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	883 return TriggerMacroEval_DoResultAndRemove;
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	884 }
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	885 }
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	886 // Short result macro
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	887 else
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	888 {
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	889 // 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	890 if ( Macro_isLongTriggerMacro( macro ) )
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	891 {
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	892 return TriggerMacroEval_DoResultAndRemove;
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	893 }
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	894 // Otherwise, trigger result continuously
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	895 else
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	896 {
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	897 return TriggerMacroEval_DoResult;
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	898 }
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	899 }
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	900 }
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	901 }
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	902 // 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	903 // 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	904 else if ( overallVote & TriggerMacroVote_Release )
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	905 {
201 326f75709d10 Fixing release state for keys Jacob Alexander <jacob.alexander@virtualinstruments.com> parents: 199 diff changeset	906 return TriggerMacroEval_DoResultAndRemove;
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	907 }
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	908
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	909 // 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	910 // 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	911 if ( !longMacro )
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	912 return TriggerMacroEval_Remove;
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 return TriggerMacroEval_DoNothing;
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	915 }
166 2fba36caf039 Initial work for KLL macro support Jacob Alexander <haata@kiibohd.com> parents: 159 diff changeset	916
2fba36caf039 Initial work for KLL macro support Jacob Alexander <haata@kiibohd.com> parents: 159 diff changeset	917
185 68f3dc0cddd0 Macro cleanup. Jacob Alexander <haata@kiibohd.com> parents: 184 diff changeset	918 // Evaluate/Update ResultMacro
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	919 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	920 {
190 7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	921 // Lookup ResultMacro
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	922 const ResultMacro *macro = &ResultMacroList[ resultMacroIndex ];
8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	923 ResultMacroRecord *record = &ResultMacroRecordList[ resultMacroIndex ];
190 7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	924
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	925 // Current Macro position
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	926 var_uint_t pos = record->pos;
190 7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	927
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	928 // Length of combo being processed
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	929 uint8_t comboLength = macro->guide[ pos ];
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	930
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	931 // 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	932 var_uint_t funcCount = 0;
190 7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	933
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	934 // 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	935 var_uint_t comboItem = pos + 1;
190 7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	936
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	937 // Iterate through the Result Combo
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	938 while ( funcCount < comboLength )
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	939 {
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	940 // 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	941 ResultGuide guide = (ResultGuide)(&macro->guide[ comboItem ]);
190 7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	942
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	943 // Do lookup on capability function
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	944 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	945
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	946 // Call capability
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	947 capability( record->state, record->stateType, &guide->args );
190 7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	948
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	949 // Increment counters
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	950 funcCount++;
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	951 comboItem += ResultGuideSize( (ResultGuide*)(&macro->guide[ comboItem ]) );
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	952 }
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	953
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	954 // Move to next item in the sequence
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	955 record->pos = comboItem;
190 7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	956
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	957 // If the ResultMacro is finished, remove
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	958 if ( macro->guide[ comboItem ] == 0 )
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	959 {
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	960 record->pos = 0;
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	961 return ResultMacroEval_Remove;
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	962 }
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	963
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	964 // Otherwise leave the macro in the list
190 7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	965 return ResultMacroEval_DoNothing;
125 8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	966 }
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	967
159 84beeecd2c94 Kishsaver is fully working with DPH! Jacob Alexander <haata@kiibohd.com> parents: 150 diff changeset	968
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	969 // Update pending trigger list
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	970 inline void Macro_updateTriggerMacroPendingList()
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	971 {
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	972 // 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	973 for ( uint8_t key = 0; key < macroTriggerListBufferSize; key++ )
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	974 {
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	975 // TODO LED States
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	976 // TODO Analog Switches
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	977 // 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	978 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	979 continue;
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	980
253 e79f2b9c39cf Fixing layer latch capability. Jacob Alexander <haata@kiibohd.com> parents: 241 diff changeset	981 // TODO Analog
e79f2b9c39cf Fixing layer latch capability. Jacob Alexander <haata@kiibohd.com> parents: 241 diff changeset	982 // If this is a release case, indicate to layer lookup for possible latch expiry
e79f2b9c39cf Fixing layer latch capability. Jacob Alexander <haata@kiibohd.com> parents: 241 diff changeset	983 uint8_t latch_expire = macroTriggerListBuffer[ key ].state == 0x03;
e79f2b9c39cf Fixing layer latch capability. Jacob Alexander <haata@kiibohd.com> parents: 241 diff changeset	984
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	985 // Lookup Trigger List
297 c86eb7d0a693 Fixing releasing Function key and holding layered key Jacob Alexander <haata@kiibohd.com> parents: 271 diff changeset	986 nat_ptr_t *triggerList = Macro_layerLookup( &macroTriggerListBuffer[ key ], latch_expire );
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	987
361 7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	988 // If there was an error during lookup, skip
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	989 if ( triggerList == 0 )
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	990 continue;
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	991
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	992 // Number of Triggers in list
202 1a68a9a04ad3 Adding variable width state variable width. Jacob Alexander <haata@kiibohd.com> parents: 201 diff changeset	993 nat_ptr_t triggerListSize = triggerList[0];
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	994
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	995 // 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	996 // 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	997 for ( var_uint_t macro = 1; macro < triggerListSize + 1; macro++ )
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	998 {
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	999 // Lookup trigger macro index
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	1000 var_uint_t triggerMacroIndex = triggerList[ macro ];
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1001
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1002 // 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	1003 // triggerList needs to be added
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	1004 var_uint_t pending = 0;
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1005 for ( ; pending < macroTriggerMacroPendingListSize; pending++ )
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1006 {
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1007 // 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	1008 if ( macroTriggerMacroPendingList[ pending ] == triggerMacroIndex )
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1009 break;
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1010 }
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1011
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1012 // If the triggerMacroIndex (macro) was not found in the macroTriggerMacroPendingList
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1013 // Add it to the list
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1014 if ( pending == macroTriggerMacroPendingListSize )
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1015 {
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1016 macroTriggerMacroPendingList[ macroTriggerMacroPendingListSize++ ] = triggerMacroIndex;
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	1017
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	1018 // Reset macro position
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	1019 TriggerMacroRecordList[ triggerMacroIndex ].pos = 0;
8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	1020 TriggerMacroRecordList[ triggerMacroIndex ].state = TriggerMacro_Waiting;
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1021 }
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1022 }
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1023 }
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1024 }
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1025
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1026
185 68f3dc0cddd0 Macro cleanup. Jacob Alexander <haata@kiibohd.com> parents: 184 diff changeset	1027 // Macro Procesing Loop
68f3dc0cddd0 Macro cleanup. Jacob Alexander <haata@kiibohd.com> parents: 184 diff changeset	1028 // 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	1029 inline void Macro_process()
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1030 {
360 dbefb68411e1 Initial UARTConnect scancode support Jacob Alexander <haata@kiibohd.com> parents: 345 diff changeset	1031 #if defined(ConnectEnabled_define)
dbefb68411e1 Initial UARTConnect scancode support Jacob Alexander <haata@kiibohd.com> parents: 345 diff changeset	1032 // Only compile in if a Connect node module is available
dbefb68411e1 Initial UARTConnect scancode support Jacob Alexander <haata@kiibohd.com> parents: 345 diff changeset	1033 // If this is a interconnect slave node, send all scancodes to master node
dbefb68411e1 Initial UARTConnect scancode support Jacob Alexander <haata@kiibohd.com> parents: 345 diff changeset	1034 if ( !Connect_master )
dbefb68411e1 Initial UARTConnect scancode support Jacob Alexander <haata@kiibohd.com> parents: 345 diff changeset	1035 {
dbefb68411e1 Initial UARTConnect scancode support Jacob Alexander <haata@kiibohd.com> parents: 345 diff changeset	1036 if ( macroTriggerListBufferSize > 0 )
dbefb68411e1 Initial UARTConnect scancode support Jacob Alexander <haata@kiibohd.com> parents: 345 diff changeset	1037 {
361 7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	1038 Connect_send_ScanCode( Connect_id, macroTriggerListBuffer, macroTriggerListBufferSize );
360 dbefb68411e1 Initial UARTConnect scancode support Jacob Alexander <haata@kiibohd.com> parents: 345 diff changeset	1039 macroTriggerListBufferSize = 0;
dbefb68411e1 Initial UARTConnect scancode support Jacob Alexander <haata@kiibohd.com> parents: 345 diff changeset	1040 }
dbefb68411e1 Initial UARTConnect scancode support Jacob Alexander <haata@kiibohd.com> parents: 345 diff changeset	1041 return;
dbefb68411e1 Initial UARTConnect scancode support Jacob Alexander <haata@kiibohd.com> parents: 345 diff changeset	1042 }
dbefb68411e1 Initial UARTConnect scancode support Jacob Alexander <haata@kiibohd.com> parents: 345 diff changeset	1043 #endif
dbefb68411e1 Initial UARTConnect scancode support Jacob Alexander <haata@kiibohd.com> parents: 345 diff changeset	1044
125 8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1045 // 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	1046 if ( USBKeys_Sent != 0 )
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1047 return;
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1048
361 7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	1049 #if defined(ConnectEnabled_define)
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	1050 // Check if there are any ScanCodes in the interconnect cache to process
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	1051 if ( Connect_master && macroInterconnectCacheSize > 0 )
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	1052 {
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	1053 // Iterate over all the cache ScanCodes
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	1054 uint8_t currentInterconnectCacheSize = macroInterconnectCacheSize;
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	1055 macroInterconnectCacheSize = 0;
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	1056 for ( uint8_t c = 0; c < currentInterconnectCacheSize; c++ )
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	1057 {
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	1058 // Add to the trigger list
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	1059 macroTriggerListBuffer[ macroTriggerListBufferSize++ ] = macroInterconnectCache[ c ];
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	1060
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	1061 // TODO Handle other TriggerGuide types (e.g. analog)
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	1062 switch ( macroInterconnectCache[ c ].type )
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	1063 {
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	1064 // Normal (Press/Hold/Release)
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	1065 case 0x00:
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	1066 // Decide what to do based on the current state
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	1067 switch ( macroInterconnectCache[ c ].state )
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	1068 {
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	1069 // Re-add to interconnect cache in hold state
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	1070 case 0x01: // Press
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	1071 //case 0x02: // Hold // XXX Why does this not work? -HaaTa
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	1072 macroInterconnectCache[ c ].state = 0x02;
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	1073 macroInterconnectCache[ macroInterconnectCacheSize++ ] = macroInterconnectCache[ c ];
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	1074 break;
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	1075 case 0x03: // Remove
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	1076 break;
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	1077 // Otherwise, do not re-add
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	1078 }
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	1079 }
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	1080 }
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	1081 }
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	1082 #endif
7c6ac7b88cda Working support for Interconnect Jacob Alexander <haata@kiibohd.com> parents: 360 diff changeset	1083
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1084 // 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	1085 if ( macroPauseMode )
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1086 {
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1087 if ( macroStepCounter == 0 )
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1088 return;
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1089
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1090 // Proceed, decrementing the step counter
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1091 macroStepCounter--;
192 6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1092 dbug_print("Macro Step");
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1093 }
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1094
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1095 // Update pending trigger list, before processing TriggerMacros
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1096 Macro_updateTriggerMacroPendingList();
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	1097
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1098 // Tail pointer for macroTriggerMacroPendingList
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1099 // 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	1100 var_uint_t macroTriggerMacroPendingListTail = 0;
185 68f3dc0cddd0 Macro cleanup. Jacob Alexander <haata@kiibohd.com> parents: 184 diff changeset	1101
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1102 // 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	1103 for ( var_uint_t macro = 0; macro < macroTriggerMacroPendingListSize; macro++ )
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1104 {
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1105 switch ( Macro_evalTriggerMacro( macroTriggerMacroPendingList[ macro ] ) )
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	1106 {
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1107 // Trigger Result Macro (purposely falling through)
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1108 case TriggerMacroEval_DoResult:
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1109 // Append ResultMacro to PendingList
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	1110 Macro_appendResultMacroToPendingList( &TriggerMacroList[ macroTriggerMacroPendingList[ macro ] ] );
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	1111
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1112 default:
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1113 macroTriggerMacroPendingList[ macroTriggerMacroPendingListTail++ ] = macroTriggerMacroPendingList[ macro ];
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1114 break;
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	1115
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1116 // Trigger Result Macro and Remove (purposely falling through)
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1117 case TriggerMacroEval_DoResultAndRemove:
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1118 // Append ResultMacro to PendingList
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	1119 Macro_appendResultMacroToPendingList( &TriggerMacroList[ macroTriggerMacroPendingList[ macro ] ] );
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1120
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1121 // Remove Macro from Pending List, nothing to do, removing by default
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1122 case TriggerMacroEval_Remove:
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1123 break;
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	1124 }
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	1125 }
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	1126
190 7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	1127 // Update the macroTriggerMacroPendingListSize with the tail pointer
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1128 macroTriggerMacroPendingListSize = macroTriggerMacroPendingListTail;
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	1129
190 7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	1130
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	1131 // Tail pointer for macroResultMacroPendingList
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	1132 // 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	1133 var_uint_t macroResultMacroPendingListTail = 0;
190 7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	1134
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1135 // 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	1136 for ( var_uint_t macro = 0; macro < macroResultMacroPendingListSize; macro++ )
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1137 {
190 7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	1138 switch ( Macro_evalResultMacro( macroResultMacroPendingList[ macro ] ) )
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	1139 {
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	1140 // Re-add macros to pending list
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	1141 case ResultMacroEval_DoNothing:
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	1142 default:
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	1143 macroResultMacroPendingList[ macroResultMacroPendingListTail++ ] = macroResultMacroPendingList[ macro ];
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	1144 break;
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	1145
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	1146 // 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	1147 case ResultMacroEval_Remove:
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	1148 break;
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	1149 }
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1150 }
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	1151
190 7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	1152 // Update the macroResultMacroPendingListSize with the tail pointer
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	1153 macroResultMacroPendingListSize = macroResultMacroPendingListTail;
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	1154
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	1155 // Signal buffer that we've used it
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	1156 Scan_finishedWithMacro( macroTriggerListBufferSize );
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	1157
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	1158 // Reset TriggerList buffer
7a71c6e38d56 Macro processing is now feature complete. Jacob Alexander <haata@kiibohd.com> parents: 189 diff changeset	1159 macroTriggerListBufferSize = 0;
126 670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1160
670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1161 // 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	1162 if ( macroDebugMode )
670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1163 {
670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1164 USBKeys_Modifiers = 0;
670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1165 USBKeys_Sent = 0;
670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1166 }
125 8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1167 }
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1168
185 68f3dc0cddd0 Macro cleanup. Jacob Alexander <haata@kiibohd.com> parents: 184 diff changeset	1169
125 8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1170 inline void Macro_setup()
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1171 {
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1172 // Register Macro CLI dictionary
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1173 CLI_registerDictionary( macroCLIDict, macroCLIDictName );
126 670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1174
670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1175 // Disable Macro debug mode
670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1176 macroDebugMode = 0;
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	1177
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1178 // Disable Macro pause flag
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1179 macroPauseMode = 0;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1180
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1181 // Set Macro step counter to zero
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1182 macroStepCounter = 0;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1183
176 d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	1184 // Make sure macro trigger buffer is empty
d3ae6b409cfa Initial work for partial layers and macros. Jacob Alexander <haata@kiibohd.com> parents: 166 diff changeset	1185 macroTriggerListBufferSize = 0;
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1186
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1187 // Initialize TriggerMacro states
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	1188 for ( var_uint_t macro = 0; macro < TriggerMacroNum; macro++ )
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1189 {
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	1190 TriggerMacroRecordList[ macro ].pos = 0;
8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	1191 TriggerMacroRecordList[ macro ].state = TriggerMacro_Waiting;
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1192 }
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1193
4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1194 // Initialize ResultMacro states
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	1195 for ( var_uint_t macro = 0; macro < ResultMacroNum; macro++ )
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1196 {
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	1197 ResultMacroRecordList[ macro ].pos = 0;
8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	1198 ResultMacroRecordList[ macro ].state = 0;
8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	1199 ResultMacroRecordList[ macro ].stateType = 0;
189 4493d8d2c959 Adding TriggerMacro processing. Jacob Alexander <haata@kiibohd.com> parents: 186 diff changeset	1200 }
125 8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1201 }
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1202
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1203
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1204 // ----- CLI Command Functions -----
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1205
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1206 void cliFunc_capList( char* args )
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1207 {
180 ed56f7873645 Added capabilities list debug option Jacob Alexander <haata@kiibohd.com> parents: 179 diff changeset	1208 print( NL );
271 e6c753528873 More mk20dx256vlh7 preparation. Jacob Alexander <haata@kiibohd.com> parents: 265 diff changeset	1209 info_msg("Capabilities List ");
192 6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1210 printHex( CapabilitiesNum );
180 ed56f7873645 Added capabilities list debug option Jacob Alexander <haata@kiibohd.com> parents: 179 diff changeset	1211
ed56f7873645 Added capabilities list debug option Jacob Alexander <haata@kiibohd.com> parents: 179 diff changeset	1212 // 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	1213 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	1214 {
ed56f7873645 Added capabilities list debug option Jacob Alexander <haata@kiibohd.com> parents: 179 diff changeset	1215 print( NL "\t" );
ed56f7873645 Added capabilities list debug option Jacob Alexander <haata@kiibohd.com> parents: 179 diff changeset	1216 printHex( cap );
ed56f7873645 Added capabilities list debug option Jacob Alexander <haata@kiibohd.com> parents: 179 diff changeset	1217 print(" - ");
ed56f7873645 Added capabilities list debug option Jacob Alexander <haata@kiibohd.com> parents: 179 diff changeset	1218
ed56f7873645 Added capabilities list debug option Jacob Alexander <haata@kiibohd.com> parents: 179 diff changeset	1219 // 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	1220 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	1221 capability( 0xFF, 0xFF, 0 );
ed56f7873645 Added capabilities list debug option Jacob Alexander <haata@kiibohd.com> parents: 179 diff changeset	1222 }
125 8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1223 }
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1224
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1225 void cliFunc_capSelect( char* args )
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1226 {
126 670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1227 // 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	1228 char* curArgs;
126 670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1229 char* arg1Ptr;
182 880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1230 char* arg2Ptr = args;
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1231
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1232 // 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	1233 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	1234 var_uint_t cap = 0;
126 670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1235
182 880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1236 // 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	1237 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	1238 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	1239
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1240 // Process all args
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	1241 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	1242 {
182 880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1243 curArgs = arg2Ptr;
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1244 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	1245
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1246 // 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	1247 // Extra arguments are ignored
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1248 if ( *arg1Ptr == '\0' )
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1249 break;
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1250
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1251 // 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	1252 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	1253 {
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1254 // Keyboard Capability
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1255 case 'K':
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1256 // Determine capability index
195 58cfcb7bac88 Changing decToInt to numToInt (adds support for Hex number interpreter) Jacob Alexander <haata@kiibohd.com> parents: 192 diff changeset	1257 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	1258
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1259 // 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	1260 totalArgs += CapabilitiesList[ cap ].argCount;
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1261 continue;
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1262 }
126 670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1263
182 880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1264 // 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	1265 // 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	1266 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	1267
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1268 // 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	1269 if ( argSetCount == totalArgs )
126 670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1270 {
182 880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1271 // 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	1272 print( NL );
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1273 info_msg("K");
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1274 printInt8( cap );
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1275 print(" - ");
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1276 printHex( argSet[0] );
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1277 print(" - ");
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1278 printHex( argSet[1] );
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1279 print(" - ");
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1280 printHex( argSet[2] );
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1281 print( "..." NL );
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1282
880c33236cd1 Added capSelect function that can arbitrary run a keyboard capability Jacob Alexander <haata@kiibohd.com> parents: 181 diff changeset	1283 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	1284 capability( argSet[0], argSet[1], &argSet[2] );
126 670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1285 }
670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1286 }
125 8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1287 }
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1288
192 6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1289 void cliFunc_keyHold( char* args )
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1290 {
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1291 // Parse codes from arguments
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1292 char* curArgs;
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1293 char* arg1Ptr;
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1294 char* arg2Ptr = args;
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1295
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1296 // Process all args
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1297 for ( ;; )
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1298 {
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1299 curArgs = arg2Ptr;
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1300 CLI_argumentIsolation( curArgs, &arg1Ptr, &arg2Ptr );
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1301
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1302 // 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	1303 if ( *arg1Ptr == '\0' )
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1304 break;
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1305
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1306 // Ignore non-Scancode numbers
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1307 switch ( arg1Ptr[0] )
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1308 {
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1309 // Scancode
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1310 case 'S':
195 58cfcb7bac88 Changing decToInt to numToInt (adds support for Hex number interpreter) Jacob Alexander <haata@kiibohd.com> parents: 192 diff changeset	1311 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	1312 break;
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1313 }
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1314 }
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1315 }
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1316
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1317 void cliFunc_keyPress( char* args )
125 8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1318 {
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1319 // Parse codes from arguments
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1320 char* curArgs;
126 670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1321 char* arg1Ptr;
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1322 char* arg2Ptr = args;
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 // Process all args
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1325 for ( ;; )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1326 {
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1327 curArgs = arg2Ptr;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1328 CLI_argumentIsolation( curArgs, &arg1Ptr, &arg2Ptr );
126 670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1329
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1330 // Stop processing args if no more are found
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1331 if ( *arg1Ptr == '\0' )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1332 break;
126 670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1333
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1334 // Ignore non-Scancode numbers
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1335 switch ( arg1Ptr[0] )
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 // Scancode
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1338 case 'S':
195 58cfcb7bac88 Changing decToInt to numToInt (adds support for Hex number interpreter) Jacob Alexander <haata@kiibohd.com> parents: 192 diff changeset	1339 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	1340 break;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1341 }
126 670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1342 }
125 8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1343 }
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1344
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1345 void cliFunc_keyRelease( char* args )
125 8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1346 {
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1347 // Parse codes from arguments
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1348 char* curArgs;
126 670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1349 char* arg1Ptr;
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1350 char* arg2Ptr = args;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1351
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1352 // Process all args
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1353 for ( ;; )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1354 {
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1355 curArgs = arg2Ptr;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1356 CLI_argumentIsolation( curArgs, &arg1Ptr, &arg2Ptr );
126 670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1357
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1358 // Stop processing args if no more are found
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1359 if ( *arg1Ptr == '\0' )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1360 break;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1361
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1362 // Ignore non-Scancode numbers
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1363 switch ( arg1Ptr[0] )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1364 {
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1365 // Scancode
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1366 case 'S':
195 58cfcb7bac88 Changing decToInt to numToInt (adds support for Hex number interpreter) Jacob Alexander <haata@kiibohd.com> parents: 192 diff changeset	1367 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	1368 break;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1369 }
126 670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1370 }
125 8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1371 }
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1372
344 f04450004adf Adding layerDebug cli command Jacob Alexander <haata@kiibohd.com> parents: 307 diff changeset	1373 void cliFunc_layerDebug( char *args )
f04450004adf Adding layerDebug cli command Jacob Alexander <haata@kiibohd.com> parents: 307 diff changeset	1374 {
f04450004adf Adding layerDebug cli command Jacob Alexander <haata@kiibohd.com> parents: 307 diff changeset	1375 // Toggle layer debug mode
f04450004adf Adding layerDebug cli command Jacob Alexander <haata@kiibohd.com> parents: 307 diff changeset	1376 layerDebugMode = layerDebugMode ? 0 : 1;
f04450004adf Adding layerDebug cli command Jacob Alexander <haata@kiibohd.com> parents: 307 diff changeset	1377
f04450004adf Adding layerDebug cli command Jacob Alexander <haata@kiibohd.com> parents: 307 diff changeset	1378 print( NL );
f04450004adf Adding layerDebug cli command Jacob Alexander <haata@kiibohd.com> parents: 307 diff changeset	1379 info_msg("Layer Debug Mode: ");
f04450004adf Adding layerDebug cli command Jacob Alexander <haata@kiibohd.com> parents: 307 diff changeset	1380 printInt8( layerDebugMode );
f04450004adf Adding layerDebug cli command Jacob Alexander <haata@kiibohd.com> parents: 307 diff changeset	1381 }
f04450004adf Adding layerDebug cli command Jacob Alexander <haata@kiibohd.com> parents: 307 diff changeset	1382
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1383 void cliFunc_layerList( char* args )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1384 {
183 bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1385 print( NL );
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1386 info_msg("Layer List");
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1387
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1388 // 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	1389 for ( uint16_t layer = 0; layer < LayerNum; layer++ )
183 bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1390 {
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1391 print( NL "\t" );
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1392 printHex( layer );
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1393 print(" - ");
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1394
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1395 // Display layer name
192 6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1396 dPrint( (char*)LayerIndex[ layer ].name );
183 bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1397
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1398 // Default map
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1399 if ( layer == 0 )
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1400 print(" \033[1m(default)\033[0m");
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1401
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1402 // Layer State
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1403 print( NL "\t\t Layer State: " );
214 5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	1404 printHex( LayerState[ layer ] );
183 bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1405
214 5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	1406 // First -> Last Indices
5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	1407 print(" First -> Last Indices: ");
5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	1408 printHex( LayerIndex[ layer ].first );
5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	1409 print(" -> ");
5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	1410 printHex( LayerIndex[ layer ].last );
183 bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1411 }
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1412 }
126 670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1413
183 bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1414 void cliFunc_layerState( char* args )
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1415 {
183 bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1416 // Parse codes from arguments
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1417 char* curArgs;
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1418 char* arg1Ptr;
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1419 char* arg2Ptr = args;
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1420
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1421 uint8_t arg1 = 0;
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1422 uint8_t arg2 = 0;
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1423
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1424 // Process first two args
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1425 for ( uint8_t c = 0; c < 2; c++ )
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1426 {
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1427 curArgs = arg2Ptr;
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1428 CLI_argumentIsolation( curArgs, &arg1Ptr, &arg2Ptr );
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1429
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1430 // Stop processing args if no more are found
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1431 if ( *arg1Ptr == '\0' )
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1432 break;
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1433
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1434 switch ( c )
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1435 {
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1436 // First argument (e.g. L1)
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1437 case 0:
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1438 if ( arg1Ptr[0] != 'L' )
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1439 return;
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1440
195 58cfcb7bac88 Changing decToInt to numToInt (adds support for Hex number interpreter) Jacob Alexander <haata@kiibohd.com> parents: 192 diff changeset	1441 arg1 = (uint8_t)numToInt( &arg1Ptr[1] );
183 bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1442 break;
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1443 // Second argument (e.g. 4)
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1444 case 1:
195 58cfcb7bac88 Changing decToInt to numToInt (adds support for Hex number interpreter) Jacob Alexander <haata@kiibohd.com> parents: 192 diff changeset	1445 arg2 = (uint8_t)numToInt( arg1Ptr );
183 bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1446
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1447 // Display operation (to indicate that it worked)
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1448 print( NL );
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1449 info_msg("Setting Layer L");
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1450 printInt8( arg1 );
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1451 print(" to - ");
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1452 printHex( arg2 );
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1453
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1454 // Set the layer state
214 5a5404338b9f Adding support for layer packing Jacob Alexander <haata@kiibohd.com> parents: 205 diff changeset	1455 LayerState[ arg1 ] = arg2;
183 bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1456 break;
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1457 }
bb96551a3065 Added layerList and layerState functions Jacob Alexander <haata@kiibohd.com> parents: 182 diff changeset	1458 }
125 8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1459 }
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1460
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1461 void cliFunc_macroDebug( char* args )
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1462 {
126 670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1463 // Toggle macro debug mode
670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1464 macroDebugMode = macroDebugMode ? 0 : 1;
670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1465
670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1466 print( NL );
670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1467 info_msg("Macro Debug Mode: ");
670fc9c3a739 Added CLI DefaultMap lookup command. Jacob Alexander <haata@kiibohd.com> parents: 125 diff changeset	1468 printInt8( macroDebugMode );
125 8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1469 }
8dab4014c398 Major code cleanup and preparation for PartialMap Macro Module Jacob Alexander <haata@kiibohd.com> parents: diff changeset	1470
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1471 void cliFunc_macroList( char* args )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1472 {
192 6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1473 // Show pending key events
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1474 print( NL );
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1475 info_msg("Pending Key Events: ");
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1476 printInt16( (uint16_t)macroTriggerListBufferSize );
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1477 print(" : ");
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1478 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	1479 {
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1480 printHex( macroTriggerListBuffer[ key ].scanCode );
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1481 print(" ");
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1482 }
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1483
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1484 // Show pending trigger macros
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1485 print( NL );
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1486 info_msg("Pending Trigger Macros: ");
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1487 printInt16( (uint16_t)macroTriggerMacroPendingListSize );
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1488 print(" : ");
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	1489 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	1490 {
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1491 printHex( macroTriggerMacroPendingList[ macro ] );
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1492 print(" ");
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1493 }
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1494
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1495 // Show pending result macros
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1496 print( NL );
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1497 info_msg("Pending Result Macros: ");
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1498 printInt16( (uint16_t)macroResultMacroPendingListSize );
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1499 print(" : ");
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	1500 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	1501 {
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1502 printHex( macroResultMacroPendingList[ macro ] );
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1503 print(" ");
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1504 }
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1505
181 80a44dcdafaf Adding macroList debug function Jacob Alexander <haata@kiibohd.com> parents: 180 diff changeset	1506 // Show available trigger macro indices
80a44dcdafaf Adding macroList debug function Jacob Alexander <haata@kiibohd.com> parents: 180 diff changeset	1507 print( NL );
80a44dcdafaf Adding macroList debug function Jacob Alexander <haata@kiibohd.com> parents: 180 diff changeset	1508 info_msg("Trigger Macros Range: T0 -> T");
80a44dcdafaf Adding macroList debug function Jacob Alexander <haata@kiibohd.com> parents: 180 diff changeset	1509 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	1510
80a44dcdafaf Adding macroList debug function Jacob Alexander <haata@kiibohd.com> parents: 180 diff changeset	1511 // Show available result macro indices
80a44dcdafaf Adding macroList debug function Jacob Alexander <haata@kiibohd.com> parents: 180 diff changeset	1512 print( NL );
80a44dcdafaf Adding macroList debug function Jacob Alexander <haata@kiibohd.com> parents: 180 diff changeset	1513 info_msg("Result Macros Range: R0 -> R");
80a44dcdafaf Adding macroList debug function Jacob Alexander <haata@kiibohd.com> parents: 180 diff changeset	1514 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	1515
80a44dcdafaf Adding macroList debug function Jacob Alexander <haata@kiibohd.com> parents: 180 diff changeset	1516 // Show Trigger to Result Macro Links
80a44dcdafaf Adding macroList debug function Jacob Alexander <haata@kiibohd.com> parents: 180 diff changeset	1517 print( NL );
80a44dcdafaf Adding macroList debug function Jacob Alexander <haata@kiibohd.com> parents: 180 diff changeset	1518 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	1519 for ( var_uint_t macro = 0; macro < TriggerMacroNum; macro++ )
181 80a44dcdafaf Adding macroList debug function Jacob Alexander <haata@kiibohd.com> parents: 180 diff changeset	1520 {
80a44dcdafaf Adding macroList debug function Jacob Alexander <haata@kiibohd.com> parents: 180 diff changeset	1521 print( NL );
80a44dcdafaf Adding macroList debug function Jacob Alexander <haata@kiibohd.com> parents: 180 diff changeset	1522 print("\tT");
80a44dcdafaf Adding macroList debug function Jacob Alexander <haata@kiibohd.com> parents: 180 diff changeset	1523 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	1524 print(" : R");
80a44dcdafaf Adding macroList debug function Jacob Alexander <haata@kiibohd.com> parents: 180 diff changeset	1525 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	1526 }
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1527 }
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 void cliFunc_macroProc( char* args )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1530 {
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1531 // Toggle macro pause mode
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1532 macroPauseMode = macroPauseMode ? 0 : 1;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1533
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1534 print( NL );
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1535 info_msg("Macro Processing Mode: ");
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1536 printInt8( macroPauseMode );
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1537 }
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1538
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	1539 void macroDebugShowTrigger( var_uint_t index )
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1540 {
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1541 // Only proceed if the macro exists
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1542 if ( index >= TriggerMacroNum )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1543 return;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1544
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1545 // Trigger Macro Show
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	1546 const TriggerMacro *macro = &TriggerMacroList[ index ];
8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	1547 TriggerMacroRecord *record = &TriggerMacroRecordList[ index ];
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1548
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1549 print( NL );
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1550 info_msg("Trigger Macro Index: ");
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1551 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	1552 print( NL );
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1553
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1554 // 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	1555 var_uint_t pos = 0;
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1556 uint8_t comboLength = macro->guide[ pos ];
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1557
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1558 // Iterate through and interpret the guide
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1559 while ( comboLength != 0 )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1560 {
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1561 // Initial position of the combo
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	1562 var_uint_t comboPos = ++pos;
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1563
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1564 // Iterate through the combo
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1565 while ( pos < comboLength * TriggerGuideSize + comboPos )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1566 {
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1567 // Assign TriggerGuide element (key type, state and scancode)
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1568 TriggerGuide guide = (TriggerGuide)(&macro->guide[ pos ]);
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1569
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1570 // Display guide information about trigger key
184 f9ef267ccc8b Adding layer fall-through lookup Jacob Alexander <haata@kiibohd.com> parents: 183 diff changeset	1571 printHex( guide->scanCode );
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1572 print("\|");
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1573 printHex( guide->type );
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1574 print("\|");
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1575 printHex( guide->state );
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1576
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1577 // Increment position
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1578 pos += TriggerGuideSize;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1579
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1580 // 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	1581 if ( pos < comboLength * TriggerGuideSize + comboPos )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1582 print("+");
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1583 }
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1584
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1585 // Read the next comboLength
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1586 comboLength = macro->guide[ pos ];
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1587
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1588 // 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	1589 if ( comboLength != 0 )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1590 print(";");
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1591 }
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1592
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1593 // Display current position
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1594 print( NL "Position: " );
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	1595 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	1596
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1597 // Display result macro index
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1598 print( NL "Result Macro Index: " );
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1599 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	1600
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	1601 // Display trigger macro state
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	1602 print( NL "Trigger Macro State: " );
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	1603 switch ( record->state )
196 8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	1604 {
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	1605 case TriggerMacro_Press: print("Press"); break;
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	1606 case TriggerMacro_Release: print("Release"); break;
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	1607 case TriggerMacro_Waiting: print("Waiting"); break;
8ecfdaa27234 Basic Trigger and Result Macros are now working. Jacob Alexander <haata@kiibohd.com> parents: 195 diff changeset	1608 }
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1609 }
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1610
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	1611 void macroDebugShowResult( var_uint_t index )
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1612 {
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1613 // Only proceed if the macro exists
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1614 if ( index >= ResultMacroNum )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1615 return;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1616
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1617 // Trigger Macro Show
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	1618 const ResultMacro *macro = &ResultMacroList[ index ];
8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	1619 ResultMacroRecord *record = &ResultMacroRecordList[ index ];
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1620
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1621 print( NL );
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1622 info_msg("Result Macro Index: ");
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1623 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	1624 print( NL );
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1625
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1626 // 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	1627 var_uint_t pos = 0;
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1628 uint8_t comboLength = macro->guide[ pos++ ];
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1629
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1630 // Iterate through and interpret the guide
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1631 while ( comboLength != 0 )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1632 {
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1633 // 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	1634 var_uint_t funcCount = 0;
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1635
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1636 // Iterate through the combo
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1637 while ( funcCount < comboLength )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1638 {
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1639 // Assign TriggerGuide element (key type, state and scancode)
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1640 ResultGuide guide = (ResultGuide)(&macro->guide[ pos ]);
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1641
180 ed56f7873645 Added capabilities list debug option Jacob Alexander <haata@kiibohd.com> parents: 179 diff changeset	1642 // Display Function Index
ed56f7873645 Added capabilities list debug option Jacob Alexander <haata@kiibohd.com> parents: 179 diff changeset	1643 printHex( guide->index );
ed56f7873645 Added capabilities list debug option Jacob Alexander <haata@kiibohd.com> parents: 179 diff changeset	1644 print("\|");
ed56f7873645 Added capabilities list debug option Jacob Alexander <haata@kiibohd.com> parents: 179 diff changeset	1645
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1646 // Display Function Ptr Address
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	1647 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	1648 print("\|");
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1649
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1650 // 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	1651 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	1652 capability( 0xFF, 0xFF, 0 );
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1653
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1654 // Display Argument(s)
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1655 print("(");
204 b718fdb741c3 Updating PartialLayer code to support varying counter widths. Jacob Alexander <haata@kiibohd.com> parents: 202 diff changeset	1656 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	1657 {
180 ed56f7873645 Added capabilities list debug option Jacob Alexander <haata@kiibohd.com> parents: 179 diff changeset	1658 // Arguments are only 8 bit values
ed56f7873645 Added capabilities list debug option Jacob Alexander <haata@kiibohd.com> parents: 179 diff changeset	1659 printHex( (&guide->args)[ arg ] );
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1660
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1661 // 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	1662 if ( arg + 1 < CapabilitiesList[ guide->index ].argCount )
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1663 print(",");
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1664 }
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1665 print(")");
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1666
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1667 // Increment position
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1668 pos += ResultGuideSize( guide );
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1669
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1670 // Increment function count
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1671 funcCount++;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1672
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1673 // 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	1674 if ( funcCount < comboLength )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1675 print("+");
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1676 }
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1677
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1678 // Read the next comboLength
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1679 comboLength = macro->guide[ pos++ ];
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1680
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1681 // 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	1682 if ( comboLength != 0 )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1683 print(";");
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1684 }
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1685
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1686 // Display current position
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1687 print( NL "Position: " );
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	1688 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	1689
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1690 // Display final trigger state/type
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1691 print( NL "Final Trigger State (State/Type): " );
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	1692 printHex( record->state );
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1693 print("/");
217 8ceb1a0582ee Adding more RAM optimizations Jacob Alexander <haata@kiibohd.com> parents: 216 diff changeset	1694 printHex( record->stateType );
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1695 }
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1696
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1697 void cliFunc_macroShow( char* args )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1698 {
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1699 // Parse codes from arguments
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1700 char* curArgs;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1701 char* arg1Ptr;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1702 char* arg2Ptr = args;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1703
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1704 // Process all args
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1705 for ( ;; )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1706 {
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1707 curArgs = arg2Ptr;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1708 CLI_argumentIsolation( curArgs, &arg1Ptr, &arg2Ptr );
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1709
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1710 // Stop processing args if no more are found
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1711 if ( *arg1Ptr == '\0' )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1712 break;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1713
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1714 // Ignore invalid codes
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1715 switch ( arg1Ptr[0] )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1716 {
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1717 // Indexed Trigger Macro
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1718 case 'T':
195 58cfcb7bac88 Changing decToInt to numToInt (adds support for Hex number interpreter) Jacob Alexander <haata@kiibohd.com> parents: 192 diff changeset	1719 macroDebugShowTrigger( numToInt( &arg1Ptr[1] ) );
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1720 break;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1721 // Indexed Result Macro
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1722 case 'R':
195 58cfcb7bac88 Changing decToInt to numToInt (adds support for Hex number interpreter) Jacob Alexander <haata@kiibohd.com> parents: 192 diff changeset	1723 macroDebugShowResult( numToInt( &arg1Ptr[1] ) );
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1724 break;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1725 }
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1726 }
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1727 }
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1728
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1729 void cliFunc_macroStep( char* args )
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1730 {
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1731 // Parse number from argument
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1732 // NOTE: Only first argument is used
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1733 char* arg1Ptr;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1734 char* arg2Ptr;
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1735 CLI_argumentIsolation( args, &arg1Ptr, &arg2Ptr );
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1736
192 6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1737 // 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	1738 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	1739
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1740 if ( count == 0 )
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1741 count = 1;
6ac92b8614c0 Fixing RAM calculator and reduced actual SRAM usage Jacob Alexander <haata@kiibohd.com> parents: 191 diff changeset	1742
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1743 // 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	1744 macroStepCounter = count;
179 e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1745 }
e5cf79b516e4 Basic debug trigger/result macro viewer Jacob Alexander <haata@kiibohd.com> parents: 176 diff changeset	1746

Mercurial > louis > kiibohd-controller

annotate Macro/PartialMap/macro.c @ 361:7c6ac7b88cda