Updating convenience build scripts to build Left and Right sides

[kiibohd-controller.git] / Scan / MD1 / scan_loop.c

diff --git a/Scan/MD1/scan_loop.c b/Scan/MD1/scan_loop.c
index 9d28055429794d2554344bfd315d8b42579d345b..22d43c2a26987586abe48c2f6c1d73cb40dd6c21 100644 (file)
--- a/Scan/MD1/scan_loop.c
+++ b/Scan/MD1/scan_loop.c
@@ -29,10 +29,10 @@
 #include <led.h>
 #include <print.h>
 #include <matrix_scan.h>
+#include <macro.h>
 
 // Local Includes
 #include "scan_loop.h"
-#include "macro.h"
 
 
 
@@ -46,9 +46,10 @@ void cliFunc_echo( char* args );
 // ----- Variables -----
 
 // Scan Module command dictionary
-const char scanCLIDictName[] = "Scan Module Commands";
-const CLIDictItem scanCLIDict[] = {
-       { "echo",        "Example command, echos the arguments.", cliFunc_echo },
+CLIDict_Entry( echo,        "Example command, echos the arguments." );
+
+CLIDict_Def( scanCLIDict, "Scan Module Commands" ) = {
+       CLIDict_Item( echo ),
        { 0, 0, 0 } // Null entry for dictionary end
 };
 
@@ -97,6 +98,84 @@ inline void Scan_finishedWithOutput( uint8_t sentKeys )
 }
 
 
+
+// ----- Capabilities -----
+
+// Custom capability examples
+// Refer to kll.h in Macros/PartialMap for state and stateType information
+void CustomAction_action1_capability( uint8_t state, uint8_t stateType, uint8_t *args )
+{
+       // Display capability name
+       // XXX This is required for debug cli to give you a list of capabilities
+       if ( stateType == 0xFF && state == 0xFF )
+       {
+               print("CustomAction_action1_capability()");
+               return;
+       }
+
+       // Prints Action1 info message to the debug cli
+       info_print("Action1");
+}
+
+uint8_t CustomAction_blockHold_storage = 0;
+void CustomAction_blockHold_capability( uint8_t state, uint8_t stateType, uint8_t *args )
+{
+       // Display capability name
+       if ( stateType == 0xFF && state == 0xFF )
+       {
+               print("CustomAction_blockHold_capability(usbCode)");
+               return;
+       }
+
+       // Retrieve 8-bit argument
+       uint8_t key = args[0];
+
+       // We only care about normal keys
+       if ( stateType == 0x00 )
+       {
+               // Block given key if we're in the "Press" or "Hold" state
+               if ( ( state == 0x01 || state == 0x02 )
+                       && CustomAction_blockHold_storage == 0 )
+               {
+                       CustomAction_blockHold_storage = key;
+                       info_msg("Blocking Key: ");
+                       printHex( key );
+                       print( NL );
+               }
+               // Release if in the "Off" or "Release" state and we're blocking
+               else if ( ( state == 0x00 || state == 0x03 )
+                       && key == CustomAction_blockHold_storage )
+               {
+                       info_msg("Unblocking Key: ");
+                       printHex( CustomAction_blockHold_storage );
+                       print( NL );
+                       CustomAction_blockHold_storage = 0;
+               }
+       }
+}
+
+void CustomAction_blockKey_capability( uint8_t state, uint8_t stateType, uint8_t *args )
+{
+       // Display capability name
+       if ( stateType == 0xFF && state == 0xFF )
+       {
+               print("CustomAction_blockKey_capability(usbCode)");
+               return;
+       }
+
+       // Retrieve 8-bit argument
+       uint8_t key = args[0];
+
+       // If key is not blocked, process
+       if ( key != CustomAction_blockHold_storage )
+       {
+               extern void Output_usbCodeSend_capability( uint8_t state, uint8_t stateType, uint8_t *args );
+               Output_usbCodeSend_capability( state, stateType, &key );
+       }
+}
+
+
+
 // ----- CLI Command Functions -----
 
 // XXX Just an example command showing how to parse arguments (more complex than generally needed)