Adding CLI and CDC Serial support for Teensy 2.0 and Teensy 2.0++

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

diff --git a/Scan/matrix/scan_loop.c b/Scan/matrix/scan_loop.c
index a7389a6699baf8e4374552945a0ddcb59d2a2e45..e9d8de2bfdc53ae7b1213b0b8126ded8922cacef 100644 (file)
--- a/Scan/matrix/scan_loop.c
+++ b/Scan/matrix/scan_loop.c
@@ -1,15 +1,15 @@
-/* Copyright (C) 2011 by Jacob Alexander
- * 
+/* Copyright (C) 2011-2012,2014 by Jacob Alexander
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -21,8 +21,8 @@
 
 // ----- Includes -----
 
-// AVR Includes
-#include <avr/interrupt.h>
+// Compiler Includes
+#include <Lib/ScanLib.h>
 
 // Project Includes
 #include <led.h>
@@ -37,8 +37,11 @@
 // ----- Defines -----
 
 // Debouncing Defines
-#define SAMPLE_THRESHOLD 110
-#define MAX_SAMPLES      127 // Max is 127, reaching 128 is very bad
+// Old
+//#define SAMPLE_THRESHOLD 110
+//#define MAX_SAMPLES      127 // Max is 127, reaching 128 is very bad
+#define SAMPLE_THRESHOLD 6
+#define MAX_SAMPLES      10 // Max is 127, reaching 128 is very bad
 
 
 
@@ -56,6 +59,7 @@
 // Buffer used to inform the macro processing module which keys have been detected as pressed
 volatile uint8_t KeyIndex_Buffer[KEYBOARD_BUFFER];
 volatile uint8_t KeyIndex_BufferUsed;
+volatile uint8_t KeyIndex_Add_InputSignal; // Used to pass the (click/input value) to the keyboard for the clicker
 
 
 // Keeps track of the number of scans, so we only do a debounce assess when it would be valid (as it throws away data)
@@ -63,7 +67,7 @@ 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];
+uint8_t KeyIndex_Array[KEYBOARD_KEYS + 1];
 
 
 
@@ -103,11 +107,51 @@ inline uint8_t scan_loop()
        // This should be resetting VERY quickly, cutting off a potentially valid keypress is not an issue
        for ( uint8_t key = 1; key < KeyIndex_Size + 1; key++ ) if ( ( KeyIndex_Array[key] & ~(1 << 7) ) > SAMPLE_THRESHOLD )
        {
-               bufferAdd( key );
+               // Debug output (keypress detected)
+               char tmpStr[6];
+               hexToStr( key, tmpStr );
+               dPrintStrs( tmpStr, " " );
+
+               // Add the key to the buffer, if it isn't already in the current Key Buffer
+               for ( uint8_t c = 0; c < KeyIndex_BufferUsed + 1; c++ )
+               {
+                       // Key isn't in the buffer yet
+                       if ( c == KeyIndex_BufferUsed )
+                       {
+                               bufferAdd( key );
+                               break;
+                       }
+
+                       // Key already in the buffer
+                       if ( KeyIndex_Buffer[c] == key )
+                               break;
+               }
+
                KeyIndex_Array[key] = (1 << 7);
        }
        else
        {
+               // Remove the key from the buffer only if it was previously known to be pressed
+               if ( KeyIndex_Array[key] & (1 << 7 ) )
+               {
+                       // Check for the released key, and shift the other keys lower on the buffer
+                       for ( uint8_t c = 0; c < KeyIndex_BufferUsed; c++ )
+                       {
+                               // Key to release found
+                               if ( KeyIndex_Buffer[c] == key )
+                               {
+                                       // Shift keys from c position
+                                       for ( uint8_t k = c; k < KeyIndex_BufferUsed - 1; k++ )
+                                               KeyIndex_Buffer[k] = KeyIndex_Buffer[k + 1];
+
+                                       // Decrement Buffer
+                                       KeyIndex_BufferUsed--;
+
+                                       break;
+                               }
+                       }
+               }
+
                KeyIndex_Array[key] = 0x00;
        }
 
@@ -115,3 +159,24 @@ inline uint8_t scan_loop()
        return 1;
 }
 
+
+// Signal that the keys have been properly sent over USB
+inline void scan_finishedWithUSBBuffer( uint8_t sentKeys )
+{
+       return;
+}
+
+
+// Signal KeyIndex_Buffer that it has been fully scanned using the macro module
+inline void scan_finishedWithBuffer( uint8_t sentKeys )
+{
+       return;
+}
+
+// Send data to keyboard
+// Not used in this module
+uint8_t scan_sendData( uint8_t dataPayload )
+{
+       return 0;
+}
+