Code cleanup

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

diff --git a/Scan/SKM67001/matrix.h b/Scan/SKM67001/matrix.h
index ebb2833fa99b2c19cabdbf0a8752a6903ea41a0b..26f9cb64a4f1a9528b4b50e89a74519826a60bef 100644 (file)
--- a/Scan/SKM67001/matrix.h
+++ b/Scan/SKM67001/matrix.h
@@ -1,15 +1,15 @@
-/* Copyright (C) 2012 by Jacob Alexander
- * 
+/* Copyright (C) 2012,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 85 // # of keys (It actually has 66, but there are markings up to 80 on the PCB); 85 due to there being 5 "switch" keys, that have no numbers
+#define KEYBOARD_KEYS 85 // # of keys (It actually has 66, but there are markings up to 80 on the PCB); 85 due to there being 5 "switch" keys, that have no numbers
 #define MAX_ROW_SIZE   9 // # of keys in the largest row
 #define MAX_COL_SIZE   9 // # of keys in the largest column
 
@@ -73,7 +72,3 @@ static const uint8_t matrix_pinout[][MAX_ROW_SIZE + 1] = {
 
 };
 
-
-
-#endif // __MATRIX_H
-