summaryrefslogtreecommitdiff
path: root/keyboards/gkeyboard
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/gkeyboard')
-rw-r--r--keyboards/gkeyboard/gkb_m16/config.h20
-rw-r--r--keyboards/gkeyboard/gkb_m16/gkb_m16.c17
-rw-r--r--keyboards/gkeyboard/gkb_m16/gkb_m16.h40
-rw-r--r--keyboards/gkeyboard/gkb_m16/info.json43
-rw-r--r--keyboards/gkeyboard/gpad8_2r/config.h1
-rw-r--r--keyboards/gkeyboard/gpad8_2r/info.json68
-rw-r--r--keyboards/gkeyboard/gpad8_2r/keymaps/default/keymap.c2
-rw-r--r--keyboards/gkeyboard/gpad8_2r/keymaps/via/keymap.c2
-rw-r--r--keyboards/gkeyboard/gpad8_2r/rules.mk1
9 files changed, 61 insertions, 133 deletions
diff --git a/keyboards/gkeyboard/gkb_m16/config.h b/keyboards/gkeyboard/gkb_m16/config.h
index 9589c7887d..b05a0d33b4 100644
--- a/keyboards/gkeyboard/gkb_m16/config.h
+++ b/keyboards/gkeyboard/gkb_m16/config.h
@@ -17,25 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D4, D5, D6, D7 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F1
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 4
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/gkeyboard/gkb_m16/gkb_m16.c b/keyboards/gkeyboard/gkb_m16/gkb_m16.c
deleted file mode 100644
index 5a1f7f13e3..0000000000
--- a/keyboards/gkeyboard/gkb_m16/gkb_m16.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 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 <http://www.gnu.org/licenses/>.
- */
-
-#include "gkb_m16.h"
diff --git a/keyboards/gkeyboard/gkb_m16/gkb_m16.h b/keyboards/gkeyboard/gkb_m16/gkb_m16.h
deleted file mode 100644
index 8477f4cda3..0000000000
--- a/keyboards/gkeyboard/gkb_m16/gkb_m16.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2020 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 <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_4x4( \
- K01, K02, K03, K04, \
- K11, K12, K13, K14, \
- K21, K22, K23, K24, \
- K31, K32, K33, K34 \
-) \
-{ \
- { K01, K02, K03, K04 }, \
- { K11, K12, K13, K14 }, \
- { K21, K22, K23, K24 }, \
- { K31, K32, K33, K34 } \
-}
diff --git a/keyboards/gkeyboard/gkb_m16/info.json b/keyboards/gkeyboard/gkb_m16/info.json
index ca200a1485..ebf5ee8845 100644
--- a/keyboards/gkeyboard/gkb_m16/info.json
+++ b/keyboards/gkeyboard/gkb_m16/info.json
@@ -8,27 +8,38 @@
"pid": "0x4201",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "F1"
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7"],
+ "rows": ["D4", "D5", "D6", "D7"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_ortho_4x4": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
- {"x":0, "y":1},
- {"x":1, "y":1},
- {"x":2, "y":1},
- {"x":3, "y":1},
- {"x":0, "y":2},
- {"x":1, "y":2},
- {"x":2, "y":2},
- {"x":3, "y":2},
- {"x":0, "y":3},
- {"x":1, "y":3},
- {"x":2, "y":3},
- {"x":3, "y":3}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3}
]
}
}
diff --git a/keyboards/gkeyboard/gpad8_2r/config.h b/keyboards/gkeyboard/gpad8_2r/config.h
index e3a0340f19..0691d106b7 100644
--- a/keyboards/gkeyboard/gpad8_2r/config.h
+++ b/keyboards/gkeyboard/gpad8_2r/config.h
@@ -5,7 +5,6 @@
#define DYNAMIC_KEYMAP_LAYER_COUNT 8
-#define RGB_DI_PIN GP19
#define RGB_MATRIX_LED_COUNT 16
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/gkeyboard/gpad8_2r/info.json b/keyboards/gkeyboard/gpad8_2r/info.json
index fcc900a35f..81ac15251f 100644
--- a/keyboards/gkeyboard/gpad8_2r/info.json
+++ b/keyboards/gkeyboard/gpad8_2r/info.json
@@ -28,52 +28,48 @@
"encoder": {
"enabled": true,
"rotary": [
- {
- "pin_a": "GP29",
- "pin_b": "GP28",
- "resolution": 4
- },
- {
- "pin_a": "GP2",
- "pin_b": "GP3",
- "resolution": 4
- }
+ {"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 }
+ {"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}
]
},
+ "ws2812": {
+ "pin": "GP19",
+ "driver": "vendor"
+ },
"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 }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [2, 0], "x": 0, "y": 2.25},
+ {"matrix": [2, 1], "x": 1, "y": 2.25},
+ {"matrix": [2, 2], "x": 2, "y": 2.25},
+ {"matrix": [2, 3], "x": 3, "y": 2.25}
]
}
}
diff --git a/keyboards/gkeyboard/gpad8_2r/keymaps/default/keymap.c b/keyboards/gkeyboard/gpad8_2r/keymaps/default/keymap.c
index 41b505336d..536a1ee7d8 100644
--- a/keyboards/gkeyboard/gpad8_2r/keymaps/default/keymap.c
+++ b/keyboards/gkeyboard/gpad8_2r/keymaps/default/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[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) },
diff --git a/keyboards/gkeyboard/gpad8_2r/keymaps/via/keymap.c b/keyboards/gkeyboard/gpad8_2r/keymaps/via/keymap.c
index 589a1b1539..ec81153d2b 100644
--- a/keyboards/gkeyboard/gpad8_2r/keymaps/via/keymap.c
+++ b/keyboards/gkeyboard/gpad8_2r/keymaps/via/keymap.c
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[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) },
diff --git a/keyboards/gkeyboard/gpad8_2r/rules.mk b/keyboards/gkeyboard/gpad8_2r/rules.mk
index 997fce7e65..e69de29bb2 100644
--- a/keyboards/gkeyboard/gpad8_2r/rules.mk
+++ b/keyboards/gkeyboard/gpad8_2r/rules.mk
@@ -1 +0,0 @@
-WS2812_DRIVER = vendor
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-30 20:34:57 +0000