Merge remote-tracking branch 'origin/master' into develop

2 files changed, 34 insertions, 0 deletions

diff --git a/keyboards/meishi2/keymaps/via/keymap.c b/keyboards/meishi2/keymaps/via/keymap.c
new file mode 100644
index 0000000000..be706ea09a
--- /dev/null
+++ b/keyboards/meishi2/keymaps/via/keymap.c
@@ -0,0 +1,31 @@
+/* Copyright 2019 Biacco42
+ *
+ * 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/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT( /* Base */
+    LCTL(KC_Z),  LCTL(KC_X),  LCTL(KC_C), LCTL(KC_V)
+  ),
+  [1] = LAYOUT(
+    KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS
+  ),
+  [2] = LAYOUT(
+    KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS
+  ),
+  [3] = LAYOUT(
+    KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS
+  ),
+};
diff --git a/keyboards/meishi2/keymaps/via/rules.mk b/keyboards/meishi2/keymaps/via/rules.mk
new file mode 100644
index 0000000000..c859353a46
--- /dev/null
+++ b/keyboards/meishi2/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+CONSOLE_ENABLE = no
+COMMAND_ENABLE = no