Merge branch 'layer_stack'

[tmk_firmware.git] / common / keyboard.c

diff --git a/common/keyboard.c b/common/keyboard.c
index 5e9945baf450eb1f8ca66441c1800da1de35b7d6..e4bc3dc8c26fadf01fff978c633c2dfe3c163743 100644 (file)
--- a/common/keyboard.c
+++ b/common/keyboard.c
@@ -14,6 +14,8 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
+#include <stdint.h>
+#include <util/delay.h>
 #include "keyboard.h"
 #include "matrix.h"
 #include "keymap.h"
@@ -40,8 +42,15 @@ void keyboard_init(void)
     timer_init();
     matrix_init();
 
-    /* boot magic keys goes here */
+    /* matrix scan for boot magic keys */
+#ifdef DEBOUNCE
+    uint8_t scan = DEBOUNCE * 2;
+    while (scan--) { matrix_scan(); _delay_ms(1); }
+#else
     matrix_scan();
+#endif
+
+    /* boot magic keys */
 #ifdef IS_BOOTMAGIC_BOOTLOADER
     /* kick up bootloader */
     if (IS_BOOTMAGIC_BOOTLOADER()) bootloader_jump();
@@ -76,7 +85,7 @@ void keyboard_task(void)
             for (uint8_t c = 0; c < MATRIX_COLS; c++) {
                 if (matrix_change & ((matrix_row_t)1<<c)) {
                     action_exec((keyevent_t){
-                        .key.pos  = (keypos_t){ .row = r, .col = c },
+                        .key = (key_t){ .row = r, .col = c },
                         .pressed = (matrix_row & (1<<c)),
                         .time = (timer_read() | 1) /* time should not be 0 */
                     });