summaryrefslogtreecommitdiffstats
path: root/keyboards/kprepublic/bm40hsrgb
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/kprepublic/bm40hsrgb')
-rwxr-xr-xkeyboards/kprepublic/bm40hsrgb/bm40hsrgb.c2
-rwxr-xr-xkeyboards/kprepublic/bm40hsrgb/bm40hsrgb.h30
-rwxr-xr-xkeyboards/kprepublic/bm40hsrgb/config.h11
-rw-r--r--keyboards/kprepublic/bm40hsrgb/info.json108
-rw-r--r--keyboards/kprepublic/bm40hsrgb/keymaps/34keys/config.h3
-rw-r--r--keyboards/kprepublic/bm40hsrgb/keymaps/coffee/keymap.c2
-rw-r--r--keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/config.h3
-rwxr-xr-xkeyboards/kprepublic/bm40hsrgb/rules.mk1
8 files changed, 63 insertions, 97 deletions
diff --git a/keyboards/kprepublic/bm40hsrgb/bm40hsrgb.c b/keyboards/kprepublic/bm40hsrgb/bm40hsrgb.c
index a0ba84db3c..16e515042d 100755
--- a/keyboards/kprepublic/bm40hsrgb/bm40hsrgb.c
+++ b/keyboards/kprepublic/bm40hsrgb/bm40hsrgb.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 "bm40hsrgb.h"
+#include "quantum.h"
#if defined(RGB_MATRIX_ENABLE)
led_config_t g_led_config = {
diff --git a/keyboards/kprepublic/bm40hsrgb/bm40hsrgb.h b/keyboards/kprepublic/bm40hsrgb/bm40hsrgb.h
deleted file mode 100755
index 5bde6ec9c5..0000000000
--- a/keyboards/kprepublic/bm40hsrgb/bm40hsrgb.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2020 tominabox1
- *
- * 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_planck_mit( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
- K300, K301, K302, K303, K304, K305, K307, K308, K309, K310, K311 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211 }, \
- { K300, K301, K302, K303, K304, K305, KC_NO, K307, K308, K309, K310, K311 } \
-}
-
diff --git a/keyboards/kprepublic/bm40hsrgb/config.h b/keyboards/kprepublic/bm40hsrgb/config.h
index 3028c31e89..f6b358d2bb 100755
--- a/keyboards/kprepublic/bm40hsrgb/config.h
+++ b/keyboards/kprepublic/bm40hsrgb/config.h
@@ -15,26 +15,15 @@
*/
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B3, B2, E6, B5 }
-#define MATRIX_COL_PINS { B6, C6, B4, D7, D4, D6, C7, F6, F5, F4, F1, F0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* 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
-#define RGB_DI_PIN E2
#define RGB_MATRIX_LED_COUNT 53
-#ifdef RGB_DI_PIN
# define RGB_MATRIX_KEYPRESSES // reacts to keypresses
# define RGBLIGHT_LIMIT_VAL 180 // Limit to vendor-recommended value
-#endif
#ifdef RGB_MATRIX_ENABLE
# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
diff --git a/keyboards/kprepublic/bm40hsrgb/info.json b/keyboards/kprepublic/bm40hsrgb/info.json
index 10c41a9b3c..bf0bf727bd 100644
--- a/keyboards/kprepublic/bm40hsrgb/info.json
+++ b/keyboards/kprepublic/bm40hsrgb/info.json
@@ -8,59 +8,73 @@
"pid": "0x3430",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "E2"
+ },
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
+ "matrix_pins": {
+ "cols": ["B6", "C6", "B4", "D7", "D4", "D6", "C7", "F6", "F5", "F4", "F1", "F0"],
+ "rows": ["B3", "B2", "E6", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["planck_mit"],
"layouts": {
"LAYOUT_planck_mit": {
"layout": [
- {"label":"K00 (B3,B6)", "x":0, "y":0},
- {"label":"K01 (B3,C6)", "x":1, "y":0},
- {"label":"K02 (B3,B4)", "x":2, "y":0},
- {"label":"K03 (B3,D7)", "x":3, "y":0},
- {"label":"K04 (B3,D4)", "x":4, "y":0},
- {"label":"K05 (B3,D6)", "x":5, "y":0},
- {"label":"K06 (B3,C7)", "x":6, "y":0},
- {"label":"K07 (B3,F6)", "x":7, "y":0},
- {"label":"K08 (B3,F5)", "x":8, "y":0},
- {"label":"K09 (B3,F4)", "x":9, "y":0},
- {"label":"K0A (B3,F1)", "x":10, "y":0},
- {"label":"K0B (B3,F0)", "x":11, "y":0},
- {"label":"K10 (B2,B6)", "x":0, "y":1},
- {"label":"K11 (B2,C6)", "x":1, "y":1},
- {"label":"K12 (B2,B4)", "x":2, "y":1},
- {"label":"K13 (B2,D7)", "x":3, "y":1},
- {"label":"K14 (B2,D4)", "x":4, "y":1},
- {"label":"K15 (B2,D6)", "x":5, "y":1},
- {"label":"K16 (B2,C7)", "x":6, "y":1},
- {"label":"K17 (B2,F6)", "x":7, "y":1},
- {"label":"K18 (B2,F5)", "x":8, "y":1},
- {"label":"K19 (B2,F4)", "x":9, "y":1},
- {"label":"K1A (B2,F1)", "x":10, "y":1},
- {"label":"K1B (B2,F0)", "x":11, "y":1},
- {"label":"K20 (E6,B6)", "x":0, "y":2},
- {"label":"K21 (E6,C6)", "x":1, "y":2},
- {"label":"K22 (E6,B4)", "x":2, "y":2},
- {"label":"K23 (E6,D7)", "x":3, "y":2},
- {"label":"K24 (E6,D4)", "x":4, "y":2},
- {"label":"K25 (E6,D6)", "x":5, "y":2},
- {"label":"K26 (E6,C7)", "x":6, "y":2},
- {"label":"K27 (E6,F6)", "x":7, "y":2},
- {"label":"K28 (E6,F5)", "x":8, "y":2},
- {"label":"K29 (E6,F4)", "x":9, "y":2},
- {"label":"K2A (E6,F1)", "x":10, "y":2},
- {"label":"K2B (E6,F0)", "x":11, "y":2},
- {"label":"K30 (B5,B6)", "x":0, "y":3},
- {"label":"K31 (B5,C6)", "x":1, "y":3},
- {"label":"K32 (B5,B4)", "x":2, "y":3},
- {"label":"K33 (B5,D7)", "x":3, "y":3},
- {"label":"K34 (B5,D4)", "x":4, "y":3},
- {"label":"K35 (B5,D6)", "x":5, "y":3, "w":2},
- {"label":"K37 (B5,F6)", "x":7, "y":3},
- {"label":"K38 (B5,F5)", "x":8, "y":3},
- {"label":"K39 (B5,F4)", "x":9, "y":3},
- {"label":"K3A (B5,F1)", "x":10, "y":3},
- {"label":"K3B (B5,F0)", "x":11, "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": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "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": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "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": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+ {"matrix": [2, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "y": 2},
+ {"matrix": [2, 10], "x": 10, "y": 2},
+ {"matrix": [2, 11], "x": 11, "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},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3}
]
}
}
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/config.h b/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/config.h
index a6a97d5b76..3a48491679 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/config.h
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/config.h
@@ -8,9 +8,6 @@
#define TAPPING_TERM 200 // time of holding key, milliseconds
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
-
// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
#define QUICK_TAP_TERM 0
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/keymap.c
index 53f605c54d..a41020446d 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/keymap.c
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/keymap.c
@@ -42,7 +42,7 @@ static int current_accel = 0;
static uint16_t REC = DM_REC1;
static uint16_t PLY = DM_PLY1;
- void dynamic_macro_record_start_user(void) {
+ void dynamic_macro_record_start_user(int8_t direction) {
REC = DM_RSTP;
RECORDING = true;
}
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/config.h b/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/config.h
index 9d566d388d..a669c31c24 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/config.h
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/config.h
@@ -19,9 +19,6 @@
#undef TAPPING_TERM
#define TAPPING_TERM 200
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
-
// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
#define QUICK_TAP_TERM 0
diff --git a/keyboards/kprepublic/bm40hsrgb/rules.mk b/keyboards/kprepublic/bm40hsrgb/rules.mk
index 9690e3e495..7e0de4a3e8 100755
--- a/keyboards/kprepublic/bm40hsrgb/rules.mk
+++ b/keyboards/kprepublic/bm40hsrgb/rules.mk
@@ -10,6 +10,5 @@ NKRO_ENABLE = no # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
AUDIO_ENABLE = no # Audio output
RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
LAYOUTS_HAS_RGB = yes