Merge branch 'master' into debounce_refactor

# Conflicts:
#	tmk_core/common/keyboard.c

1 files changed, 71 insertions, 0 deletions

diff --git a/keyboards/panc60/panc60.h b/keyboards/panc60/panc60.h
new file mode 100644
index 000000000..95dcb1f90
--- /dev/null
+++ b/keyboards/panc60/panc60.h
@@ -0,0 +1,71 @@
+/* Copyright 2018 MechMerlin
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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/>.
+ */
+#ifndef PANC60_H
+#define PANC60_H
+
+#include "quantum.h"
+
+/* This a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second  converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_all( \
+	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
+	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      \
+	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,      \
+	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
+	K40, K41, K42,                     K47,      K49, K4A, K4B, K4C, K4D       \
+) { \
+	{ K00, K01, K02, K03,   K04,   K05,   K06,   K07,  K08,   K09, K0A, K0B, K0C,   K0D, K0E },   \
+	{ K10, K11, K12, K13,   K14,   K15,   K16,   K17,  K18,   K19, K1A, K1B, K1C,   K1D, KC_NO }, \
+	{ K20, K21, K22, K23,   K24,   K25,   K26,   K27,  K28,   K29, K2A, K2B, KC_NO, K2D, KC_NO }, \
+	{ K30, K31, K32, K33,   K34,   K35,   K36,   K37,  K38,   K39, K3A, K3B, K3C,   K3D, K3E },   \
+	{ K40, K41, K42, KC_NO, KC_NO, KC_NO, KC_NO, K47,  KC_NO, K49, K4A, K4B, K4C,   K4D, KC_NO }  \
+}
+
+#define LAYOUT_60_ansi( \
+	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, \
+	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      \
+	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,      \
+	K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,      \
+	K40, K41, K42,                     K47,      K49, K4A,      K4C, K4D       \
+) { \
+	{ K00, K01,   K02,  K03,   K04,   K05,   K06,   K07,  K08,   K09, K0A, K0B,   K0C,   KC_NO, K0E },   \
+	{ K10, K11,   K12,  K13,   K14,   K15,   K16,   K17,  K18,   K19, K1A, K1B,   K1C,   K1D,   KC_NO }, \
+	{ K20, K21,   K22,  K23,   K24,   K25,   K26,   K27,  K28,   K29, K2A, K2B,   KC_NO, K2D,   KC_NO }, \
+	{ K30, KC_NO, K32,  K33,   K34,   K35,   K36,   K37,  K38,   K39, K3A, K3B,   KC_NO, K3D,   KC_NO },   \
+	{ K40, K41,   K42,  KC_NO, KC_NO, KC_NO, KC_NO, K47,  KC_NO, K49, K4A, KC_NO, K4C,   K4D,   KC_NO }  \
+}
+
+#define LAYOUT_60_hhkb( \
+	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,  \
+	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,       \
+	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,       \
+	K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E,  \
+	     K41, K42,                     K47,           K4A,      K4C             \
+) { \
+	{ K00,   K01,   K02,  K03,   K04,   K05,   K06,   K07,  K08,   K09,   K0A, K0B,   K0C,   K0D,   K0E },   \
+	{ K10,   K11,   K12,  K13,   K14,   K15,   K16,   K17,  K18,   K19,   K1A, K1B,   K1C,   K1D,   KC_NO }, \
+	{ K20,   K21,   K22,  K23,   K24,   K25,   K26,   K27,  K28,   K29,   K2A, K2B,   KC_NO, K2D,   KC_NO }, \
+	{ K30,   KC_NO, K32,  K33,   K34,   K35,   K36,   K37,  K38,   K39,   K3A, K3B,   KC_NO, K3D,   K3E },   \
+	{ KC_NO, K41,   K42,  KC_NO, KC_NO, KC_NO, KC_NO, K47,  KC_NO, KC_NO, K4A, KC_NO, K4C,   KC_NO, KC_NO }  \
+}
+
+#endif