summaryrefslogtreecommitdiff
path: root/keyboards/kprepublic/bm60hsrgb_ec
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/kprepublic/bm60hsrgb_ec')
-rw-r--r--keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h21
-rw-r--r--keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json144
-rw-r--r--keyboards/kprepublic/bm60hsrgb_ec/rev1/rev1.c16
-rw-r--r--keyboards/kprepublic/bm60hsrgb_ec/rev1/rev1.h34
-rw-r--r--keyboards/kprepublic/bm60hsrgb_ec/rev1/rules.mk1
-rw-r--r--keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h17
-rw-r--r--keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json144
-rw-r--r--keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c16
-rw-r--r--keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.h35
-rw-r--r--keyboards/kprepublic/bm60hsrgb_ec/rev2/rules.mk1
10 files changed, 158 insertions, 271 deletions
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h b/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h
index 8a5d4a50bc..a11d579239 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev1/config.h
@@ -16,26 +16,7 @@
#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)
- *
- */
-
-// 0 1 2 3 4 5 6 7 8 9 A B C D
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, E6 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
#define RGB_MATRIX_LED_COUNT 69
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 69
#define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 140
@@ -82,5 +63,3 @@
#define ENABLE_RGB_MATRIX_MULTISPLASH
#define ENABLE_RGB_MATRIX_SOLID_SPLASH
#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-#endif
-
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json
index a255a480b3..3849e5a338 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json
@@ -8,6 +8,17 @@
"pid": "0xEF9C",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "E2"
+ },
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
+ "matrix_pins": {
+ "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
+ "rows": ["B0", "B1", "B2", "B3", "E6"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "F6", "pin_b": "F5", "resolution": 2}
@@ -18,76 +29,77 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"K00 (B0, D0)", "x":0, "y":0.5},
- {"label":"K01 (B0, D1)", "x":1, "y":0.5},
- {"label":"K02 (B0, D2)", "x":2, "y":0.5},
- {"label":"K03 (B0, D3)", "x":3, "y":0.5},
- {"label":"K04 (B0, D5)", "x":4, "y":0.5},
- {"label":"K05 (B0, D4)", "x":5, "y":0.5},
- {"label":"K06 (B0, D6)", "x":6, "y":0.5},
- {"label":"K07 (B0, D7)", "x":7, "y":0.5},
- {"label":"K08 (B0, B4)", "x":8, "y":0.5},
- {"label":"K09 (B0, B5)", "x":9, "y":0.5},
- {"label":"K0A (B0, B6)", "x":10, "y":0.5},
- {"label":"K0B (B0, C6)", "x":11, "y":0.5},
- {"label":"K0C (B0, C7)", "x":12, "y":0.5},
- {"label":"K0D (B0, F7)", "x":13, "y":0.5},
- {"label":"K21 (B2, D1)", "x":14, "y":0.5},
- {"label":"K43 (E6, D3)", "x":13.9, "y":0, "w":0.6, "h":0.5},
- {"label":"K44 (E6, D5)", "x":14.5, "y":0, "w":0.6, "h":0.5},
+ {"matrix": [0, 0], "x": 0, "y": 0.5},
+ {"matrix": [0, 1], "x": 1, "y": 0.5},
+ {"matrix": [0, 2], "x": 2, "y": 0.5},
+ {"matrix": [0, 3], "x": 3, "y": 0.5},
+ {"matrix": [0, 4], "x": 4, "y": 0.5},
+ {"matrix": [0, 5], "x": 5, "y": 0.5},
+ {"matrix": [0, 6], "x": 6, "y": 0.5},
+ {"matrix": [0, 7], "x": 7, "y": 0.5},
+ {"matrix": [0, 8], "x": 8, "y": 0.5},
+ {"matrix": [0, 9], "x": 9, "y": 0.5},
+ {"matrix": [0, 10], "x": 10, "y": 0.5},
+ {"matrix": [0, 11], "x": 11, "y": 0.5},
+ {"matrix": [0, 12], "x": 12, "y": 0.5},
+ {"matrix": [0, 13], "x": 13, "y": 0.5},
+ {"matrix": [2, 1], "x": 14, "y": 0.5},
+
+ {"matrix": [4, 3], "x": 13.9, "y": 0, "w": 0.6, "h": 0.5},
+ {"matrix": [4, 4], "x": 14.5, "y": 0, "w": 0.6, "h": 0.5},
- {"label":"K10 (B1, D0)", "x":0, "y":1.5, "w":1.5},
- {"label":"K11 (B1, D1)", "x":1.5, "y":1.5},
- {"label":"K12 (B1, D2)", "x":2.5, "y":1.5},
- {"label":"K13 (B1, D3)", "x":3.5, "y":1.5},
- {"label":"K14 (B1, D5)", "x":4.5, "y":1.5},
- {"label":"K15 (B1, D4)", "x":5.5, "y":1.5},
- {"label":"K16 (B1, D6)", "x":6.5, "y":1.5},
- {"label":"K17 (B1, D7)", "x":7.5, "y":1.5},
- {"label":"K18 (B1, B4)", "x":8.5, "y":1.5},
- {"label":"K19 (B1, B5)", "x":9.5, "y":1.5},
- {"label":"K1A (B1, B6)", "x":10.5, "y":1.5},
- {"label":"K1B (B1, C6)", "x":11.5, "y":1.5},
- {"label":"K1C (B1, C7)", "x":12.5, "y":1.5},
- {"label":"K1D (B1, F7)", "x":13.5, "y":1.5, "w":1.5},
+ {"matrix": [1, 0], "x": 0, "y": 1.5, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1.5},
+ {"matrix": [1, 2], "x": 2.5, "y": 1.5},
+ {"matrix": [1, 3], "x": 3.5, "y": 1.5},
+ {"matrix": [1, 4], "x": 4.5, "y": 1.5},
+ {"matrix": [1, 5], "x": 5.5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6.5, "y": 1.5},
+ {"matrix": [1, 7], "x": 7.5, "y": 1.5},
+ {"matrix": [1, 8], "x": 8.5, "y": 1.5},
+ {"matrix": [1, 9], "x": 9.5, "y": 1.5},
+ {"matrix": [1, 10], "x": 10.5, "y": 1.5},
+ {"matrix": [1, 11], "x": 11.5, "y": 1.5},
+ {"matrix": [1, 12], "x": 12.5, "y": 1.5},
+ {"matrix": [1, 13], "x": 13.5, "y": 1.5, "w": 1.5},
- {"label":"K20 (B2, D0)", "x":0, "y":2.5, "w":1.75},
- {"label":"K22 (B2, D2)", "x":1.75, "y":2.5},
- {"label":"K23 (B2, D3)", "x":2.75, "y":2.5},
- {"label":"K24 (B2, D5)", "x":3.75, "y":2.5},
- {"label":"K25 (B2, D4)", "x":4.75, "y":2.5},
- {"label":"K26 (B2, D6)", "x":5.75, "y":2.5},
- {"label":"K27 (B2, D7)", "x":6.75, "y":2.5},
- {"label":"K28 (B2, B4)", "x":7.75, "y":2.5},
- {"label":"K29 (B2, B5)", "x":8.75, "y":2.5},
- {"label":"K2A (B2, B6)", "x":9.75, "y":2.5},
- {"label":"K2B (B2, C6)", "x":10.75, "y":2.5},
- {"label":"K2C (B2, C7)", "x":11.75, "y":2.5},
- {"label":"K2D (B2, F7)", "x":12.75, "y":2.5, "w":2.25},
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2.5},
+ {"matrix": [2, 3], "x": 2.75, "y": 2.5},
+ {"matrix": [2, 4], "x": 3.75, "y": 2.5},
+ {"matrix": [2, 5], "x": 4.75, "y": 2.5},
+ {"matrix": [2, 6], "x": 5.75, "y": 2.5},
+ {"matrix": [2, 7], "x": 6.75, "y": 2.5},
+ {"matrix": [2, 8], "x": 7.75, "y": 2.5},
+ {"matrix": [2, 9], "x": 8.75, "y": 2.5},
+ {"matrix": [2, 10], "x": 9.75, "y": 2.5},
+ {"matrix": [2, 11], "x": 10.75, "y": 2.5},
+ {"matrix": [2, 12], "x": 11.75, "y": 2.5},
+ {"matrix": [2, 13], "x": 12.75, "y": 2.5, "w": 2.25},
- {"label":"K31 (B3, D1)", "x":0, "y":3.5, "w":2.25},
- {"label":"K32 (B3, D2)", "x":2.25, "y":3.5},
- {"label":"K33 (B3, D3)", "x":3.25, "y":3.5},
- {"label":"K34 (B3, D5)", "x":4.25, "y":3.5},
- {"label":"K35 (B3, D4)", "x":5.25, "y":3.5},
- {"label":"K36 (B3, D6)", "x":6.25, "y":3.5},
- {"label":"K37 (B3, D7)", "x":7.25, "y":3.5},
- {"label":"K38 (B3, B4)", "x":8.25, "y":3.5},
- {"label":"K39 (B3, B5)", "x":9.25, "y":3.5},
- {"label":"K3A (B3, B6)", "x":10.25, "y":3.5},
- {"label":"K3B (B3, C6)", "x":11.25, "y":3.5, "w":1.75},
- {"label":"K3C (B3, C7)", "x":13, "y":3.5},
- {"label":"K3D (B3, F7)", "x":14, "y":3.5},
+ {"matrix": [3, 1], "x": 0, "y": 3.5, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.25, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.25, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.25, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.25, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.25, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.25, "y": 3.5},
+ {"matrix": [3, 9], "x": 9.25, "y": 3.5},
+ {"matrix": [3, 10], "x": 10.25, "y": 3.5},
+ {"matrix": [3, 11], "x": 11.25, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 12], "x": 13, "y": 3.5},
+ {"matrix": [3, 13], "x": 14, "y": 3.5},
- {"label":"K40 (E6, D0)", "x":0, "y":4.5, "w":1.25},
- {"label":"K41 (E6, D1)", "x":1.25, "y":4.5, "w":1.25},
- {"label":"K42 (E6, D2)", "x":2.5, "y":4.5, "w":1.25},
- {"label":"K46 (E6, D6)", "x":3.75, "y":4.5, "w":6.25},
- {"label":"K49 (E6, B5)", "x":10, "y":4.5},
- {"label":"K4A (E6, B6)", "x":11, "y":4.5},
- {"label":"K4B (E6, C6)", "x":12, "y":4.5},
- {"label":"K4C (E6, C7)", "x":13, "y":4.5},
- {"label":"K4D (E6, F7)", "x":14, "y":4.5}
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4.5, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4.5},
+ {"matrix": [4, 10], "x": 11, "y": 4.5},
+ {"matrix": [4, 11], "x": 12, "y": 4.5},
+ {"matrix": [4, 12], "x": 13, "y": 4.5},
+ {"matrix": [4, 13], "x": 14, "y": 4.5}
]
}
}
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/rev1.c b/keyboards/kprepublic/bm60hsrgb_ec/rev1/rev1.c
index 9f7333b721..26afae87ae 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/rev1.c
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev1/rev1.c
@@ -13,7 +13,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 "rev1.h"
+#include "quantum.h"
led_config_t g_led_config = { {
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 },
{ 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27 },
@@ -57,17 +57,3 @@ bool rgb_matrix_indicators_kb(void) {
}
return true;
}
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
- if (!encoder_update_user(index, clockwise)) { return false; }
- if (index == 0) {
- if (clockwise) {
- tap_code_delay(KC_VOLU, 10);
- } else {
- tap_code_delay(KC_VOLD, 10);
- }
- }
- return true;
-}
-#endif
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/rev1.h b/keyboards/kprepublic/bm60hsrgb_ec/rev1/rev1.h
deleted file mode 100644
index 8ace666aac..0000000000
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/rev1.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2020 bdtc123
- * Copyright 2021 peepeetee
- * 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( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K21, K43, K44, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
- K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
- K40, K41, K42, K46, K49, K4A, K4B, K4C, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
- { KC_NO, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
- { K40, K41, K42, K43, K44, KC_NO, K46, KC_NO, KC_NO, K49, K4A, K4B, K4C, K4D }, \
-}
-
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/rules.mk b/keyboards/kprepublic/bm60hsrgb_ec/rev1/rules.mk
index 8164eaacdb..6cd530668c 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev1/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
LTO_ENABLE = yes
ENCODER_ENABLE = yes
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h
index b70904fae3..eada5a6c85 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h
@@ -15,26 +15,9 @@
*/
#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 { E6, D2, D3, D5, F6 }
-#define MATRIX_COL_PINS { B2, B3, B7, B0, B1, F7, D4, D6, D7, B4, B5, B6, C6, C7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
//rgb light setting
#define RGBLIGHT_LIMIT_VAL 150
#define RGBLED_NUM 6
-#define RGB_DI_PIN F0
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json
index 83efb7b5e7..2d2f4d6ef5 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json
@@ -8,6 +8,17 @@
"pid": "0x1124",
"device_version": "0.0.2"
},
+ "ws2812": {
+ "pin": "F0"
+ },
+ "rgb_matrix": {
+ "driver": "IS31FL3733"
+ },
+ "matrix_pins": {
+ "cols": ["B2", "B3", "B7", "B0", "B1", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
+ "rows": ["E6", "D2", "D3", "D5", "F6"]
+ },
+ "diode_direction": "ROW2COL",
"encoder": {
"rotary": [
{"pin_a": "F1", "pin_b": "F4", "resolution": 2}
@@ -19,76 +30,77 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0.5},
- {"x":1, "y":0.5},
- {"x":2, "y":0.5},
- {"x":3, "y":0.5},
- {"x":4, "y":0.5},
- {"x":5, "y":0.5},
- {"x":6, "y":0.5},
- {"x":7, "y":0.5},
- {"x":8, "y":0.5},
- {"x":9, "y":0.5},
- {"x":10, "y":0.5},
- {"x":11, "y":0.5},
- {"x":12, "y":0.5},
- {"x":13, "y":0.5},
- {"x":14, "y":0.5},
- {"x":13.9, "y":0, "w":0.6, "h":0.5},
- {"x":14.5, "y":0, "w":0.6, "h":0.5},
+ {"matrix": [0, 0], "x": 0, "y": 0.5},
+ {"matrix": [0, 1], "x": 1, "y": 0.5},
+ {"matrix": [0, 2], "x": 2, "y": 0.5},
+ {"matrix": [0, 3], "x": 3, "y": 0.5},
+ {"matrix": [0, 4], "x": 4, "y": 0.5},
+ {"matrix": [0, 5], "x": 5, "y": 0.5},
+ {"matrix": [0, 6], "x": 6, "y": 0.5},
+ {"matrix": [0, 7], "x": 7, "y": 0.5},
+ {"matrix": [0, 8], "x": 8, "y": 0.5},
+ {"matrix": [0, 9], "x": 9, "y": 0.5},
+ {"matrix": [0, 10], "x": 10, "y": 0.5},
+ {"matrix": [0, 11], "x": 11, "y": 0.5},
+ {"matrix": [0, 12], "x": 12, "y": 0.5},
+ {"matrix": [0, 13], "x": 13, "y": 0.5},
+ {"matrix": [2, 12], "x": 14, "y": 0.5},
+
+ {"matrix": [4, 3], "x": 13.9, "y": 0, "w": 0.6, "h": 0.5},
+ {"matrix": [4, 4], "x": 14.5, "y": 0, "w": 0.6, "h": 0.5},
- {"x":0, "y":1.5, "w":1.5},
- {"x":1.5, "y":1.5},
- {"x":2.5, "y":1.5},
- {"x":3.5, "y":1.5},
- {"x":4.5, "y":1.5},
- {"x":5.5, "y":1.5},
- {"x":6.5, "y":1.5},
- {"x":7.5, "y":1.5},
- {"x":8.5, "y":1.5},
- {"x":9.5, "y":1.5},
- {"x":10.5, "y":1.5},
- {"x":11.5, "y":1.5},
- {"x":12.5, "y":1.5},
- {"x":13.5, "y":1.5, "w":1.5},
+ {"matrix": [1, 0], "x": 0, "y": 1.5, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1.5},
+ {"matrix": [1, 2], "x": 2.5, "y": 1.5},
+ {"matrix": [1, 3], "x": 3.5, "y": 1.5},
+ {"matrix": [1, 4], "x": 4.5, "y": 1.5},
+ {"matrix": [1, 5], "x": 5.5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6.5, "y": 1.5},
+ {"matrix": [1, 7], "x": 7.5, "y": 1.5},
+ {"matrix": [1, 8], "x": 8.5, "y": 1.5},
+ {"matrix": [1, 9], "x": 9.5, "y": 1.5},
+ {"matrix": [1, 10], "x": 10.5, "y": 1.5},
+ {"matrix": [1, 11], "x": 11.5, "y": 1.5},
+ {"matrix": [1, 12], "x": 12.5, "y": 1.5},
+ {"matrix": [1, 13], "x": 13.5, "y": 1.5, "w": 1.5},
- {"x":0, "y":2.5, "w":1.75},
- {"x":1.75, "y":2.5},
- {"x":2.75, "y":2.5},
- {"x":3.75, "y":2.5},
- {"x":4.75, "y":2.5},
- {"x":5.75, "y":2.5},
- {"x":6.75, "y":2.5},
- {"x":7.75, "y":2.5},
- {"x":8.75, "y":2.5},
- {"x":9.75, "y":2.5},
- {"x":10.75, "y":2.5},
- {"x":11.75, "y":2.5},
- {"x":12.75, "y":2.5, "w":2.25},
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.75, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.75, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.75, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.75, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.75, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.75, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.75, "y": 2.5},
+ {"matrix": [2, 9], "x": 9.75, "y": 2.5},
+ {"matrix": [2, 10], "x": 10.75, "y": 2.5},
+ {"matrix": [2, 11], "x": 11.75, "y": 2.5},
+ {"matrix": [2, 13], "x": 12.75, "y": 2.5, "w": 2.25},
- {"x":0, "y":3.5, "w":2.25},
- {"x":2.25, "y":3.5},
- {"x":3.25, "y":3.5},
- {"x":4.25, "y":3.5},
- {"x":5.25, "y":3.5},
- {"x":6.25, "y":3.5},
- {"x":7.25, "y":3.5},
- {"x":8.25, "y":3.5},
- {"x":9.25, "y":3.5},
- {"x":10.25, "y":3.5},
- {"x":11.25, "y":3.5, "w":1.75},
- {"x":13, "y":3.5},
- {"x":14, "y":3.5},
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3.5},
+ {"matrix": [3, 2], "x": 3.25, "y": 3.5},
+ {"matrix": [3, 3], "x": 4.25, "y": 3.5},
+ {"matrix": [3, 4], "x": 5.25, "y": 3.5},
+ {"matrix": [3, 5], "x": 6.25, "y": 3.5},
+ {"matrix": [3, 6], "x": 7.25, "y": 3.5},
+ {"matrix": [3, 7], "x": 8.25, "y": 3.5},
+ {"matrix": [3, 8], "x": 9.25, "y": 3.5},
+ {"matrix": [3, 9], "x": 10.25, "y": 3.5},
+ {"matrix": [3, 11], "x": 11.25, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 12], "x": 13, "y": 3.5},
+ {"matrix": [3, 13], "x": 14, "y": 3.5},
- {"x":0, "y":4.5, "w":1.25},
- {"x":1.25, "y":4.5, "w":1.25},
- {"x":2.5, "y":4.5, "w":1.25},
- {"x":3.75, "y":4.5, "w":6.25},
- {"x":10, "y":4.5},
- {"x":11, "y":4.5},
- {"x":12, "y":4.5},
- {"x":13, "y":4.5},
- {"x":14, "y":4.5}
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4.5, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4.5},
+ {"matrix": [4, 10], "x": 11, "y": 4.5},
+ {"matrix": [4, 11], "x": 12, "y": 4.5},
+ {"matrix": [4, 12], "x": 13, "y": 4.5},
+ {"matrix": [4, 13], "x": 14, "y": 4.5}
]
}
}
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c
index 6cb40e0622..e738b47c40 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c
@@ -12,7 +12,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 "rev2.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
@@ -127,17 +127,3 @@ bool rgb_matrix_indicators_kb(void) {
return true;
}
#endif
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
- if (!encoder_update_user(index, clockwise)) { return false; }
- if (index == 0) {
- if (clockwise) {
- tap_code_delay(KC_VOLU, 10);
- } else {
- tap_code_delay(KC_VOLD, 10);
- }
- }
- return true;
-}
-#endif
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.h b/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.h
deleted file mode 100644
index 47da353b6c..0000000000
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2022 bdtc123
- * 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( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2C, K43, K44, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3B, K3C, K3D, \
- K40, K41, K42, K45, K49, K4A, K4B, K4C, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, KC_NO, K3B, K3C, K3D }, \
- { K40, K41, K42, K43, K44, K45, KC_NO, KC_NO, KC_NO, K49, K4A, K4B, K4C, K4D }, \
-}
-
-
-
-
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb_ec/rev2/rules.mk
index 858a74bdf0..a4b968313c 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
RGB_MATRIX_ENABLE = yes # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3733
ENCODER_ENABLE = yes
LTO_ENABLE = yes
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 00:04:46 +0000