diff options
Diffstat (limited to 'keyboards/jian')
-rw-r--r-- | keyboards/jian/.noci | 0 | ||||
-rw-r--r-- | keyboards/jian/handwired/.noci | 0 | ||||
-rw-r--r-- | keyboards/jian/keymaps/advanced/keymap.c | 12 | ||||
-rw-r--r-- | keyboards/jian/keymaps/default/keymap.c | 8 | ||||
-rw-r--r-- | keyboards/jian/keymaps/left_hand/keymap.c | 6 | ||||
-rw-r--r-- | keyboards/jian/keymaps/via/keymap.c | 6 | ||||
-rw-r--r-- | keyboards/jian/nsrev2/config.h | 11 | ||||
-rw-r--r-- | keyboards/jian/rev1/.noci | 0 | ||||
-rw-r--r-- | keyboards/jian/rev1/config.h | 14 | ||||
-rw-r--r-- | keyboards/jian/rev2/config.h | 13 |
10 files changed, 47 insertions, 23 deletions
diff --git a/keyboards/jian/.noci b/keyboards/jian/.noci deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/jian/.noci +++ /dev/null diff --git a/keyboards/jian/handwired/.noci b/keyboards/jian/handwired/.noci deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/jian/handwired/.noci +++ /dev/null diff --git a/keyboards/jian/keymaps/advanced/keymap.c b/keyboards/jian/keymaps/advanced/keymap.c index 721adaaee7..0c13b2d301 100644 --- a/keyboards/jian/keymaps/advanced/keymap.c +++ b/keyboards/jian/keymaps/advanced/keymap.c @@ -205,22 +205,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_RAISE] = LAYOUT( - _______, KC_NLCK, KC_PSLS, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_VOLU, KC_HOME, KC_PSCR, KC_PGUP, KC_SLCK, KC_CAPS, _______, + _______, KC_NUM, KC_PSLS, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_VOLU, KC_HOME, KC_PSCR, KC_PGUP, KC_SCRL, KC_CAPS, _______, EQL_LCT, KC_PAST, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_MUTE, KC_LEFT, KC_UP, KC_RGHT, KC_INS, APP_RCT, _______, KC_P0, KC_P1, KC_P2, KC_P3, KC_PCMM, KC_VOLD, KC_END, KC_DOWN, KC_PGDN, KC_PAUS, _______, _______, _______, _______, _______, _______, _______ ), [_ADJUST] = LAYOUT_symmetric( - QK_BOOT, DEBUG, KC_ASUP, CH_WMN, CH_CMK, CH_QWE, CH_DVK, - KC_ASRP, KC_ASTG, XXXXXXX, XXXXXXX, QWERTY, PLOVER, - BL_ADJ, KC_ASDN, XXXXXXX, XXXXXXX, ISO, THUMB_ALT, + QK_BOOT, DB_TOGG, AS_UP, CH_WMN, CH_CMK, CH_QWE, CH_DVK, + AS_RPT, AS_TOGG, XXXXXXX, XXXXXXX, QWERTY, PLOVER, + BL_ADJ, AS_DOWN, XXXXXXX, XXXXXXX, ISO, THUMB_ALT, _______, SW_TG, _______ ), #if defined(RGBLIGHT) | defined(BACKLIGHT_ENABLE) [_BCKLT_ADJ] = LAYOUT_symmetric( - XXXXXXX, XXXXXXX, XXXXXXX, BL_INC, RGB_VAI, RGB_HUD, RGB_HUI, - XXXXXXX, XXXXXXX, BL_DEC, RGB_VAD, RGB_SAD, RGB_SAI, + XXXXXXX, XXXXXXX, XXXXXXX, BL_UP, RGB_VAI, RGB_HUD, RGB_HUI, + XXXXXXX, XXXXXXX, BL_DOWN, RGB_VAD, RGB_SAD, RGB_SAI, BL_ADJ, BL_BRTG, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD, _______, _______, _______ ), diff --git a/keyboards/jian/keymaps/default/keymap.c b/keyboards/jian/keymaps/default/keymap.c index 3850ea3d10..8a1234e1aa 100644 --- a/keyboards/jian/keymaps/default/keymap.c +++ b/keyboards/jian/keymaps/default/keymap.c @@ -65,14 +65,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_RAISE] = LAYOUT( - _______, KC_NLCK, KC_PSLS, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_VOLU, KC_HOME, KC_PSCR, KC_PGUP, KC_SLCK, KC_CAPS, _______, + _______, KC_NUM, KC_PSLS, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_VOLU, KC_HOME, KC_PSCR, KC_PGUP, KC_SCRL, KC_CAPS, _______, LCTL_T(KC_EQL), KC_PAST, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_MUTE, KC_LEFT, KC_UP, KC_RGHT, KC_INS, RCTL_T(KC_APP), _______, KC_P0, KC_P1, KC_P2, KC_P3, KC_PCMM, KC_VOLD, KC_END, KC_DOWN, KC_PGDN, KC_PAUS, _______, _______, _______, _______, _______, _______, _______ ), [_ADJUST] = LAYOUT_symmetric( - QK_BOOT, DEBUG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + QK_BOOT, DB_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, WORKMAN, COLEMAK, DVORAK, QWERTY, XXXXXXX, TG(_BCKLT_ADJ), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, SW_TG, _______ @@ -80,8 +80,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #if defined(RGBLIGHT) || defined(BACKLIGHT_ENABLE) [_BCKLT_ADJ] = LAYOUT_symmetric( - XXXXXXX, XXXXXXX, XXXXXXX, BL_INC, RGB_VAI, RGB_HUD, RGB_HUI, - XXXXXXX, XXXXXXX, BL_DEC, RGB_VAD, RGB_SAD, RGB_SAI, + XXXXXXX, XXXXXXX, XXXXXXX, BL_UP, RGB_VAI, RGB_HUD, RGB_HUI, + XXXXXXX, XXXXXXX, BL_DOWN, RGB_VAD, RGB_SAD, RGB_SAI, TG(_BCKLT_ADJ), BL_BRTG, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD, _______, _______, _______ ) diff --git a/keyboards/jian/keymaps/left_hand/keymap.c b/keyboards/jian/keymaps/left_hand/keymap.c index ab24c63ed4..5f6b93bc6e 100644 --- a/keyboards/jian/keymaps/left_hand/keymap.c +++ b/keyboards/jian/keymaps/left_hand/keymap.c @@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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, + _______, LGUI_T(KC_CAPS), KC_SCRL, 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) @@ -63,8 +63,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, LT(_ADJUST, KC_ESC) ), [_ADJUST] = LAYOUT_symmetric_left( - QK_BOOT, DEBUG, XXXXXXX, BL_INC, RGB_VAI, RGB_HUD, RGB_HUI, - XXXXXXX, XXXXXXX, BL_DEC, RGB_VAD, RGB_SAD, RGB_SAI, + QK_BOOT, DB_TOGG, XXXXXXX, BL_UP, RGB_VAI, RGB_HUD, RGB_HUI, + XXXXXXX, XXXXXXX, BL_DOWN, RGB_VAD, RGB_SAD, RGB_SAI, XXXXXXX, BL_BRTG, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD, _______, _______, _______ ) diff --git a/keyboards/jian/keymaps/via/keymap.c b/keyboards/jian/keymaps/via/keymap.c index ac9586587b..5844ef16e8 100644 --- a/keyboards/jian/keymaps/via/keymap.c +++ b/keyboards/jian/keymaps/via/keymap.c @@ -14,14 +14,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { LT(3, KC_TAB), _______, _______, _______, _______, LT(3, KC_DEL) ), [2] = LAYOUT( - _______, KC_NLCK, KC_PSLS, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_VOLU, KC_HOME, KC_PSCR, KC_PGUP, KC_SLCK, KC_CAPS, _______, + _______, KC_NUM, KC_PSLS, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_VOLU, KC_HOME, KC_PSCR, KC_PGUP, KC_SCRL, KC_CAPS, _______, LCTL_T(KC_EQL), KC_PAST, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_MUTE, KC_LEFT, KC_UP, KC_RGHT, KC_INS, RCTL_T(KC_APP), _______, KC_P0, KC_P1, KC_P2, KC_P3, KC_PCMM, KC_VOLD, KC_END, KC_DOWN, KC_PGDN, KC_PAUS, _______, _______, _______, LT(3, KC_ENT), LT(3, KC_ESC), _______, _______ ), [3] = LAYOUT_symmetric( - QK_BOOT, DEBUG, XXXXXXX, BL_INC, RGB_VAI, RGB_HUD, RGB_HUI, - XXXXXXX, XXXXXXX, BL_DEC, RGB_VAD, RGB_SAD, RGB_SAI, + QK_BOOT, DB_TOGG, XXXXXXX, BL_UP, RGB_VAI, RGB_HUD, RGB_HUI, + XXXXXXX, XXXXXXX, BL_DOWN, RGB_VAD, RGB_SAD, RGB_SAI, XXXXXXX, BL_BRTG, BL_TOGG, RGB_TOG, RGB_RMOD,RGB_MOD, _______, SH_TG, _______ ) diff --git a/keyboards/jian/nsrev2/config.h b/keyboards/jian/nsrev2/config.h index 6b36049f94..9e2e5e765e 100644 --- a/keyboards/jian/nsrev2/config.h +++ b/keyboards/jian/nsrev2/config.h @@ -49,7 +49,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGB_DI_PIN D4 #define RGBLIGHT_TIMER #define RGBLED_NUM 7 // Number of LEDs -#define RGBLIGHT_ANIMATIONS //not working with splits right now +#define RGBLIGHT_EFFECT_BREATHING +#define RGBLIGHT_EFFECT_RAINBOW_MOOD +#define RGBLIGHT_EFFECT_RAINBOW_SWIRL +#define RGBLIGHT_EFFECT_SNAKE +#define RGBLIGHT_EFFECT_KNIGHT +#define RGBLIGHT_EFFECT_CHRISTMAS +#define RGBLIGHT_EFFECT_STATIC_GRADIENT +#define RGBLIGHT_EFFECT_RGB_TEST +#define RGBLIGHT_EFFECT_ALTERNATING +#define RGBLIGHT_EFFECT_TWINKLE #define RGBLIGHT_SLEEP #define RGBLIGHT_SPLIT diff --git a/keyboards/jian/rev1/.noci b/keyboards/jian/rev1/.noci deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/jian/rev1/.noci +++ /dev/null diff --git a/keyboards/jian/rev1/config.h b/keyboards/jian/rev1/config.h index 988b6d5176..3e8f0eed02 100644 --- a/keyboards/jian/rev1/config.h +++ b/keyboards/jian/rev1/config.h @@ -29,8 +29,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MATRIX_ROW_PINS { D3, D2, E6, B4 } #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 } -/* Use I2C or Serial, not both */ -// #define USE_SERIAL #define USE_I2C /* Select hand configuration */ @@ -99,7 +97,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGB_DI_PIN D4 #define RGBLIGHT_TIMER #define RGBLED_NUM 7 // Number of LEDs -#define RGBLIGHT_ANIMATIONS //not working with splits right now +#define RGBLIGHT_EFFECT_BREATHING +#define RGBLIGHT_EFFECT_RAINBOW_MOOD +#define RGBLIGHT_EFFECT_RAINBOW_SWIRL +#define RGBLIGHT_EFFECT_SNAKE +#define RGBLIGHT_EFFECT_KNIGHT +#define RGBLIGHT_EFFECT_CHRISTMAS +#define RGBLIGHT_EFFECT_STATIC_GRADIENT +#define RGBLIGHT_EFFECT_RGB_TEST +#define RGBLIGHT_EFFECT_ALTERNATING +#define RGBLIGHT_EFFECT_TWINKLE + #define RGBLIGHT_SLEEP #define RGBLIGHT_SPLIT diff --git a/keyboards/jian/rev2/config.h b/keyboards/jian/rev2/config.h index 52c8b6ad0e..c142100610 100644 --- a/keyboards/jian/rev2/config.h +++ b/keyboards/jian/rev2/config.h @@ -29,8 +29,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MATRIX_ROW_PINS { F4, F5, B1, B3 } #define MATRIX_COL_PINS { D3, D2, B4, F6, F7, B2 } -//#define USE_I2C -#define USE_SERIAL #define SOFT_SERIAL_PIN D1 //#define EE_HANDS @@ -56,7 +54,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGB_DI_PIN D4 #define RGBLIGHT_TIMER #define RGBLED_NUM 7 // Number of LEDs -#define RGBLIGHT_ANIMATIONS //not working with splits right now +#define RGBLIGHT_EFFECT_BREATHING +#define RGBLIGHT_EFFECT_RAINBOW_MOOD +#define RGBLIGHT_EFFECT_RAINBOW_SWIRL +#define RGBLIGHT_EFFECT_SNAKE +#define RGBLIGHT_EFFECT_KNIGHT +#define RGBLIGHT_EFFECT_CHRISTMAS +#define RGBLIGHT_EFFECT_STATIC_GRADIENT +#define RGBLIGHT_EFFECT_RGB_TEST +#define RGBLIGHT_EFFECT_ALTERNATING +#define RGBLIGHT_EFFECT_TWINKLE #define RGBLIGHT_SLEEP #define RGBLIGHT_SPLIT |