Basic matrix module for the hall effect keypad now working.

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

diff --git a/Scan/matrix/scan_loop.c b/Scan/matrix/scan_loop.c
index d47fd2cc53e99d553c11a9f654c8e519e66c6815..7e0121a8a1417dc106bb4fbd4b165ba07054c1af 100644 (file)
--- a/Scan/matrix/scan_loop.c
+++ b/Scan/matrix/scan_loop.c
@@ -21,8 +21,16 @@
 
 // ----- Includes -----
 
+// AVR Includes
+#include <avr/interrupt.h>
+
+// Project Includes
+#include <led.h>
+#include <print.h>
+
 // Local Includes
 #include "scan_loop.h"
+#include "matrix_scan.h"
 
 
 
@@ -40,9 +48,8 @@
 // If the number of samples is higher than the sample threshold, flag the high bit, clear otherwise
 // This should be resetting VERY quickly, cutting off a potentially valid keypress is not an issue
 #define DEBOUNCE_ASSESS(table,size) \
-                       for ( uint8_t key = 1; key < size + 1; key++ ) {\
-                               table[key] = ( table[key] & ~(1 << 7) ) > SAMPLE_THRESHOLD ? (1 << 7) : 0x00; \
-                       } \
+                       for ( uint8_t key = 1; key < size + 1; key++ ) \
+                               table[key] = ( table[key] & ~(1 << 7) ) > SAMPLE_THRESHOLD ? (1 << 7) : 0x00
 
 
 
@@ -51,29 +58,39 @@
 // Keeps track of the number of scans, so we only do a debounce assess when it would be valid (as it throws away data)
 uint8_t scan_count = 0;
 
+// This is where the matrix scan data is held, as well as debouncing is evaluated to, which (depending on the read value) is handled
+//  by the macro module
+uint8_t KeyIndex_Array[KEYBOARD_SIZE + 1];
+
 
 
 // ----- Functions -----
 
 // Setup
-void scan_setup()
+inline void scan_setup()
 {
-       //matrix_pinSetup( matrix_pinout );
+       matrix_pinSetup( (uint8_t*)matrix_pinout );
 }
 
 // Main Detection Loop
-void scan_loop()
+inline uint8_t scan_loop()
 {
-       //matrix_scan( matrix_pinout, keyboardDetectArray );
-
        // Check count to see if the sample threshold may have been reached, otherwise collect more data
        if ( scan_count++ < MAX_SAMPLES )
-               return;
+       {
+               matrix_scan( (uint8_t*)matrix_pinout, KeyIndex_Array );
+
+               // Signal Main Detection Loop to continue scanning
+               return 0;
+       }
 
        // Reset Sample Counter
        scan_count = 0;
 
        // Assess debouncing sample table
-       //DEBOUNCE_ASSESS(keyDetectArray,KEYBOARD_SIZE)
+       DEBOUNCE_ASSESS( KeyIndex_Array, KeyIndex_Size );
+
+       // Ready to allow for USB send
+       return 1;
 }