summaryrefslogtreecommitdiffstats
path: root/keyboards/mechmini/mechmini.h
diff options
context:
space:
mode:
authorTurboMech <sarmstrong240@gmail.com>2018-01-03 11:48:09 +0100
committerJack Humbert <jack.humb@gmail.com>2018-01-03 16:32:53 +0100
commit9cb1d36974b7ea4c380c0b7818812f6f5aae56c1 (patch)
tree161b1b36ac787aed9f7c7959dd756315c435dcbc /keyboards/mechmini/mechmini.h
parent0a5d302622b440183fbb42593fd07c4da11abba3 (diff)
downloadqmk_firmware-9cb1d36974b7ea4c380c0b7818812f6f5aae56c1.tar.gz
qmk_firmware-9cb1d36974b7ea4c380c0b7818812f6f5aae56c1.tar.xz
Added Mechmini 2.0 to Mechmini keyboard folder
This creates a v1 and v2 subproject. V1 retains all the same implementations of the bootmapper-ported Mechmnini 1 including #2196. V2 adds the Mechmini 2.0 kayboard support (I know it took me way to long to get it a pull request in). All readme's updated to reflect compiling the two seperate keyboards. Simply either `make mechmini/v1:default` or `make mechmini/v2:defualt`. Utilizing the rules.mk using `make mechmini:default` will automatically create the Mechmini 2 default keymap as this is the current version and has a much wider user base.
Diffstat (limited to 'keyboards/mechmini/mechmini.h')
-rw-r--r--keyboards/mechmini/mechmini.h54
1 files changed, 21 insertions, 33 deletions
diff --git a/keyboards/mechmini/mechmini.h b/keyboards/mechmini/mechmini.h
index 2890fad7a..637021cd2 100644
--- a/keyboards/mechmini/mechmini.h
+++ b/keyboards/mechmini/mechmini.h
@@ -1,42 +1,30 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-
-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/>.
+/* Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
+ * Copyright 2018 TurboMech /u/TurboMech <discord> @A9entOran9e#6134
+ * 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 MECHMINI_H
#define MECHMINI_H
-#include "keycode.h"
-#include "action.h"
#include "quantum.h"
-#define KEYMAP( \
- K03, K13, K23, K33, K43, K53, K26, KC6, KC7, K27, KA3, KB3, \
- K02, K12, K22, K32, K42, K52, K36, KD6, KD7, K37, KA2, \
- K01, K11, K21, K31, K41, K51, K46, KE6, KE7, K47, KA1, \
- K00, K10, K20, K56, K57, KB0, KC0, K66 \
-) \
-{ \
- { K00, K10, K20, K56, KC_NO, K57, KC_NO, KC_NO, KB0, KC0, K66, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { K01, K11, K21, K31, K41, K51, K46, KE6, KE7, K47, KA1, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { K02, K12, K22, K32, K42, K52, K36, KD6, KD7, K37, KA2, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { K03, K13, K23, K33, K43, K53, K26, KC6, KC7, K27, KA3, KB3, KC_NO, KC_NO, KC_NO }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
-}
+#ifdef KEYBOARD_mechmini_v1
+ #include "v1.h"
+#endif
+
+#ifdef KEYBOARD_mechmini_v2
+ #include "v2.h"
+#endif
#endif