From 3587e20e7016792846d351925706da04e9442420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=8F=E3=81=BE=E3=81=8A=E5=B7=A5=E6=88=BF?= <52371962+kumaokobo@users.noreply.github.com> Date: Wed, 25 Mar 2020 05:02:41 +0900 Subject: [Keyboard] Add kudox game rev2 (#8529) * Add Kudox Game rev2. * Add the keymap of Kudox Game a layer for regulating RGB. * Modified rgblight_init when RGBLIGHT_ENABLE=no. * Remove invalid codes. * Modified *init* function right intention of framework. --- keyboards/kudox_game/info.json | 4 +- keyboards/kudox_game/keymaps/default/keymap.c | 33 +++++++++- keyboards/kudox_game/kudox_game.h | 3 + keyboards/kudox_game/readme.md | 6 +- keyboards/kudox_game/rev2/config.h | 91 +++++++++++++++++++++++++++ keyboards/kudox_game/rev2/rev2.c | 1 + keyboards/kudox_game/rev2/rev2.h | 20 ++++++ keyboards/kudox_game/rev2/rules.mk | 1 + keyboards/kudox_game/rules.mk | 2 +- 9 files changed, 152 insertions(+), 9 deletions(-) create mode 100644 keyboards/kudox_game/rev2/config.h create mode 100644 keyboards/kudox_game/rev2/rev2.c create mode 100644 keyboards/kudox_game/rev2/rev2.h create mode 100644 keyboards/kudox_game/rev2/rules.mk diff --git a/keyboards/kudox_game/info.json b/keyboards/kudox_game/info.json index 42932601a9..0862dade53 100644 --- a/keyboards/kudox_game/info.json +++ b/keyboards/kudox_game/info.json @@ -18,8 +18,8 @@ {"label":"E", "x":3.75, "y":1}, {"label":"R", "x":4.75, "y":1}, {"label":"T", "x":5.75, "y":1}, - {"label":"GUI", "x":0, "y":2}, - {"label":"Alt", "x":1, "y":2}, + {"label":"Ctrl-C", "x":0, "y":2}, + {"label":"Ctrl-V", "x":1, "y":2}, {"label":"A", "x":2, "y":2}, {"label":"S", "x":3, "y":2}, {"label":"D", "x":4, "y":2}, diff --git a/keyboards/kudox_game/keymaps/default/keymap.c b/keyboards/kudox_game/keymaps/default/keymap.c index cf6b1dfc50..d7efeaed01 100644 --- a/keyboards/kudox_game/keymaps/default/keymap.c +++ b/keyboards/kudox_game/keymaps/default/keymap.c @@ -6,20 +6,26 @@ // entirely and just use numbers. #define _QWERTY 0 #define _SYMB 1 +#define _LIGHT 2 // Shortcut to make keymap more readable #define SYM_L MO(_SYMB) #define KC_ALEN LALT_T(KC_ENT) +#define ES_LIGH LT(_LIGHT, KC_ESC) + +#define CT_COPY LCTL(KC_C) +#define CT_PASTE LCTL(KC_V) + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT( //┌────────┬────────┬────────┬────────┬────────┬────────┐ - KC_ESC ,KC_1 ,KC_2 ,KC_3 ,KC_4 ,KC_5 , + ES_LIGH ,KC_1 ,KC_2 ,KC_3 ,KC_4 ,KC_5 , //└────────┼────────┼────────┼────────┼────────┼────────┤ KC_Q ,KC_W ,KC_E ,KC_R ,KC_T , //┌────────┼────────┼────────┼────────┼────────┼────────┼────────┐ - KC_LGUI ,KC_ALEN ,KC_A ,KC_S ,KC_D ,KC_F ,KC_G , + CT_COPY ,CT_PASTE,KC_A ,KC_S ,KC_D ,KC_F ,KC_G , //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ KC_LSFT ,KC_Z ,KC_X ,KC_C ,KC_V , //├────────┼────────┘ └────────┴────────┼────────┼────────┐ @@ -35,10 +41,31 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //┌────────┼────────┼────────┼────────┼────────┼────────┼────────┐ _______ ,_______ ,KC_LEFT ,KC_DOWN ,KC_RIGHT,KC_LBRC ,KC_RBRC , //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ - _______ ,KC_BSPC ,KC_CIRC ,KC_LPRN ,KC_RPRN , + _______ ,KC_BSPC ,KC_DEL ,KC_LPRN ,KC_RPRN , //├────────┼────────┘ └────────┴────────┼────────┼────────┐ _______ ,_______ ,_______ //└────────┘ └────────┴────────┘ + ), + + [_LIGHT] = LAYOUT( + //┌────────┬────────┬────────┬────────┬────────┬────────┐ + _______ ,RGB_HUI ,RGB_HUD ,RGB_SAI ,RGB_SAD ,RGB_VAI , + //└────────┼────────┼────────┼────────┼────────┼────────┤ + RGB_M_P ,RGB_M_SW,RGB_M_X ,RGB_M_B ,RGB_VAD , + //┌────────┼────────┼────────┼────────┼────────┼────────┼────────┐ + _______ ,_______ ,RGB_M_SN,RGB_M_G ,RGB_M_R ,RGB_M_K ,RGB_M_T , + //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ + _______ ,RGB_M_T ,XXXXXXX ,RGB_VAI ,RGB_VAD , + //├────────┼────────┘ └────────┴────────┼────────┼────────┐ + _______ ,RGB_MOD ,RGB_TOG + //└────────┘ └────────┴────────┘ ) }; + +// Runs just one time when the keyboard initializes. +#ifdef RGBLIGHT_ENABLE +void keyboard_post_init_user(void) { + rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_SWIRL); +}; +#endif diff --git a/keyboards/kudox_game/kudox_game.h b/keyboards/kudox_game/kudox_game.h index 1da820fc27..c76f086c87 100644 --- a/keyboards/kudox_game/kudox_game.h +++ b/keyboards/kudox_game/kudox_game.h @@ -19,5 +19,8 @@ #ifdef KEYBOARD_kudox_game_rev1 #include "rev1.h" #endif +#ifdef KEYBOARD_kudox_game_rev2 + #include "rev2.h" +#endif #include "quantum.h" diff --git a/keyboards/kudox_game/readme.md b/keyboards/kudox_game/readme.md index 5ad867790b..31565a5996 100644 --- a/keyboards/kudox_game/readme.md +++ b/keyboards/kudox_game/readme.md @@ -9,18 +9,18 @@
- Keyboard Maintainer: [Kumao Kobo](https://github.com/kumaokobo) -- Hardware Supported: Kudox Game PCB rev1.0 w/ Pro Micro +- Hardware Supported: Kudox Game PCB rev1.0 rev2.0 w/ Pro Micro Make example for this keyboard (after setting up your build environment): ```sh -make kudox_game/rev1:default +make kudox_game/rev2:default ``` Example of flashing this keyboard: ```sh -make kudox_game/rev1:default:avrdude +make kudox_game/rev2:default:avrdude ``` See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/kudox_game/rev2/config.h b/keyboards/kudox_game/rev2/config.h new file mode 100644 index 0000000000..500f93280d --- /dev/null +++ b/keyboards/kudox_game/rev2/config.h @@ -0,0 +1,91 @@ +/* +Copyright 2019 Kumao Kobo