diff options
author | InigoGutierrez <inigogf.95@gmail.com> | 2022-09-25 16:02:54 +0200 |
---|---|---|
committer | InigoGutierrez <inigogf.95@gmail.com> | 2022-09-25 16:02:54 +0200 |
commit | 6afdd9d74da250e47ac64d6690bd19d037045e99 (patch) | |
tree | 661f6cfb244c02bcd1fbfe8fb9b2bd9242a91394 /keyboards/hub16 | |
parent | 93a55e61b59d20f7cd842cce02e5b18a63a23612 (diff) | |
parent | 1bdf4cdc22ae57d111efb2f7d71e405e5c7b3f11 (diff) | |
download | qmk_firmware-6afdd9d74da250e47ac64d6690bd19d037045e99.tar.gz qmk_firmware-6afdd9d74da250e47ac64d6690bd19d037045e99.zip |
Merge branch 'master' into taamas
Diffstat (limited to 'keyboards/hub16')
-rwxr-xr-x | keyboards/hub16/config.h | 7 | ||||
-rw-r--r-- | keyboards/hub16/info.json | 6 | ||||
-rw-r--r-- | keyboards/hub16/keymaps/ahk_companion/keymap.c | 4 | ||||
-rwxr-xr-x | keyboards/hub16/keymaps/macro/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/hub16/keymaps/peepeetee/keymap.c | 8 |
5 files changed, 13 insertions, 14 deletions
diff --git a/keyboards/hub16/config.h b/keyboards/hub16/config.h index eeaa5f1a77..e88fba018b 100755 --- a/keyboards/hub16/config.h +++ b/keyboards/hub16/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6A6A -#define PRODUCT_ID 0x4810 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Josh Johnson -#define PRODUCT Hub16 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 4 diff --git a/keyboards/hub16/info.json b/keyboards/hub16/info.json index e6546f6cbd..a7ba0ae895 100644 --- a/keyboards/hub16/info.json +++ b/keyboards/hub16/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Hub16", + "manufacturer": "Josh Johnson", "url": "https://joshajohnson.com/hub16-keyboard/", "maintainer": "Josh Johnson", + "usb": { + "vid": "0x6A6A", + "pid": "0x4810", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/hub16/keymaps/ahk_companion/keymap.c b/keyboards/hub16/keymaps/ahk_companion/keymap.c index 10f641b6f8..39d94b340b 100644 --- a/keyboards/hub16/keymaps/ahk_companion/keymap.c +++ b/keyboards/hub16/keymaps/ahk_companion/keymap.c @@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_MPLY, KC_MUTE, KC_MPRV, KC_MPLY, KC_U, KC_K, KC_NO, KC_NO, KC_ENT, KC_X, - KC_NO, RESET, LSFT(KC_HASH), KC_J, + KC_NO, QK_BOOT, LSFT(KC_HASH), KC_J, TG(5), KC_TRNS, KC_TRNS, KC_TRNS //Transparent to let you go between layers ), @@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_MPLY, KC_MUTE, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, - RGB_TOG, EEP_RST, RESET, KC_LSHIFT, + RGB_TOG, EEP_RST, QK_BOOT, KC_LSHIFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS //Transparent to let you go between layers ), }; diff --git a/keyboards/hub16/keymaps/macro/keymap.c b/keyboards/hub16/keymaps/macro/keymap.c index e4cf9da5eb..1da30d564f 100755 --- a/keyboards/hub16/keymaps/macro/keymap.c +++ b/keyboards/hub16/keymaps/macro/keymap.c @@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, RGB_MOD, RGB_RMOD, RGB_TOG, RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, _______, _______, - _______, _______, RESET, TD(BASE) + _______, _______, QK_BOOT, TD(BASE) ), }; diff --git a/keyboards/hub16/keymaps/peepeetee/keymap.c b/keyboards/hub16/keymaps/peepeetee/keymap.c index 4790feda0a..ba4fe59235 100644 --- a/keyboards/hub16/keymaps/peepeetee/keymap.c +++ b/keyboards/hub16/keymaps/peepeetee/keymap.c @@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //Transparent to let you go between layers RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, - RGB_TOG, EEP_RST, RESET, KC_TRNS + RGB_TOG, EEP_RST, QK_BOOT, KC_TRNS ), [3] = LAYOUT( @@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //Transparent to let you go between layers RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, - RGB_TOG, EEP_RST, RESET, KC_TRNS + RGB_TOG, EEP_RST, QK_BOOT, KC_TRNS ) @@ -101,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // KC_MPLY, KC_MUTE, // KC_MPRV, KC_MPLY, KC_U, KC_K, // KC_NO, KC_NO, KC_ENT, KC_X, - // KC_NO, RESET, LSFT(KC_HASH), KC_J, + // KC_NO, QK_BOOT, LSFT(KC_HASH), KC_J, // TG(5), KC_TRNS, KC_TRNS, KC_TRNS //Transparent to let you go between layers // ), @@ -110,7 +110,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // KC_MPLY, KC_MUTE, // RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, // RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, - // RGB_TOG, EEP_RST, RESET, KC_LSHIFT, + // RGB_TOG, EEP_RST, QK_BOOT, KC_LSHIFT, // KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS //Transparent to let you go between layers // ), }; |