summaryrefslogtreecommitdiff
path: root/keyboards/keyboardio
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/keyboardio')
-rw-r--r--keyboards/keyboardio/atreus/keymaps/ardumont/keymap.c8
-rw-r--r--keyboards/keyboardio/atreus/keymaps/default/keymap.c2
-rw-r--r--keyboards/keyboardio/atreus/keymaps/via/keymap.c2
-rw-r--r--keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c2
-rw-r--r--keyboards/keyboardio/model01/config.h2
-rw-r--r--keyboards/keyboardio/model01/keymaps/default/keymap.c9
-rw-r--r--keyboards/keyboardio/model01/leds.c2
7 files changed, 14 insertions, 13 deletions
diff --git a/keyboards/keyboardio/atreus/keymaps/ardumont/keymap.c b/keyboards/keyboardio/atreus/keymaps/ardumont/keymap.c
index 373438e4b4..b630b6f698 100644
--- a/keyboards/keyboardio/atreus/keymaps/ardumont/keymap.c
+++ b/keyboards/keyboardio/atreus/keymaps/ardumont/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P ,
KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN ,
Z_SFT, KC_X, KC_C, KC_V, KC_B, KC_GRAVE, KC_BSLS, KC_N, KC_M, KC_COMM, KC_DOT, SLSH_SFT,
- KC_LCTRL, KC_ESC, KC_LGUI, KC_LALT, KC_SPC, FN0, FN0, KC_SPC, KC_LALT, KC_MINS, KC_QUOT, KC_LCTRL
+ KC_LCTL, KC_ESC, KC_LGUI, KC_LALT, KC_SPC, FN0, FN0, KC_SPC, KC_LALT, KC_MINS, KC_QUOT, KC_LCTL
),
/*
@@ -83,10 +83,10 @@ bool substitute_keycode(uint16_t keycode, keyrecord_t *record, uint8_t mod_state
// of the delete key status: registered or not?
static bool key_registered;
// ctrl activated?
- if ((mod_state & MOD_BIT(KC_LCTRL)) == MOD_BIT(KC_LCTRL)) {
+ if ((mod_state & MOD_BIT(KC_LCTL)) == MOD_BIT(KC_LCTL)) {
if (record->event.pressed) {
- // No need to register KC_LCTRL because it's already active.
- unregister_code(KC_LCTRL);
+ // No need to register KC_LCTL because it's already active.
+ unregister_code(KC_LCTL);
// Send substitute code
register_code(substitute_keycode);
// Update the boolean variable to reflect the status of the register
diff --git a/keyboards/keyboardio/atreus/keymaps/default/keymap.c b/keyboards/keyboardio/atreus/keymaps/default/keymap.c
index 6971edc332..f24cc7595d 100644
--- a/keyboards/keyboardio/atreus/keymaps/default/keymap.c
+++ b/keyboards/keyboardio/atreus/keymaps/default/keymap.c
@@ -39,5 +39,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_INS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_UP, KC_F7, KC_F8, KC_F9, KC_F10 ,
KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_DOWN, KC_F4, KC_F5, KC_F6, KC_F11 ,
KC_NO, KC_VOLU, KC_NO, KC_NO, QK_BOOT, _______, _______, KC_NO, KC_F1, KC_F2, KC_F3, KC_F12 ,
- KC_NO, KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC, TO(_QW), KC_PSCR, KC_SLCK, KC_PAUS )
+ KC_NO, KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC, TO(_QW), KC_PSCR, KC_SCRL, KC_PAUS )
};
diff --git a/keyboards/keyboardio/atreus/keymaps/via/keymap.c b/keyboards/keyboardio/atreus/keymaps/via/keymap.c
index dee94fc57e..87d6102bc3 100644
--- a/keyboards/keyboardio/atreus/keymaps/via/keymap.c
+++ b/keyboards/keyboardio/atreus/keymaps/via/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_INS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_UP, KC_F7, KC_F8, KC_F9, KC_F10 ,
KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_DOWN, KC_F4, KC_F5, KC_F6, KC_F11 ,
KC_NO, KC_VOLU, KC_NO, KC_NO, QK_BOOT, KC_TRNS, KC_TRNS, KC_NO, KC_F1, KC_F2, KC_F3, KC_F12 ,
- TO(0), KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC, TO(0), KC_PSCR, KC_SLCK, KC_PAUS ),
+ TO(0), KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC, TO(0), KC_PSCR, KC_SCRL, KC_PAUS ),
[3] = LAYOUT( /* blank */
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ,
diff --git a/keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c b/keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c
index 9d7dc826fb..3a3fbd6d71 100644
--- a/keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c
+++ b/keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c
@@ -171,7 +171,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
`-----------------------------------------'`-----------------------------------------'*/
[_ADJUST] = LAYOUT(
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10 ,
- KC_F11, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_F12 ,
+ KC_F11, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_F12 ,
_______, QWERTY, COLEMAK, DVORAK, DVORMAC, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT
),
diff --git a/keyboards/keyboardio/model01/config.h b/keyboards/keyboardio/model01/config.h
index 2bb5cb7386..c3874206d0 100644
--- a/keyboards/keyboardio/model01/config.h
+++ b/keyboards/keyboardio/model01/config.h
@@ -27,7 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEBOUNCE 0
/* RGB matrix constants */
-#define DRIVER_LED_TOTAL 64
+#define RGB_MATRIX_LED_COUNT 64
// RGB Matrix Animation modes. Explicitly enabled
// For full list of effects, see:
diff --git a/keyboards/keyboardio/model01/keymaps/default/keymap.c b/keyboards/keyboardio/model01/keymaps/default/keymap.c
index 1ff1eb8370..3ed72adb73 100644
--- a/keyboards/keyboardio/model01/keymaps/default/keymap.c
+++ b/keyboards/keyboardio/model01/keymaps/default/keymap.c
@@ -103,10 +103,11 @@ static void set_numpad_colours(int on, void (*write)(int, uint8_t, uint8_t, uint
/* the RGB matrix effects will overwrite the numpad indicator.
* this handy mechanism allows to override the matrix effects.
*/
-void rgb_matrix_indicators_user(void) {
- if (layer_state & (1<<NUM)) {
- set_numpad_colours(1, &rgb_matrix_set_color);
- }
+bool rgb_matrix_indicators_user(void) {
+ if (layer_state & (1 << NUM)) {
+ set_numpad_colours(1, &rgb_matrix_set_color);
+ }
+ return false;
}
#else /* no RGB matrix support */
diff --git a/keyboards/keyboardio/model01/leds.c b/keyboards/keyboardio/model01/leds.c
index 0308887d3b..7e65134bd4 100644
--- a/keyboards/keyboardio/model01/leds.c
+++ b/keyboards/keyboardio/model01/leds.c
@@ -89,7 +89,7 @@ static void set_color(int index, uint8_t r, uint8_t g, uint8_t b) {
}
static void set_color_all(uint8_t r, uint8_t g, uint8_t b) {
- for (int i=0; i<DRIVER_LED_TOTAL; i++)
+ for (int i=0; i<RGB_MATRIX_LED_COUNT; i++)
set_color(i, r, g, b);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 22:09:49 +0000