summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-01-03 17:08:10 +0000
committerQMK Bot <hello@qmk.fm>2022-01-03 17:08:10 +0000
commit1f1d2ffd29faf90b2a899fec71fc09f7a09481dd (patch)
treefd9cc63183c837fc3243e6f216a00d775a5f91bf
parent0a3452f307897aeebff7823fff0fd9f5b0e051a1 (diff)
parenta88dc08643af76e19eff72dbd9b2a0cefea3f23f (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--docs/feature_macros.md2
-rw-r--r--keyboards/kprepublic/bm60hsrgb/rev2/info.json4
-rw-r--r--keyboards/kprepublic/bm60hsrgb/rev2/keymaps/default/keymap.c5
-rw-r--r--keyboards/kprepublic/bm60hsrgb/rev2/keymaps/via/keymap.c9
-rw-r--r--keyboards/kprepublic/bm60hsrgb/rev2/rev2.h2
5 files changed, 13 insertions, 9 deletions
diff --git a/docs/feature_macros.md b/docs/feature_macros.md
index 4368853569..f39c1a40e8 100644
--- a/docs/feature_macros.md
+++ b/docs/feature_macros.md
@@ -193,6 +193,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
```
+?> An enumerated list of custom keycodes (`enum custom_keycodes`) must be declared before `keymaps[]` array, `process_record_user()` and any other function that use the list for the compiler to recognise it.
+
#### Advanced Macros
In addition to the `process_record_user()` function, is the `post_process_record_user()` function. This runs after `process_record` and can be used to do things after a keystroke has been sent. This is useful if you want to have a key pressed before and released after a normal key, for instance.
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/info.json b/keyboards/kprepublic/bm60hsrgb/rev2/info.json
index 51a6fbc880..7cbd7fb4f7 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/info.json
@@ -1,9 +1,9 @@
{
"keyboard_name": "bm60v2",
"url": "",
- "maintainer": "kp republic",
+ "maintainer": "bdtc123",
"layouts": {
- "LAYOUT": {
+ "LAYOUT_60_ansi_arrow": {
"layout": [
{"x":0, "y":0},
{"x":1, "y":0},
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/keymaps/default/keymap.c b/keyboards/kprepublic/bm60hsrgb/rev2/keymaps/default/keymap.c
index 58828d5181..a46be1786e 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/keymaps/default/keymap.c
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/keymaps/default/keymap.c
@@ -1,4 +1,5 @@
/* Copyright 2021 bdtc123
+ * Copyright 2022 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
@@ -16,14 +17,14 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT(
+ [0] = LAYOUT_60_ansi_arrow(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, KC_UP, KC_SLSH,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
),
- [1] = LAYOUT(
+ [1] = LAYOUT_60_ansi_arrow(
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, RESET,
_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/keymaps/via/keymap.c b/keyboards/kprepublic/bm60hsrgb/rev2/keymaps/via/keymap.c
index cca11326d0..55db68139e 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/keymaps/via/keymap.c
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/keymaps/via/keymap.c
@@ -1,4 +1,5 @@
/* Copyright 2021 bdtc123
+ * Copyright 2022 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
@@ -16,28 +17,28 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT(
+ [0] = LAYOUT_60_ansi_arrow(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, KC_UP, KC_SLSH,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
),
- [1] = LAYOUT(
+ [1] = LAYOUT_60_ansi_arrow(
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, RESET,
_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
),
- [2] = LAYOUT(
+ [2] = LAYOUT_60_ansi_arrow(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
),
- [3] = LAYOUT(
+ [3] = LAYOUT_60_ansi_arrow(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/rev2.h b/keyboards/kprepublic/bm60hsrgb/rev2/rev2.h
index de1df85666..f8aeaca39e 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/rev2.h
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/rev2.h
@@ -17,7 +17,7 @@
#include "quantum.h"
-#define LAYOUT( \
+#define LAYOUT_60_ansi_arrow( \
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, K2D, \