summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-01-06 05:53:27 +0000
committerQMK Bot <hello@qmk.fm>2021-01-06 05:53:27 +0000
commit531d30575f1a50a7db76b497fde176448f49cfae (patch)
treec99d202702b6b116dadec02310ab30aa46743b98
parent7389b10867b739302749d6570ff9a12961388f92 (diff)
parent11599bea934749d6894b403ed75951861917388a (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/jian/keymaps/left_hand/config.h22
-rw-r--r--keyboards/jian/keymaps/left_hand/keymap.c71
-rw-r--r--keyboards/jian/keymaps/left_hand/rules.mk2
-rw-r--r--keyboards/jian/readme.md1
-rw-r--r--keyboards/jian/rev2/readme.md1
-rw-r--r--keyboards/jian/rev2/rev2.h19
6 files changed, 116 insertions, 0 deletions
diff --git a/keyboards/jian/keymaps/left_hand/config.h b/keyboards/jian/keymaps/left_hand/config.h
new file mode 100644
index 0000000000..4d9cb17cac
--- /dev/null
+++ b/keyboards/jian/keymaps/left_hand/config.h
@@ -0,0 +1,22 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+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/>.
+*/
+#pragma once
+
+#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/jian/keymaps/left_hand/keymap.c b/keyboards/jian/keymaps/left_hand/keymap.c
new file mode 100644
index 0000000000..d2518a2535
--- /dev/null
+++ b/keyboards/jian/keymaps/left_hand/keymap.c
@@ -0,0 +1,71 @@
+ /* Copyright 2020 KGOH
+ *
+ * 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
+
+enum jian_layers {
+ _DFLT_L,
+ _DFLT_R,
+ _RAIS_L,
+ _RAIS_R,
+ _LOWR_L,
+ _LOWR_R,
+ _ADJUST
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_DFLT_L] = LAYOUT_symmetric_left(
+ KC_LSFT, LGUI_T(KC_GRV), KC_Q, KC_W, KC_E, KC_R, KC_T,
+ KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G,
+ KC_LALT, KC_Z, KC_X, KC_C, KC_V, KC_B,
+ LT(_RAIS_L, KC_BSPC), LT(_DFLT_R, KC_SPC), LT(_LOWR_L, KC_ENT)
+),
+[_DFLT_R] = LAYOUT_symmetric_right(
+ KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,
+ KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
+ KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_BSLS,
+ LT(_LOWR_R, KC_ESC), _______, LT(_RAIS_R, KC_DEL)
+),
+[_RAIS_L] = LAYOUT_symmetric_left(
+ _______, LGUI_T(KC_CAPS), KC_SLCK, KC_HOME, KC_PSCR, KC_PGUP, KC_VOLU,
+ LCTL_T(KC_APP), KC_INS, KC_LEFT, KC_UP, KC_RGHT, KC_MUTE,
+ _______, KC_PAUS, KC_END, KC_DOWN, KC_PGDN, KC_VOLD,
+ _______, LT(_RAIS_R, KC_TAB) , LT(_ADJUST, KC_ESC)
+),
+[_RAIS_R] = LAYOUT_symmetric_left(
+ KC_RSFT, KC_RGUI, XXXXXXX, KC_F7, KC_F8, KC_F9, KC_F10,
+ KC_RCTL, XXXXXXX, KC_F4, KC_F5, KC_F6, KC_F11,
+ KC_LALT, XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F12,
+ LT(_ADJUST, KC_DEL), _______, _______
+),
+[_LOWR_L] = LAYOUT_symmetric_left(
+ _______, _______, XXXXXXX, KC_7, KC_8, KC_9, KC_0,
+ _______, KC_GRV, KC_4, KC_5, KC_6, KC_MINS,
+ _______, KC_0, KC_1, KC_2, KC_3, KC_EQL,
+ LT(_ADJUST, KC_DEL), LT(_LOWR_R, KC_TAB), _______
+),
+[_LOWR_R] = LAYOUT_symmetric_left(
+ _______, _______, XXXXXXX, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
+ _______, KC_TILD, KC_DLR, KC_PERC, KC_CIRC, KC_UNDS,
+ _______, KC_LPRN, KC_EXLM, KC_AT, KC_HASH, KC_PLUS,
+ _______, _______, LT(_ADJUST, KC_ESC)
+),
+[_ADJUST] = LAYOUT_symmetric_left(
+ RESET, DEBUG, XXXXXXX, BL_INC, RGB_VAI, RGB_HUD, RGB_HUI,
+ XXXXXXX, XXXXXXX, BL_DEC, RGB_VAD, RGB_SAD, RGB_SAI,
+ XXXXXXX, BL_BRTG, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD,
+ _______, _______, _______
+)
+};
diff --git a/keyboards/jian/keymaps/left_hand/rules.mk b/keyboards/jian/keymaps/left_hand/rules.mk
new file mode 100644
index 0000000000..7756f08359
--- /dev/null
+++ b/keyboards/jian/keymaps/left_hand/rules.mk
@@ -0,0 +1,2 @@
+AUTO_SHIFT_ENABLE = yes
+EXTRAKEY_ENABLE = yes
diff --git a/keyboards/jian/readme.md b/keyboards/jian/readme.md
index 7258e31c1a..cb68cfdd16 100644
--- a/keyboards/jian/readme.md
+++ b/keyboards/jian/readme.md
@@ -6,6 +6,7 @@
You can assemble the keyboard without a mounting plate.
Jian also supports RGB LED underglow (with a strip like WS2812B) and single color in-switch LED backlight.
Each half can work standalone.
+Last GB version is the rev2.
* Keyboard Maintainer: [KGOH](https://github.com/KGOH)
* Hardware Supported: Jian PCB rev1, rev2, Pro Micro
diff --git a/keyboards/jian/rev2/readme.md b/keyboards/jian/rev2/readme.md
new file mode 100644
index 0000000000..d02c35e960
--- /dev/null
+++ b/keyboards/jian/rev2/readme.md
@@ -0,0 +1 @@
+This is GB revision
diff --git a/keyboards/jian/rev2/rev2.h b/keyboards/jian/rev2/rev2.h
index 9dfb7240b1..d71fc8495d 100644
--- a/keyboards/jian/rev2/rev2.h
+++ b/keyboards/jian/rev2/rev2.h
@@ -37,3 +37,22 @@
{K20, K21, K22, K23, K24, K25 }, \
{XXX, XXX, K32, K33, K34, K35 } \
}
+
+#define LAYOUT_symmetric_left LAYOUT_symmetric
+
+#define LAYOUT_symmetric_right( \
+ K04, K03, K02, K12, K01, K00, K20, \
+ K05, K14, K13, K22, K11, K10, \
+ K15, K24, K23, K33, K32, K21, \
+ K35, K25, K34 \
+) \
+{ \
+ {K00, K01, K02, K03, K04, K05 }, \
+ {K10, K11, K12, K13, K14, K15 }, \
+ {K20, K21, K22, K23, K24, K25 }, \
+ {XXX, XXX, K32, K33, K34, K35 }, \
+ {K00, K01, K02, K03, K04, K05 }, \
+ {K10, K11, K12, K13, K14, K15 }, \
+ {K20, K21, K22, K23, K24, K25 }, \
+ {XXX, XXX, K32, K33, K34, K35 } \
+}