Basic matrix module for the hall effect keypad now working.

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

diff --git a/Macro/basic/macro.c b/Macro/basic/macro.c
index a74cf309eefe768d273300e842503726732d2ea7..c70470824c3e8d1e95702751afd4bb45bd05f610 100644 (file)
--- a/Macro/basic/macro.c
+++ b/Macro/basic/macro.c
@@ -24,6 +24,7 @@
 // AVR Includes
 
 // Project Includes
+#include <led.h>
 #include <print.h>
 #include <scan_loop.h>
 #include <usb_com.h>
@@ -41,46 +42,57 @@
 
 // Given a sampling array, and the current number of detected keypress
 // Add as many keypresses from the sampling array to the USB key send array as possible.
-void keyPressDetection( uint8_t *keys, uint8_t *validKeys, uint8_t numberOfKeys, uint8_t *modifiers, uint8_t numberOfModifiers, uint8_t *map )
+inline void keyPressDetection( uint8_t *keys, uint8_t numberOfKeys, uint8_t *modifiers, uint8_t numberOfModifiers, uint8_t *map )
 {
-       for ( uint8_t key = 0; key < numberOfKeys + 1; key++ ) {
-               if ( keys[key] & (1 << 7) ) {
-                       // TODO Debug Out
-                       uint8_t modFound = 0;
+       USBKeys_Sent = 0;
+
+       // Parse the detection array starting from 1 (all keys are purposefully mapped from 1 -> total as per typical PCB labels)
+       for ( uint8_t key = 0; key < numberOfKeys + 1; key++ )
+       {
+               if ( keys[key] & (1 << 7) )
+               {
+                       // Display the detected scancode
+                       char tmpStr[4];
+                       int8ToStr( key, tmpStr );
+                       dPrintStrs( tmpStr, " " );
 
                        // Determine if the key is a modifier
+                       uint8_t modFound = 0;
                        for ( uint8_t mod = 0; mod < numberOfModifiers; mod++ ) {
                                // Modifier found
                                if ( modifiers[mod] == key ) {
-                                       USBKeys_Modifiers |= map[key];
+                                       //USBKeys_Modifiers |= map[key];
                                        modFound = 1;
                                        break;
                                }
                        }
+
+                       // Modifier, already done this loop
                        if ( modFound )
                                continue;
 
                        // Too many keys
-                       if ( *validKeys >= USBKeys_MaxSize )
+                       if ( USBKeys_Sent >= USBKeys_MaxSize )
+                       {
+                               info_print("USB Key limit reached");
+                               errorLED( 1 );
                                break;
+                       }
 
                        // Allow ignoring keys with 0's
                        if ( map[key] != 0 )
-                               USBKeys_Array[(*validKeys)++] = map[key];
+                               USBKeys_Array[USBKeys_Sent++] = map[key];
                }
        }
+
+       // Add debug separator if keys sent via USB
+       if ( USBKeys_Sent > 0 )
+               print("\033[1;32m|\033[0m\n");
 }
 
-void process_macros(void)
+inline void process_macros(void)
 {
-       // Layout Setup
-       uint8_t validKeys = 0;
-
-       uint8_t *keyboard_MODMASK = keyboard_modifierMask;
-       uint8_t  keyboard_NUMMODS = MODIFIERS_KEYBOARD;
-       uint8_t *keyboard_MAP     = defaultMap;
-
        // Debounce Sampling Array to USB Data Array
-       keyPressDetection( KeyIndex_Array, &validKeys, KeyIndex_Size, keyboard_MODMASK, keyboard_NUMMODS, keyboard_MAP );
+       keyPressDetection( KeyIndex_Array, KeyIndex_Size, MODIFIER_MASK, sizeof(MODIFIER_MASK), KEYINDEX_MASK );
 }