summaryrefslogtreecommitdiff
path: root/keyboards/gl516
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/gl516')
-rw-r--r--keyboards/gl516/a52gl/a52gl.c18
-rw-r--r--keyboards/gl516/a52gl/a52gl.h37
-rw-r--r--keyboards/gl516/a52gl/info.json114
-rw-r--r--keyboards/gl516/j73gl/config.h3
-rw-r--r--keyboards/gl516/j73gl/info.json154
-rw-r--r--keyboards/gl516/j73gl/j73gl.c2
-rw-r--r--keyboards/gl516/j73gl/j73gl.h40
-rw-r--r--keyboards/gl516/n51gl/config.h3
-rw-r--r--keyboards/gl516/n51gl/info.json3
-rw-r--r--keyboards/gl516/n51gl/keymaps/salicylic/keymap.c4
-rw-r--r--keyboards/gl516/n51gl/keymaps/via/keymap.c4
-rw-r--r--keyboards/gl516/n51gl/n51gl.c18
-rw-r--r--keyboards/gl516/xr63gl/xr63gl.c2
13 files changed, 152 insertions, 250 deletions
diff --git a/keyboards/gl516/a52gl/a52gl.c b/keyboards/gl516/a52gl/a52gl.c
deleted file mode 100644
index 67c27d2d7d..0000000000
--- a/keyboards/gl516/a52gl/a52gl.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 Salicylic_Acid
-
-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 "a52gl.h"
diff --git a/keyboards/gl516/a52gl/a52gl.h b/keyboards/gl516/a52gl/a52gl.h
deleted file mode 100644
index 6ff00c541f..0000000000
--- a/keyboards/gl516/a52gl/a52gl.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright 2021 Salicylic_Acid
-
-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"
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
- L30, L31, L32, L34, L35, L36, R31, R33, R34, R35, R36 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, L06 }, \
- { L10, L11, L12, L13, L14, L15, L16 }, \
- { L20, L21, L22, L23, L24, L25, L26 }, \
- { L30, L31, L32, KC_NO, L34, L35, L36 }, \
- { R00, R01, R02, R03, R04, R05, R06 }, \
- { R10, R11, R12, R13, R14, R15, KC_NO }, \
- { R20, R21, R22, R23, R24, R25, R26 }, \
- { KC_NO, R31, KC_NO, R33, R34, R35, R36 } \
- }
diff --git a/keyboards/gl516/a52gl/info.json b/keyboards/gl516/a52gl/info.json
index 45b2dd7423..add8dc6c41 100644
--- a/keyboards/gl516/a52gl/info.json
+++ b/keyboards/gl516/a52gl/info.json
@@ -13,58 +13,68 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"0,0", "x":0, "y":0},
- {"label":"0,1", "x":1, "y":0},
- {"label":"0,2", "x":2.25, "y":0},
- {"label":"0,3", "x":3.25, "y":0},
- {"label":"0,4", "x":4.25, "y":0},
- {"label":"0,5", "x":5.25, "y":0},
- {"label":"0,6", "x":7.75, "y":0},
- {"label":"4,0", "x":8.75, "y":0},
- {"label":"4,1", "x":9.75, "y":0},
- {"label":"4,2", "x":10.75, "y":0},
- {"label":"4,3", "x":12, "y":0},
- {"label":"4,4", "x":13, "y":0},
- {"label":"4,5", "x":14, "y":0},
- {"label":"4,6", "x":15, "y":0, "w":1.5},
- {"label":"1,0", "x":0, "y":1, "w":1.25},
- {"label":"1,1", "x":1.25, "y":1},
- {"label":"1,2", "x":2.52, "y":1},
- {"label":"1,3", "x":3.52, "y":1},
- {"label":"1,4", "x":4.52, "y":1},
- {"label":"1,5", "x":5.52, "y":1},
- {"label":"1,6", "x":8, "y":1},
- {"label":"5,0", "x":9, "y":1},
- {"label":"5,1", "x":10, "y":1},
- {"label":"5,2", "x":11, "y":1},
- {"label":"5,3", "x":12.25, "y":1},
- {"label":"5,4", "x":13.25, "y":1},
- {"label":"5,5", "x":14.25, "y":1, "w":2.25},
- {"label":"2,0", "x":0, "y":2, "w":1.75},
- {"label":"2,1", "x":1.75, "y":2},
- {"label":"2,2", "x":3.05, "y":2},
- {"label":"2,3", "x":4.05, "y":2},
- {"label":"2,4", "x":5.05, "y":2},
- {"label":"2,5", "x":6.05, "y":2},
- {"label":"2,6", "x":7.5, "y":2},
- {"label":"6,0", "x":8.5, "y":2},
- {"label":"6,1", "x":9.5, "y":2},
- {"label":"6,2", "x":10.5, "y":2},
- {"label":"6,3", "x":12, "y":2},
- {"label":"6,4", "x":13, "y":2},
- {"label":"6,5", "x":14.25, "y":2.25},
- {"label":"6,6", "x":15.5, "y":2},
- {"label":"3,0", "x":0, "y":3, "w":1.25},
- {"label":"3,1", "x":1.25, "y":3, "w":1.25},
- {"label":"3,2", "x":3.05, "y":3},
- {"label":"3,4", "x":4.05, "y":3, "w":2},
- {"label":"3,5", "x":6.05, "y":3},
- {"label":"3,6", "x":7.5, "y":3, "w":2.25},
- {"label":"7,1", "x":9.75, "y":3, "w":1.25},
- {"label":"7,3", "x":12.0, "y":3},
- {"label":"7,4", "x":13.25, "y":3.25},
- {"label":"7,5", "x":14.25, "y":3.25},
- {"label":"7,6", "x":15.25, "y":3.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+
+ {"matrix": [0, 6], "x": 7.75, "y": 0},
+ {"matrix": [4, 0], "x": 8.75, "y": 0},
+ {"matrix": [4, 1], "x": 9.75, "y": 0},
+ {"matrix": [4, 2], "x": 10.75, "y": 0},
+ {"matrix": [4, 3], "x": 12, "y": 0},
+ {"matrix": [4, 4], "x": 13, "y": 0},
+ {"matrix": [4, 5], "x": 14, "y": 0},
+ {"matrix": [4, 6], "x": 15, "y": 0, "w": 1.5},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.52, "y": 1},
+ {"matrix": [1, 3], "x": 3.52, "y": 1},
+ {"matrix": [1, 4], "x": 4.52, "y": 1},
+ {"matrix": [1, 5], "x": 5.52, "y": 1},
+
+ {"matrix": [1, 6], "x": 8, "y": 1},
+ {"matrix": [5, 0], "x": 9, "y": 1},
+ {"matrix": [5, 1], "x": 10, "y": 1},
+ {"matrix": [5, 2], "x": 11, "y": 1},
+ {"matrix": [5, 3], "x": 12.25, "y": 1},
+ {"matrix": [5, 4], "x": 13.25, "y": 1},
+ {"matrix": [5, 5], "x": 14.25, "y": 1, "w": 2.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 3.05, "y": 2},
+ {"matrix": [2, 3], "x": 4.05, "y": 2},
+ {"matrix": [2, 4], "x": 5.05, "y": 2},
+ {"matrix": [2, 5], "x": 6.05, "y": 2},
+
+ {"matrix": [2, 6], "x": 7.5, "y": 2},
+ {"matrix": [6, 0], "x": 8.5, "y": 2},
+ {"matrix": [6, 1], "x": 9.5, "y": 2},
+ {"matrix": [6, 2], "x": 10.5, "y": 2},
+ {"matrix": [6, 3], "x": 12, "y": 2},
+ {"matrix": [6, 4], "x": 13, "y": 2},
+
+ {"matrix": [6, 5], "x": 14.25, "y": 2.25},
+
+ {"matrix": [6, 6], "x": 15.5, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 2], "x": 3.05, "y": 3},
+ {"matrix": [3, 4], "x": 4.05, "y": 3, "w": 2},
+ {"matrix": [3, 5], "x": 6.05, "y": 3},
+
+ {"matrix": [3, 6], "x": 7.5, "y": 3, "w": 2.25},
+ {"matrix": [7, 1], "x": 9.75, "y": 3, "w": 1.25},
+ {"matrix": [7, 3], "x": 12, "y": 3},
+
+ {"matrix": [7, 4], "x": 13.25, "y": 3.25},
+ {"matrix": [7, 5], "x": 14.25, "y": 3.25},
+ {"matrix": [7, 6], "x": 15.25, "y": 3.25}
]
}
}
diff --git a/keyboards/gl516/j73gl/config.h b/keyboards/gl516/j73gl/config.h
index 8cd2c1fe6c..49205e59d1 100644
--- a/keyboards/gl516/j73gl/config.h
+++ b/keyboards/gl516/j73gl/config.h
@@ -31,9 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
#ifndef RGBLED_NUM
#define RGBLED_NUM 73
#endif
diff --git a/keyboards/gl516/j73gl/info.json b/keyboards/gl516/j73gl/info.json
index 42f6d368bb..f74d45fd3c 100644
--- a/keyboards/gl516/j73gl/info.json
+++ b/keyboards/gl516/j73gl/info.json
@@ -8,84 +8,92 @@
"pid": "0xE8D0",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "D3"
+ },
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"0,0", "x":0, "y":0},
- {"label":"0,1", "x":1, "y":0},
- {"label":"0,2", "x":2, "y":0},
- {"label":"0,3", "x":3, "y":0},
- {"label":"0,4", "x":4, "y":0},
- {"label":"0,5", "x":5, "y":0},
- {"label":"0,6", "x":6, "y":0},
- {"label":"5,0", "x":7, "y":0},
- {"label":"5,1", "x":8, "y":0},
- {"label":"5,2", "x":9, "y":0},
- {"label":"5,3", "x":10, "y":0},
- {"label":"5,4", "x":11, "y":0},
- {"label":"5,5", "x":12, "y":0},
- {"label":"5,6", "x":13, "y":0},
- {"label":"6,6", "x":14, "y":0},
- {"label":"5,7", "x":15, "y":0},
- {"label":"1,0", "x":0, "y":1, "w":1.5},
- {"label":"1,1", "x":1.5, "y":1},
- {"label":"1,2", "x":2.5, "y":1},
- {"label":"1,3", "x":3.5, "y":1},
- {"label":"1,4", "x":4.5, "y":1},
- {"label":"1,5", "x":5.5, "y":1},
- {"label":"1,6", "x":6.5, "y":1},
- {"label":"6,0", "x":7.5, "y":1},
- {"label":"6,1", "x":8.5, "y":1},
- {"label":"6,2", "x":9.5, "y":1},
- {"label":"6,3", "x":10.5, "y":1},
- {"label":"6,4", "x":11.5, "y":1},
- {"label":"6,5", "x":12.5, "y":1},
- {"label":"6,7", "x":15, "y":1},
- {"label":"2,0", "x":0, "y":2, "w":1.75},
- {"label":"2,1", "x":1.75, "y":2},
- {"label":"2,2", "x":2.75, "y":2},
- {"label":"2,3", "x":3.75, "y":2},
- {"label":"2,4", "x":4.75, "y":2},
- {"label":"2,5", "x":5.75, "y":2},
- {"label":"2,6", "x":6.75, "y":2},
- {"label":"7,0", "x":7.75, "y":2},
- {"label":"7,1", "x":8.75, "y":2},
- {"label":"7,2", "x":9.75, "y":2},
- {"label":"7,3", "x":10.75, "y":2},
- {"label":"7,4", "x":11.75, "y":2},
- {"label":"7,5", "x":12.75, "y":2},
- {"label":"7,6", "x":13.75, "y":1, "w":1.25, "h":2},
- {"label":"7,7", "x":15, "y":2},
- {"label":"3,0", "x":0, "y":3, "w":2.25},
- {"label":"3,1", "x":2.25, "y":3},
- {"label":"3,2", "x":3.25, "y":3},
- {"label":"3,3", "x":4.25, "y":3},
- {"label":"3,4", "x":5.25, "y":3},
- {"label":"3,5", "x":6.25, "y":3},
- {"label":"3,6", "x":7.25, "y":3},
- {"label":"8,0", "x":8.25, "y":3},
- {"label":"8,1", "x":9.25, "y":3},
- {"label":"8,2", "x":10.25, "y":3},
- {"label":"8,3", "x":11.25, "y":3},
- {"label":"8,5", "x":12.25, "y":3, "w":1.75},
- {"label":"8,6", "x":14, "y":3},
- {"label":"8,7", "x":15, "y":3},
- {"label":"4,0", "x":0, "y":4, "w":1.25},
- {"label":"4,1", "x":1.25, "y":4},
- {"label":"4,2", "x":2.25, "y":4, "w":1.25},
- {"label":"4,3", "x":3.5, "y":4},
- {"label":"4,4", "x":4.5, "y":4, "w":1.25},
- {"label":"4,5", "x":5.75, "y":4},
- {"label":"4,6", "x":6.75, "y":4},
- {"label":"9,0", "x":7.75, "y":4, "w":1.25},
- {"label":"9,1", "x":9, "y":4},
- {"label":"9,2", "x":10, "y":4, "w":1.25},
- {"label":"9,3", "x":11.25, "y":4, "w":1.25},
- {"label":"9,5", "x":13, "y":4},
- {"label":"9,6", "x":14, "y":4},
- {"label":"9,7", "x":15, "y":4}
+ {"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": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [5, 0], "x": 7, "y": 0},
+ {"matrix": [5, 1], "x": 8, "y": 0},
+ {"matrix": [5, 2], "x": 9, "y": 0},
+ {"matrix": [5, 3], "x": 10, "y": 0},
+ {"matrix": [5, 4], "x": 11, "y": 0},
+ {"matrix": [5, 5], "x": 12, "y": 0},
+ {"matrix": [5, 6], "x": 13, "y": 0},
+ {"matrix": [6, 6], "x": 14, "y": 0},
+ {"matrix": [5, 7], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [6, 0], "x": 7.5, "y": 1},
+ {"matrix": [6, 1], "x": 8.5, "y": 1},
+ {"matrix": [6, 2], "x": 9.5, "y": 1},
+ {"matrix": [6, 3], "x": 10.5, "y": 1},
+ {"matrix": [6, 4], "x": 11.5, "y": 1},
+ {"matrix": [6, 5], "x": 12.5, "y": 1},
+ {"matrix": [6, 7], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [7, 0], "x": 7.75, "y": 2},
+ {"matrix": [7, 1], "x": 8.75, "y": 2},
+ {"matrix": [7, 2], "x": 9.75, "y": 2},
+ {"matrix": [7, 3], "x": 10.75, "y": 2},
+ {"matrix": [7, 4], "x": 11.75, "y": 2},
+ {"matrix": [7, 5], "x": 12.75, "y": 2},
+ {"matrix": [7, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [7, 7], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [8, 0], "x": 8.25, "y": 3},
+ {"matrix": [8, 1], "x": 9.25, "y": 3},
+ {"matrix": [8, 2], "x": 10.25, "y": 3},
+ {"matrix": [8, 3], "x": 11.25, "y": 3},
+ {"matrix": [8, 5], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [8, 6], "x": 14, "y": 3},
+ {"matrix": [8, 7], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4},
+ {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.5, "y": 4},
+ {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 5.75, "y": 4},
+ {"matrix": [4, 6], "x": 6.75, "y": 4},
+ {"matrix": [9, 0], "x": 7.75, "y": 4, "w": 1.25},
+ {"matrix": [9, 1], "x": 9, "y": 4},
+ {"matrix": [9, 2], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [9, 3], "x": 11.25, "y": 4, "w": 1.25},
+
+ {"matrix": [9, 5], "x": 13, "y": 4},
+ {"matrix": [9, 6], "x": 14, "y": 4},
+ {"matrix": [9, 7], "x": 15, "y": 4}
]
}
}
diff --git a/keyboards/gl516/j73gl/j73gl.c b/keyboards/gl516/j73gl/j73gl.c
index 0e40f29b2a..f705a09545 100644
--- a/keyboards/gl516/j73gl/j73gl.c
+++ b/keyboards/gl516/j73gl/j73gl.c
@@ -15,7 +15,7 @@ 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 "j73gl.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
diff --git a/keyboards/gl516/j73gl/j73gl.h b/keyboards/gl516/j73gl/j73gl.h
deleted file mode 100644
index ad4821461a..0000000000
--- a/keyboards/gl516/j73gl/j73gl.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2021 Salicylic_Acid
-
-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"
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R16, R07, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R17, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, R27, \
- L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R35, R36, R37, \
- L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R45, R46, R47 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, L06, KC_NO }, \
- { L10, L11, L12, L13, L14, L15, L16, KC_NO }, \
- { L20, L21, L22, L23, L24, L25, L26, KC_NO }, \
- { L30, L31, L32, L33, L34, L35, L36, KC_NO }, \
- { L40, L41, L42, L43, L44, L45, L46, KC_NO }, \
- { R00, R01, R02, R03, R04, R05, R06, R07 }, \
- { R10, R11, R12, R13, R14, R15, R16, R17 }, \
- { R20, R21, R22, R23, R24, R25, R26, R27 }, \
- { R30, R31, R32, R33, KC_NO, R35, R36, R37 }, \
- { R40, R41, R42, R43, KC_NO, R45, R46, R47 } \
- }
diff --git a/keyboards/gl516/n51gl/config.h b/keyboards/gl516/n51gl/config.h
index 276e6f6c6d..cd919a72c4 100644
--- a/keyboards/gl516/n51gl/config.h
+++ b/keyboards/gl516/n51gl/config.h
@@ -31,9 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
#ifndef RGBLED_NUM
#define RGBLED_NUM 15
#endif
diff --git a/keyboards/gl516/n51gl/info.json b/keyboards/gl516/n51gl/info.json
index eaaf6e69dd..bb42d48981 100644
--- a/keyboards/gl516/n51gl/info.json
+++ b/keyboards/gl516/n51gl/info.json
@@ -8,6 +8,9 @@
"pid": "0xE8CF",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "D3"
+ },
"encoder": {
"rotary": [
{"pin_a": "D7", "pin_b": "E6", "resolution": 3}
diff --git a/keyboards/gl516/n51gl/keymaps/salicylic/keymap.c b/keyboards/gl516/n51gl/keymaps/salicylic/keymap.c
index 42b2204cf1..81f7b8665f 100644
--- a/keyboards/gl516/n51gl/keymaps/salicylic/keymap.c
+++ b/keyboards/gl516/n51gl/keymaps/salicylic/keymap.c
@@ -111,7 +111,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
key.row = 1;
key.col = 0;
}
- action_exec((keyevent_t){.key = key, .pressed = true, .time = (timer_read() | 1)});
- action_exec((keyevent_t){.key = key, .pressed = false, .time = (timer_read() | 1)});
+ action_exec(MAKE_KEYEVENT(key.row, key.col, true));
+ action_exec(MAKE_KEYEVENT(key.row, key.col, false));
return true;
}
diff --git a/keyboards/gl516/n51gl/keymaps/via/keymap.c b/keyboards/gl516/n51gl/keymaps/via/keymap.c
index a44392124c..cf1aa7d595 100644
--- a/keyboards/gl516/n51gl/keymaps/via/keymap.c
+++ b/keyboards/gl516/n51gl/keymaps/via/keymap.c
@@ -96,7 +96,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
key.row = 1;
key.col = 0;
}
- action_exec((keyevent_t){.key = key, .pressed = true, .time = (timer_read() | 1)});
- action_exec((keyevent_t){.key = key, .pressed = false, .time = (timer_read() | 1)});
+ action_exec(MAKE_KEYEVENT(key.row, key.col, true));
+ action_exec(MAKE_KEYEVENT(key.row, key.col, false));
return true;
}
diff --git a/keyboards/gl516/n51gl/n51gl.c b/keyboards/gl516/n51gl/n51gl.c
deleted file mode 100644
index f13d0cd78e..0000000000
--- a/keyboards/gl516/n51gl/n51gl.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 Salicylic_Acid
-
-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 "n51gl.h"
diff --git a/keyboards/gl516/xr63gl/xr63gl.c b/keyboards/gl516/xr63gl/xr63gl.c
index 4817f07a92..b2aa43c456 100644
--- a/keyboards/gl516/xr63gl/xr63gl.c
+++ b/keyboards/gl516/xr63gl/xr63gl.c
@@ -1,7 +1,7 @@
// Copyright 2022 gachiham (@gachiham)
// SPDX-License-Identifier: GPL-2.0-or-later
-#include QMK_KEYBOARD_H
+#include "quantum.h"
const matrix_row_t matrix_mask[MATRIX_ROWS] = {
0b1111111111111110,
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 00:42:33 +0000