aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/maxipad/config.h
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/maxipad/config.h')
-rw-r--r--keyboards/maxipad/config.h22
1 files changed, 22 insertions, 0 deletions
diff --git a/keyboards/maxipad/config.h b/keyboards/maxipad/config.h
index a056e4963..4377a892e 100644
--- a/keyboards/maxipad/config.h
+++ b/keyboards/maxipad/config.h
@@ -32,6 +32,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROWS 5
#define MATRIX_COLS 6
+<<<<<<< HEAD
// Planck PCB default pin-out
// Change this to how you wired your keyboard
// COLS: Left to right, ROWS: Top to bottom
@@ -44,6 +45,27 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_COL_PINS { F6, C6, D7, F5, B4, B5 }
#define UNUSED_PINS
#endif
+=======
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+//Pro micro pinout
+ #define MATRIX_ROW_PINS { B6, B2, B3, B1, F7 }
+ #define MATRIX_COL_PINS { F4, C6, D7, F5, B4, B5 }
+ #define UNUSED_PINS
+//Teensy 2 pinout
+ //#define MATRIX_ROW_PINS { B6, F7, B2, B3, B1 }
+ //#define MATRIX_COL_PINS { F6, C6, D7, F5, B4, B5 }
+ //#define UNUSED_PINS
+
+>>>>>>> 102a830bbdb302eb0951ec7910ab7c9feae272d1
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW