X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Scan%2FBudKeypad%2Fmatrix.h;h=6c74e2d37f5f3cf616f4dc6ffbdf68bcdd5b163e;hb=5f262ea4b68a07e9b94ce0a49c0f7196e5f32b3b;hp=14306236280daf91e91401c0463c853ff296abb7;hpb=e3042a3526f59d767cfa276231668382ead758e4;p=kiibohd-controller.git

diff --git a/Scan/BudKeypad/matrix.h b/Scan/BudKeypad/matrix.h
index 1430623..6c74e2d 100644
--- a/Scan/BudKeypad/matrix.h
+++ b/Scan/BudKeypad/matrix.h
@@ -1,15 +1,15 @@
-/* Copyright (C) 2011 by Jacob Alexander
- * 
+/* Copyright (C) 2011,2015 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
@@ -19,8 +19,7 @@
  * THE SOFTWARE.
  */
 
-#ifndef __MATRIX_H
-#define __MATRIX_H
+#pragma once
 
 // ----- Includes -----
 
@@ -36,7 +35,7 @@
 
 // ----- Key Settings -----
 
-#define KEYBOARD_SIZE 16 // # of keys
+#define KEYBOARD_KEYS 16 // # of keys
 #define MAX_ROW_SIZE  16 // # of keys in the largest row
 #define MAX_COL_SIZE   1 // # of keys in the largest column
 
@@ -50,7 +49,7 @@ static const uint8_t matrix_pinout[][MAX_ROW_SIZE + 1] = {
 // Just layout the matrix by rows and columns
 // Usually you'll want to set the scanMode above to scanDual or scanCol_powrRow/scanRow_powrCol
 // The mode allows for optimization in the kind of scanning algorithms that are done
-// 
+//
 // The key numbers are used to translate into the keymap table (array) (and always start from 1, not 0).
 // Thus if a row doesn't use all the key positions, you can denote it as 0, which will be ignored/skipped on each scan
 // See the keymap.h file for the various preconfigured arrays.
@@ -74,7 +73,3 @@ static const uint8_t matrix_pinout[][MAX_ROW_SIZE + 1] = {
 
 };
 
-
-
-#endif // __MATRIX_H
-