From c4ef45a21fa991154f4d57d6aa70c0ffaae632b0 Mon Sep 17 00:00:00 2001 From: gkeyboard Date: Wed, 22 Feb 2023 22:12:20 +0700 Subject: [PATCH 01/13] Add GPAD8-2R (gpad8_2r) Macro Pad under gkeyboard --- keyboards/gkeyboard/gpad8_2r/config.h | 73 +++++++++++++++++ keyboards/gkeyboard/gpad8_2r/info.json | 80 +++++++++++++++++++ .../gpad8_2r/keymaps/default/keymap.c | 49 ++++++++++++ .../gpad8_2r/keymaps/default/rules.mk | 1 + .../gkeyboard/gpad8_2r/keymaps/via/keymap.c | 73 +++++++++++++++++ .../gkeyboard/gpad8_2r/keymaps/via/readme.md | 1 + .../gkeyboard/gpad8_2r/keymaps/via/rules.mk | 2 + keyboards/gkeyboard/gpad8_2r/readme.md | 27 +++++++ keyboards/gkeyboard/gpad8_2r/rules.mk | 1 + 9 files changed, 307 insertions(+) create mode 100644 keyboards/gkeyboard/gpad8_2r/config.h create mode 100644 keyboards/gkeyboard/gpad8_2r/info.json create mode 100644 keyboards/gkeyboard/gpad8_2r/keymaps/default/keymap.c create mode 100644 keyboards/gkeyboard/gpad8_2r/keymaps/default/rules.mk create mode 100644 keyboards/gkeyboard/gpad8_2r/keymaps/via/keymap.c create mode 100644 keyboards/gkeyboard/gpad8_2r/keymaps/via/readme.md create mode 100644 keyboards/gkeyboard/gpad8_2r/keymaps/via/rules.mk create mode 100644 keyboards/gkeyboard/gpad8_2r/readme.md create mode 100644 keyboards/gkeyboard/gpad8_2r/rules.mk diff --git a/keyboards/gkeyboard/gpad8_2r/config.h b/keyboards/gkeyboard/gpad8_2r/config.h new file mode 100644 index 000000000000..8e74c4ac1e8d --- /dev/null +++ b/keyboards/gkeyboard/gpad8_2r/config.h @@ -0,0 +1,73 @@ +// Copyright 2023 gkeyboard (@gkeyboard) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include "config_common.h" + +#define DYNAMIC_KEYMAP_LAYER_COUNT 8 + +#define RGB_DI_PIN GP19 +#define RGB_MATRIX_LED_COUNT 16 +#define DRIVER_LED_TOTAL 16 +#define RGBLED_NUM 16 +#define RGB_MATRIX_FRAMEBUFFER_EFFECTS +#define RGB_MATRIX_KEYPRESSES +#define RGB_DISABLE_WHEN_USB_SUSPENDED +// RGB Matrix Animation modes. Explicitly enabled +// For full list of effects, see: +// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects +#define ENABLE_RGB_MATRIX_ALPHAS_MODS +#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN +#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT +#define ENABLE_RGB_MATRIX_BREATHING +#define ENABLE_RGB_MATRIX_BAND_SAT +#define ENABLE_RGB_MATRIX_BAND_VAL +#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT +#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL +#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT +#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL +#define ENABLE_RGB_MATRIX_CYCLE_ALL +#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT +#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN +#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN +#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL +#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL +#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL +#define ENABLE_RGB_MATRIX_DUAL_BEACON +#define ENABLE_RGB_MATRIX_RAINBOW_BEACON +#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS +#define ENABLE_RGB_MATRIX_RAINDROPS +#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS +#define ENABLE_RGB_MATRIX_HUE_BREATHING +#define ENABLE_RGB_MATRIX_HUE_PENDULUM +#define ENABLE_RGB_MATRIX_HUE_WAVE +#define ENABLE_RGB_MATRIX_PIXEL_RAIN +#define ENABLE_RGB_MATRIX_PIXEL_FLOW +#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL +// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined +#define ENABLE_RGB_MATRIX_TYPING_HEATMAP +#define ENABLE_RGB_MATRIX_DIGITAL_RAIN +// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +#define ENABLE_RGB_MATRIX_SPLASH +#define ENABLE_RGB_MATRIX_MULTISPLASH +#define ENABLE_RGB_MATRIX_SOLID_SPLASH +#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* Bootmagic Lite key configuration */ +#define BOOTMAGIC_LITE_ROW 0 +#define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/gkeyboard/gpad8_2r/info.json b/keyboards/gkeyboard/gpad8_2r/info.json new file mode 100644 index 000000000000..fcc900a35fcc --- /dev/null +++ b/keyboards/gkeyboard/gpad8_2r/info.json @@ -0,0 +1,80 @@ +{ + "manufacturer": "gkeyboard", + "keyboard_name": "GPAD8-2R", + "url": "https://github.com/gkeyboard/GPAD8-2R", + "maintainer": "gkeyboard", + "bootloader": "rp2040", + "processor": "RP2040", + "board": "GENERIC_RP_RP2040", + "usb": { + "vid": "0x474B", + "pid": "0x4202", + "device_version": "1.0.0" + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["GP12", "GP11", "GP10", "GP9"], + "rows": ["GP4", "GP5", "GP6"] + }, + "diode_direction": "COL2ROW", + "encoder": { + "enabled": true, + "rotary": [ + { + "pin_a": "GP29", + "pin_b": "GP28", + "resolution": 4 + }, + { + "pin_a": "GP2", + "pin_b": "GP3", + "resolution": 4 + } + ] + }, + "rgb_matrix": { + "driver": "WS2812", + "layout": [ + { "flags": 4, "matrix": [1, 0], "x": 28, "y": 12 }, + { "flags": 4, "matrix": [1, 1], "x": 84, "y": 12 }, + { "flags": 4, "matrix": [1, 2], "x": 140, "y": 12 }, + { "flags": 4, "matrix": [1, 3], "x": 196, "y": 12 }, + { "flags": 4, "matrix": [2, 0], "x": 28, "y": 28 }, + { "flags": 4, "matrix": [2, 1], "x": 84, "y": 28 }, + { "flags": 4, "matrix": [2, 2], "x": 140, "y": 28 }, + { "flags": 4, "matrix": [2, 3], "x": 196, "y": 28 }, + { "flags": 2, "x": 28, "y": 44 }, + { "flags": 2, "x": 84, "y": 44 }, + { "flags": 2, "x": 140, "y": 44 }, + { "flags": 2, "x": 196, "y": 44 }, + { "flags": 2, "x": 28, "y": 60 }, + { "flags": 2, "x": 84, "y": 60 }, + { "flags": 2, "x": 140, "y": 60 }, + { "flags": 2, "x": 196, "y": 60 } + ] + }, + "layouts": { + "LAYOUT": { + "layout": [ + { "matrix": [0, 0], "x": 0.0, "y": 0.0 }, + { "matrix": [0, 3], "x": 3.0, "y": 0.0 }, + { "matrix": [1, 0], "x": 0.0, "y": 1.25 }, + { "matrix": [1, 1], "x": 1.0, "y": 1.25 }, + { "matrix": [1, 2], "x": 2.0, "y": 1.25 }, + { "matrix": [1, 3], "x": 3.0, "y": 1.25 }, + { "matrix": [2, 0], "x": 0.0, "y": 2.25 }, + { "matrix": [2, 1], "x": 1.0, "y": 2.25 }, + { "matrix": [2, 2], "x": 2.0, "y": 2.25 }, + { "matrix": [2, 3], "x": 3.0, "y": 2.25 } + ] + } + } +} diff --git a/keyboards/gkeyboard/gpad8_2r/keymaps/default/keymap.c b/keyboards/gkeyboard/gpad8_2r/keymaps/default/keymap.c new file mode 100644 index 000000000000..41b505336d68 --- /dev/null +++ b/keyboards/gkeyboard/gpad8_2r/keymaps/default/keymap.c @@ -0,0 +1,49 @@ +/* Copyright 2023 gkeyboard + * + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT( + KC_MUTE, RGB_TOG, + KC_A, KC_B, KC_C, KC_D, + KC_E, KC_F, KC_G, KC_H + ), + [1] = LAYOUT( + KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [2] = LAYOUT( + KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [3] = LAYOUT( + KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) } +}; +#endif diff --git a/keyboards/gkeyboard/gpad8_2r/keymaps/default/rules.mk b/keyboards/gkeyboard/gpad8_2r/keymaps/default/rules.mk new file mode 100644 index 000000000000..a40474b4d5c7 --- /dev/null +++ b/keyboards/gkeyboard/gpad8_2r/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes \ No newline at end of file diff --git a/keyboards/gkeyboard/gpad8_2r/keymaps/via/keymap.c b/keyboards/gkeyboard/gpad8_2r/keymaps/via/keymap.c new file mode 100644 index 000000000000..589a1b15393c --- /dev/null +++ b/keyboards/gkeyboard/gpad8_2r/keymaps/via/keymap.c @@ -0,0 +1,73 @@ +/* Copyright 2023 gkeyboard + * + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT( + KC_MUTE, RGB_TOG, + KC_A, KC_B, KC_C, KC_D, + KC_E, KC_F, KC_G, KC_H + ), + [1] = LAYOUT( + KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [2] = LAYOUT( + KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [3] = LAYOUT( + KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [4] = LAYOUT( + KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [5] = LAYOUT( + KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [6] = LAYOUT( + KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [7] = LAYOUT( + KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [4] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [5] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [6] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [7] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) } +}; +#endif diff --git a/keyboards/gkeyboard/gpad8_2r/keymaps/via/readme.md b/keyboards/gkeyboard/gpad8_2r/keymaps/via/readme.md new file mode 100644 index 000000000000..b0d4fc18984d --- /dev/null +++ b/keyboards/gkeyboard/gpad8_2r/keymaps/via/readme.md @@ -0,0 +1 @@ +# Via keymap for GPAD8-2R diff --git a/keyboards/gkeyboard/gpad8_2r/keymaps/via/rules.mk b/keyboards/gkeyboard/gpad8_2r/keymaps/via/rules.mk new file mode 100644 index 000000000000..f1adcab005e8 --- /dev/null +++ b/keyboards/gkeyboard/gpad8_2r/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/gkeyboard/gpad8_2r/readme.md b/keyboards/gkeyboard/gpad8_2r/readme.md new file mode 100644 index 000000000000..bea57d9b9009 --- /dev/null +++ b/keyboards/gkeyboard/gpad8_2r/readme.md @@ -0,0 +1,27 @@ +# GPAD8-2R + +![GPAD8-2R](https://i.imgur.com/jAaO7gY.png) + +8 Keys Custom Macro Pad, 2 Encoders, with USB Type-C, RGB underglow, RGB Per Key Lighting. + +* Keyboard Maintainer: [gkeyboard](https://github.com/gkeyboard) +* Hardware Supported: GPAD8-2R PCB +* Hardware Availability: http://www.mltelectronic.com + +Make example for this keyboard (after setting up your build environment): + + make gkeyboard/gpad8_2r:default + +Flashing example for this keyboard: + + make gkeyboard/gpad8_2r:default:flash + +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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/gkeyboard/gpad8_2r/rules.mk b/keyboards/gkeyboard/gpad8_2r/rules.mk new file mode 100644 index 000000000000..997fce7e65c8 --- /dev/null +++ b/keyboards/gkeyboard/gpad8_2r/rules.mk @@ -0,0 +1 @@ +WS2812_DRIVER = vendor From cd19f6ffef8efb80dffb519e39f8bd9e5d8160bc Mon Sep 17 00:00:00 2001 From: gkeyboard Date: Wed, 22 Feb 2023 23:11:57 +0700 Subject: [PATCH 02/13] Update rules.mk --- keyboards/gkeyboard/gpad8_2r/keymaps/default/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/gkeyboard/gpad8_2r/keymaps/default/rules.mk b/keyboards/gkeyboard/gpad8_2r/keymaps/default/rules.mk index a40474b4d5c7..ee325681483f 100644 --- a/keyboards/gkeyboard/gpad8_2r/keymaps/default/rules.mk +++ b/keyboards/gkeyboard/gpad8_2r/keymaps/default/rules.mk @@ -1 +1 @@ -ENCODER_MAP_ENABLE = yes \ No newline at end of file +ENCODER_MAP_ENABLE = yes From e814f219f2078f4295adf353c0a4cddc7761acab Mon Sep 17 00:00:00 2001 From: gkeyboard Date: Thu, 23 Feb 2023 01:14:34 +0700 Subject: [PATCH 03/13] Update keyboards/gkeyboard/gpad8_2r/config.h Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/gkeyboard/gpad8_2r/config.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/gkeyboard/gpad8_2r/config.h b/keyboards/gkeyboard/gpad8_2r/config.h index 8e74c4ac1e8d..eb070545bc53 100644 --- a/keyboards/gkeyboard/gpad8_2r/config.h +++ b/keyboards/gkeyboard/gpad8_2r/config.h @@ -3,8 +3,6 @@ #pragma once -#include "config_common.h" - #define DYNAMIC_KEYMAP_LAYER_COUNT 8 #define RGB_DI_PIN GP19 From b4ea2e263cc87f958c893a44280031c4c5008e68 Mon Sep 17 00:00:00 2001 From: gkeyboard Date: Thu, 23 Feb 2023 01:14:51 +0700 Subject: [PATCH 04/13] Update keyboards/gkeyboard/gpad8_2r/config.h Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/gkeyboard/gpad8_2r/config.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/gkeyboard/gpad8_2r/config.h b/keyboards/gkeyboard/gpad8_2r/config.h index eb070545bc53..c3316da729a1 100644 --- a/keyboards/gkeyboard/gpad8_2r/config.h +++ b/keyboards/gkeyboard/gpad8_2r/config.h @@ -7,8 +7,6 @@ #define RGB_DI_PIN GP19 #define RGB_MATRIX_LED_COUNT 16 -#define DRIVER_LED_TOTAL 16 -#define RGBLED_NUM 16 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS #define RGB_MATRIX_KEYPRESSES #define RGB_DISABLE_WHEN_USB_SUSPENDED From f57becf4fdd4fe715d9b7b04db31164b9ad87020 Mon Sep 17 00:00:00 2001 From: gkeyboard Date: Thu, 23 Feb 2023 01:16:09 +0700 Subject: [PATCH 05/13] Update keyboards/gkeyboard/gpad8_2r/config.h Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/gkeyboard/gpad8_2r/config.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/keyboards/gkeyboard/gpad8_2r/config.h b/keyboards/gkeyboard/gpad8_2r/config.h index c3316da729a1..e3a0340f19a6 100644 --- a/keyboards/gkeyboard/gpad8_2r/config.h +++ b/keyboards/gkeyboard/gpad8_2r/config.h @@ -63,7 +63,3 @@ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -/* Bootmagic Lite key configuration */ -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 0 From 0887640c9ba0c704618fda3324c694d30499af3a Mon Sep 17 00:00:00 2001 From: gkeyboard Date: Thu, 23 Feb 2023 01:17:46 +0700 Subject: [PATCH 06/13] Update keyboards/gkeyboard/gpad8_2r/readme.md Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/gkeyboard/gpad8_2r/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/gkeyboard/gpad8_2r/readme.md b/keyboards/gkeyboard/gpad8_2r/readme.md index bea57d9b9009..fd16251714f8 100644 --- a/keyboards/gkeyboard/gpad8_2r/readme.md +++ b/keyboards/gkeyboard/gpad8_2r/readme.md @@ -1,6 +1,6 @@ # GPAD8-2R -![GPAD8-2R](https://i.imgur.com/jAaO7gY.png) +![GPAD8-2R](https://i.imgur.com/jAaO7gYh.png) 8 Keys Custom Macro Pad, 2 Encoders, with USB Type-C, RGB underglow, RGB Per Key Lighting. From e747d4fdd6cecdbb5f50b8e51b1fea37acedab6c Mon Sep 17 00:00:00 2001 From: gkeyboard Date: Thu, 23 Feb 2023 01:29:38 +0700 Subject: [PATCH 07/13] Remove via readme.md --- .vscode/settings.json | 3 ++- keyboards/gkeyboard/gpad8_2r/keymaps/via/readme.md | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 keyboards/gkeyboard/gpad8_2r/keymaps/via/readme.md diff --git a/.vscode/settings.json b/.vscode/settings.json index 76117e52e0b7..462c456b489a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -27,5 +27,6 @@ "python.formatting.provider": "yapf", "[json]": { "editor.formatOnSave": false - } + }, + "cmake.sourceDirectory": "${workspaceFolder}/lib/googletest/googlemock" } diff --git a/keyboards/gkeyboard/gpad8_2r/keymaps/via/readme.md b/keyboards/gkeyboard/gpad8_2r/keymaps/via/readme.md deleted file mode 100644 index b0d4fc18984d..000000000000 --- a/keyboards/gkeyboard/gpad8_2r/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Via keymap for GPAD8-2R From 5b6f5b5ef3ac136e55d25fa1be6ae13ecde4898a Mon Sep 17 00:00:00 2001 From: gkeyboard Date: Thu, 23 Feb 2023 01:35:55 +0700 Subject: [PATCH 08/13] Delete settings.json --- .vscode/settings.json | 32 -------------------------------- 1 file changed, 32 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 462c456b489a..000000000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,32 +0,0 @@ -// Place your settings in this file to overwrite default and user settings. -{ - // Unofficially, QMK uses spaces for indentation - "editor.insertSpaces": true, - // Configure glob patterns for excluding files and folders. - "files.exclude": { - "**/.build": true, - "**/*.hex": true, - "**/*.bin": true, - "**/*.uf2": true - }, - "files.associations": { - "*.h": "c", - "*.c": "c", - "*.inc": "c", - "*.cpp": "cpp", - "*.hpp": "cpp", - "xstddef": "c", - "type_traits": "c", - "utility": "c", - "ranges": "c" - }, - "[markdown]": { - "editor.trimAutoWhitespace": false, - "files.trimTrailingWhitespace": false - }, - "python.formatting.provider": "yapf", - "[json]": { - "editor.formatOnSave": false - }, - "cmake.sourceDirectory": "${workspaceFolder}/lib/googletest/googlemock" -} From 646c367174d47b5ead9503be248178b8c8638ac4 Mon Sep 17 00:00:00 2001 From: gkeyboard Date: Thu, 23 Feb 2023 01:43:38 +0700 Subject: [PATCH 09/13] remove --- .vscode/extensions.json | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 .vscode/extensions.json diff --git a/.vscode/extensions.json b/.vscode/extensions.json deleted file mode 100644 index 889d9d610eb6..000000000000 --- a/.vscode/extensions.json +++ /dev/null @@ -1,10 +0,0 @@ -// Suggested extensions -{ - "recommendations": [ - "EditorConfig.EditorConfig", - "xaver.clang-format", - "ms-vscode.cpptools", - "bierner.github-markdown-preview", - "donjayamanne.git-extension-pack" - ] -} From ac9bd1345827c0b95b06d99c3d9be0fc84011e09 Mon Sep 17 00:00:00 2001 From: gkeyboard Date: Thu, 23 Feb 2023 01:52:44 +0700 Subject: [PATCH 10/13] Revert "Delete settings.json" This reverts commit 5b6f5b5ef3ac136e55d25fa1be6ae13ecde4898a. --- .vscode/settings.json | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000000..462c456b489a --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,32 @@ +// Place your settings in this file to overwrite default and user settings. +{ + // Unofficially, QMK uses spaces for indentation + "editor.insertSpaces": true, + // Configure glob patterns for excluding files and folders. + "files.exclude": { + "**/.build": true, + "**/*.hex": true, + "**/*.bin": true, + "**/*.uf2": true + }, + "files.associations": { + "*.h": "c", + "*.c": "c", + "*.inc": "c", + "*.cpp": "cpp", + "*.hpp": "cpp", + "xstddef": "c", + "type_traits": "c", + "utility": "c", + "ranges": "c" + }, + "[markdown]": { + "editor.trimAutoWhitespace": false, + "files.trimTrailingWhitespace": false + }, + "python.formatting.provider": "yapf", + "[json]": { + "editor.formatOnSave": false + }, + "cmake.sourceDirectory": "${workspaceFolder}/lib/googletest/googlemock" +} From 333a341322da1a85bba65da00ab57e08ad1fbaf7 Mon Sep 17 00:00:00 2001 From: gkeyboard Date: Thu, 23 Feb 2023 01:52:52 +0700 Subject: [PATCH 11/13] Revert "Revert "Delete settings.json"" This reverts commit ac9bd1345827c0b95b06d99c3d9be0fc84011e09. --- .vscode/settings.json | 32 -------------------------------- 1 file changed, 32 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 462c456b489a..000000000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,32 +0,0 @@ -// Place your settings in this file to overwrite default and user settings. -{ - // Unofficially, QMK uses spaces for indentation - "editor.insertSpaces": true, - // Configure glob patterns for excluding files and folders. - "files.exclude": { - "**/.build": true, - "**/*.hex": true, - "**/*.bin": true, - "**/*.uf2": true - }, - "files.associations": { - "*.h": "c", - "*.c": "c", - "*.inc": "c", - "*.cpp": "cpp", - "*.hpp": "cpp", - "xstddef": "c", - "type_traits": "c", - "utility": "c", - "ranges": "c" - }, - "[markdown]": { - "editor.trimAutoWhitespace": false, - "files.trimTrailingWhitespace": false - }, - "python.formatting.provider": "yapf", - "[json]": { - "editor.formatOnSave": false - }, - "cmake.sourceDirectory": "${workspaceFolder}/lib/googletest/googlemock" -} From 2ab5c294abd2e3f1195c59197563056b0a811663 Mon Sep 17 00:00:00 2001 From: gkeyboard Date: Thu, 23 Feb 2023 02:03:57 +0700 Subject: [PATCH 12/13] Update settings.json --- .vscode/settings.json | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000000..76117e52e0b7 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,31 @@ +// Place your settings in this file to overwrite default and user settings. +{ + // Unofficially, QMK uses spaces for indentation + "editor.insertSpaces": true, + // Configure glob patterns for excluding files and folders. + "files.exclude": { + "**/.build": true, + "**/*.hex": true, + "**/*.bin": true, + "**/*.uf2": true + }, + "files.associations": { + "*.h": "c", + "*.c": "c", + "*.inc": "c", + "*.cpp": "cpp", + "*.hpp": "cpp", + "xstddef": "c", + "type_traits": "c", + "utility": "c", + "ranges": "c" + }, + "[markdown]": { + "editor.trimAutoWhitespace": false, + "files.trimTrailingWhitespace": false + }, + "python.formatting.provider": "yapf", + "[json]": { + "editor.formatOnSave": false + } +} From f04dc4968ca7ca446e97d42e5edd4c80b7a23854 Mon Sep 17 00:00:00 2001 From: gkeyboard Date: Thu, 23 Feb 2023 02:09:43 +0700 Subject: [PATCH 13/13] Revert "remove" This reverts commit 646c367174d47b5ead9503be248178b8c8638ac4. --- .vscode/extensions.json | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .vscode/extensions.json diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 000000000000..889d9d610eb6 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,10 @@ +// Suggested extensions +{ + "recommendations": [ + "EditorConfig.EditorConfig", + "xaver.clang-format", + "ms-vscode.cpptools", + "bierner.github-markdown-preview", + "donjayamanne.git-extension-pack" + ] +}