Initial commit for UARTConnect module

[kiibohd-controller.git] / Macro / PartialMap / macro.c

diff --git a/Macro/PartialMap/macro.c b/Macro/PartialMap/macro.c
index 91198372035019503a8b7466894eac7703f80075..1bb68acb897313cc33c95243bf3d27567af37218 100644 (file)
--- a/Macro/PartialMap/macro.c
+++ b/Macro/PartialMap/macro.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 by Jacob Alexander
+/* Copyright (C) 2014-2015 by Jacob Alexander
  *
  * This file is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -121,9 +121,11 @@ uint8_t macroPauseMode = 0;
 uint16_t macroStepCounter = 0;
 
 
-// Key Trigger List Buffer
+// 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
 TriggerGuide macroTriggerListBuffer[ MaxScanCode ];
 uint8_t macroTriggerListBufferSize = 0;
+var_uint_t macroTriggerListLayerCache[ MaxScanCode ];
 
 // Pending Trigger Macro Index List
 //  * Any trigger macros that need processing from a previous macro processing loop
@@ -246,8 +248,7 @@ void Macro_layerLatch_capability( uint8_t state, uint8_t stateType, uint8_t *arg
 
        // Only use capability on press
        // TODO Analog
-       // XXX To make sense, this code be on press or release. Or it could even be a sticky shift (why? dunno) -HaaTa
-       if ( stateType == 0x00 && state != 0x01 ) // All normal key conditions except press
+       if ( stateType == 0x00 && state != 0x03 ) // Only on release
                return;
 
        // Get layer index from arguments
@@ -312,8 +313,24 @@ void Macro_layerShift_capability( uint8_t state, uint8_t stateType, uint8_t *arg
 
 // Looks up the trigger list for the given scan code (from the active layer)
 // NOTE: Calling function must handle the NULL pointer case
-nat_ptr_t *Macro_layerLookup( uint8_t scanCode )
+nat_ptr_t *Macro_layerLookup( TriggerGuide *guide, uint8_t latch_expire )
 {
+       uint8_t scanCode = guide->scanCode;
+
+       // TODO Analog
+       // If a normal key, and not pressed, do a layer cache lookup
+       if ( guide->type == 0x00 && guide->state != 0x01 )
+       {
+               // Cached layer
+               var_uint_t cachedLayer = macroTriggerListLayerCache[ scanCode ];
+
+               // Lookup map, then layer
+               nat_ptr_t **map = (nat_ptr_t**)LayerIndex[ cachedLayer ].triggerMap;
+               const Layer *layer = &LayerIndex[ cachedLayer ];
+
+               return map[ scanCode - layer->first ];
+       }
+
        // If no trigger macro is defined at the given layer, fallthrough to the next layer
        for ( uint16_t layerIndex = 0; layerIndex < macroLayerIndexStackSize; layerIndex++ )
        {
@@ -322,10 +339,10 @@ nat_ptr_t *Macro_layerLookup( uint8_t scanCode )
 
                // Check if latch has been pressed for this layer
                // XXX Regardless of whether a key is found, the latch is removed on first lookup
-               uint8_t latch = LayerState[ layerIndex ] & 0x02;
-               if ( latch )
+               uint8_t latch = LayerState[ macroLayerIndexStack[ layerIndex ] ] & 0x02;
+               if ( latch && latch_expire )
                {
-                       LayerState[ layerIndex ] &= ~0x02;
+                       Macro_layerState( 0, 0, macroLayerIndexStack[ layerIndex ], 0x02 );
                }
 
                // Only use layer, if state is valid
@@ -343,6 +360,9 @@ nat_ptr_t *Macro_layerLookup( uint8_t scanCode )
                          && scanCode >= layer->first
                          && *map[ scanCode - layer->first ] != 0 )
                        {
+                               // Set the layer cache
+                               macroTriggerListLayerCache[ scanCode ] = macroLayerIndexStack[ layerIndex ];
+
                                return map[ scanCode - layer->first ];
                        }
                }
@@ -360,6 +380,9 @@ nat_ptr_t *Macro_layerLookup( uint8_t scanCode )
          && scanCode >= layer->first
          && *map[ scanCode - layer->first ] != 0 )
        {
+               // Set the layer cache to default map
+               macroTriggerListLayerCache[ scanCode ] = 0;
+
                return map[ scanCode - layer->first ];
        }
 
@@ -370,6 +393,16 @@ nat_ptr_t *Macro_layerLookup( uint8_t scanCode )
 }
 
 
+// Update the scancode using a list of TriggerGuides
+// TODO Handle led state and analog
+inline void Macro_triggerState( void *triggers, uint8_t num )
+{
+       // Copy each of the TriggerGuides to the TriggerListBuffer
+       for ( uint8_t c = 0; c < num; c++ )
+               macroTriggerListBuffer[ macroTriggerListBufferSize++ ] = ((TriggerGuide*)triggers)[ c ];
+}
+
+
 // Update the scancode key state
 // States:
 //   * 0x00 - Off
@@ -617,7 +650,7 @@ inline TriggerMacroVote Macro_evalLongTriggerMacroVote( TriggerGuide *key, Trigg
 
 
 // Evaluate/Update TriggerMacro
-inline TriggerMacroEval Macro_evalTriggerMacro( var_uint_t triggerMacroIndex )
+TriggerMacroEval Macro_evalTriggerMacro( var_uint_t triggerMacroIndex )
 {
        // Lookup TriggerMacro
        const TriggerMacro *macro = &TriggerMacroList[ triggerMacroIndex ];
@@ -832,8 +865,12 @@ inline void Macro_updateTriggerMacroPendingList()
                if ( macroTriggerListBuffer[ key ].state == 0x00 && macroTriggerListBuffer[ key ].state != 0x01 )
                        continue;
 
+               // TODO Analog
+               // If this is a release case, indicate to layer lookup for possible latch expiry
+               uint8_t latch_expire = macroTriggerListBuffer[ key ].state == 0x03;
+
                // Lookup Trigger List
-               nat_ptr_t *triggerList = Macro_layerLookup( macroTriggerListBuffer[ key ].scanCode );
+               nat_ptr_t *triggerList = Macro_layerLookup( &macroTriggerListBuffer[ key ], latch_expire );
 
                // Number of Triggers in list
                nat_ptr_t triggerListSize = triggerList[0];
@@ -1003,7 +1040,7 @@ inline void Macro_setup()
 void cliFunc_capList( char* args )
 {
        print( NL );
-       info_msg("Capabilities List");
+       info_msg("Capabilities List ");
        printHex( CapabilitiesNum );
 
        // Iterate through all of the capabilities and display them