Merge remote-tracking branch 'upstream/master'

[kiibohd-controller.git] / Scan / IBMConvertible / matrix.h

diff --git a/Scan/IBMConvertible/matrix.h b/Scan/IBMConvertible/matrix.h
index 5802d6f1aa0ea16d11852d4ddeee447c444cad7e..190e588daabb4adca6bb7e132bda517a84634fb9 100644 (file)
--- a/Scan/IBMConvertible/matrix.h
+++ b/Scan/IBMConvertible/matrix.h
@@ -1,15 +1,15 @@
 /* Copyright (C) 2012 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
@@ -36,7 +36,7 @@
 
 // ----- Key Settings -----
 
-#define KEYBOARD_SIZE 90 // # of keys (It actually has 78, but there are markings up to 81 on the PCB and scan lines enough for 90
+#define KEYBOARD_KEYS 90 // # of keys (It actually has 78, but there are markings up to 81 on the PCB and scan lines enough for 90
 #define MAX_ROW_SIZE   6 // # of rows
 #define MAX_COL_SIZE  15 // # of columns