di0ib/controller
Archived
1
0
Fork 0
Code Releases Activity

Merge pull request #78 from kevinfrei/infiniteLoops

Browse Source 
Fix a handful of infinite loops that occur with more than 254 macros
This commit is contained in:
Jacob Alexander 2016-02-06 18:23:34 -08:00
commit 6343edbfdc
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Macro/PartialMap/macro.c
View File

@ -135,7 +135,7 @@ uint16_t macroStepCounter = 0;
// Key Trigger List Buffer and Layer Cache // Key Trigger List Buffer and Layer Cache
// The layer cache is set on press only, hold and release events refer to the value set on press // The layer cache is set on press only, hold and release events refer to the value set on press
TriggerGuide macroTriggerListBuffer[ MaxScanCode ]; TriggerGuide macroTriggerListBuffer[ MaxScanCode ];
uint8_t macroTriggerListBufferSize = 0; var_uint_t macroTriggerListBufferSize = 0;
var_uint_t macroTriggerListLayerCache[ MaxScanCode ]; var_uint_t macroTriggerListLayerCache[ MaxScanCode ];
// Pending Trigger Macro Index List // Pending Trigger Macro Index List
@ -557,7 +557,7 @@ inline void Macro_interconnectAdd( void *trigger_ptr )
// Add trigger to the Interconnect Cache // Add trigger to the Interconnect Cache
// During each processing loop, a scancode may be re-added depending on it's state // During each processing loop, a scancode may be re-added depending on it's state
for ( uint8_t c = 0; c < macroInterconnectCacheSize; c++ ) for ( var_uint_t c = 0; c < macroInterconnectCacheSize; c++ )
{ {
// Check if the same ScanCode // Check if the same ScanCode
if ( macroInterconnectCache[ c ].scanCode == trigger->scanCode ) if ( macroInterconnectCache[ c ].scanCode == trigger->scanCode )
@ -699,7 +699,7 @@ inline void Macro_appendResultMacroToPendingList( const TriggerMacro *triggerMac
uint8_t scanCode = ((TriggerGuide*)&triggerMacro->guide[ pos - TriggerGuideSize ])->scanCode; uint8_t scanCode = ((TriggerGuide*)&triggerMacro->guide[ pos - TriggerGuideSize ])->scanCode;
// Lookup scanCode in buffer list for the current state and stateType // Lookup scanCode in buffer list for the current state and stateType
for ( uint8_t keyIndex = 0; keyIndex < macroTriggerListBufferSize; keyIndex++ ) for ( var_uint_t keyIndex = 0; keyIndex < macroTriggerListBufferSize; keyIndex++ )
{ {
if ( macroTriggerListBuffer[ keyIndex ].scanCode == scanCode ) if ( macroTriggerListBuffer[ keyIndex ].scanCode == scanCode )
{ {
@ -905,7 +905,7 @@ TriggerMacroEval Macro_evalTriggerMacro( var_uint_t triggerMacroIndex )
TriggerMacroVote vote = TriggerMacroVote_Invalid; TriggerMacroVote vote = TriggerMacroVote_Invalid;
// Iterate through the key buffer, comparing to each key in the combo // Iterate through the key buffer, comparing to each key in the combo
for ( uint8_t key = 0; key < macroTriggerListBufferSize; key++ ) for ( var_uint_t key = 0; key < macroTriggerListBufferSize; key++ )
{ {
// Lookup key information // Lookup key information
TriggerGuide *keyInfo = &macroTriggerListBuffer[ key ]; TriggerGuide *keyInfo = &macroTriggerListBuffer[ key ];
@ -1065,7 +1065,7 @@ inline ResultMacroEval Macro_evalResultMacro( var_uint_t resultMacroIndex )
inline void Macro_updateTriggerMacroPendingList() inline void Macro_updateTriggerMacroPendingList()
{ {
// Iterate over the macroTriggerListBuffer to add any new Trigger Macros to the pending list // Iterate over the macroTriggerListBuffer to add any new Trigger Macros to the pending list
for ( uint8_t key = 0; key < macroTriggerListBufferSize; key++ ) for ( var_uint_t key = 0; key < macroTriggerListBufferSize; key++ )
{ {
// TODO LED States // TODO LED States
// TODO Analog Switches // TODO Analog Switches
@ -1586,7 +1586,7 @@ void cliFunc_macroList( char* args )
info_msg("Pending Key Events: "); info_msg("Pending Key Events: ");
printInt16( (uint16_t)macroTriggerListBufferSize ); printInt16( (uint16_t)macroTriggerListBufferSize );
print(" : "); print(" : ");
for ( uint8_t key = 0; key < macroTriggerListBufferSize; key++ ) for ( var_uint_t key = 0; key < macroTriggerListBufferSize; key++ )
{ {
printHex( macroTriggerListBuffer[ key ].scanCode ); printHex( macroTriggerListBuffer[ key ].scanCode );
print(" "); print(" ");