diff options
| author | Nick Brassel <nick@tzarc.org> | 2022-11-28 07:54:00 +1100 |
|---|---|---|
| committer | Nick Brassel <nick@tzarc.org> | 2022-11-28 07:54:00 +1100 |
| commit | 4020674163fc80914059c4c9c3be5c0ae00bd150 (patch) | |
| tree | 6f4187d72b04d03572adf507502afbda9726d696 /keyboards/kegen | |
| parent | 8f9b49dc5b05fd3421e47aa76822a5b2199dfca6 (diff) | |
| parent | 9e78e65a566487b2f4fe7b663971a01deb6ddad2 (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/kegen')
| -rw-r--r-- | keyboards/kegen/gboy/config.h | 1 | ||||
| -rw-r--r-- | keyboards/kegen/gboy/info.json | 12 | ||||
| -rw-r--r-- | keyboards/kegen/gboy/keymaps/default/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/kegen/gboy/keymaps/via/keymap.c | 2 |
4 files changed, 8 insertions, 9 deletions
diff --git a/keyboards/kegen/gboy/config.h b/keyboards/kegen/gboy/config.h index 77f9ef3b21..30268122ed 100644 --- a/keyboards/kegen/gboy/config.h +++ b/keyboards/kegen/gboy/config.h @@ -27,7 +27,6 @@ /* key matrix pins */ #define MATRIX_ROW_PINS { F1, F4, F5, F6, F7 } #define MATRIX_COL_PINS { E2, E6, C6, C7, D7, B6, B5, B4, B3, B2, B1, B0, D4, D6, D5, F0 } -#define UNUSED_PINS /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/kegen/gboy/info.json b/keyboards/kegen/gboy/info.json index 880fd9611c..a47bfdb7b8 100644 --- a/keyboards/kegen/gboy/info.json +++ b/keyboards/kegen/gboy/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Kegen G-Boy", - "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/kegen/gboy", - "maintainer": "@mattchan", - "maintainer": "mattchan", + "keyboard_name": "G-Boy", + "manufacturer": "Kegen", + "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/kegen/gboy", + "maintainer": "mattchan", "usb": { "vid": "0x4B65", "pid": "0x6762", @@ -27,7 +27,7 @@ {"label": "BSPC", "x":13, "y":0}, {"label": "BSPC", "x":14, "y":0}, {"label": "HOME", "x":15, "y":0}, - + {"label": "TAB", "x":0, "y":1, "w":1.5}, {"label": "Q", "x":1.5, "y":1}, {"label": "W", "x":2.5, "y":1}, @@ -89,4 +89,4 @@ ] } } -}
\ No newline at end of file +} diff --git a/keyboards/kegen/gboy/keymaps/default/keymap.c b/keyboards/kegen/gboy/keymaps/default/keymap.c index f4b5d3c090..575073d3a2 100644 --- a/keyboards/kegen/gboy/keymaps/default/keymap.c +++ b/keyboards/kegen/gboy/keymaps/default/keymap.c @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_all( - KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_HOME, + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_HOME, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_PGDN, KC_LSFT, KC_SLSH, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, diff --git a/keyboards/kegen/gboy/keymaps/via/keymap.c b/keyboards/kegen/gboy/keymaps/via/keymap.c index f4b5d3c090..575073d3a2 100644 --- a/keyboards/kegen/gboy/keymaps/via/keymap.c +++ b/keyboards/kegen/gboy/keymaps/via/keymap.c @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_all( - KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_HOME, + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_HOME, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_PGDN, KC_LSFT, KC_SLSH, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, |