From 7f805cc7799deb0ca75f751cebd32c6640058af9 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Thu, 23 Feb 2023 09:19:00 +1100 Subject: VIA Protocol 12 + fixes (#19916) Co-authored-by: Wilba Co-authored-by: zvecr --- keyboards/nullbitsco/nibble/keymaps/oled_bongocat/keymap.c | 2 +- keyboards/nullbitsco/nibble/keymaps/via/keymap.c | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) (limited to 'keyboards/nullbitsco/nibble/keymaps') diff --git a/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/keymap.c b/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/keymap.c index 631f28171a..33652005cb 100644 --- a/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/keymap.c +++ b/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/keymap.c @@ -29,7 +29,7 @@ enum layer_names { #define KC_DISC_DEAF KC_F24 enum custom_keycodes { - PROG = USER00, + PROG = QK_KB_0, DISC_MUTE, DISC_DEAF, SUPER_ALT_TAB, diff --git a/keyboards/nullbitsco/nibble/keymaps/via/keymap.c b/keyboards/nullbitsco/nibble/keymaps/via/keymap.c index aab6a41af3..b71f9119ef 100644 --- a/keyboards/nullbitsco/nibble/keymaps/via/keymap.c +++ b/keyboards/nullbitsco/nibble/keymaps/via/keymap.c @@ -24,11 +24,9 @@ enum layer_names { #define KC_DISC_MUTE KC_F23 #define KC_DISC_DEAF KC_F24 -#define NUM_CUST_KEYCODES (_NUM_CUST_KCS - SAFE_RANGE) -#define VIA_KEYCODE_RANGE USER00 enum custom_keycodes { - PROG = SAFE_RANGE, + PROG = QK_KB_0, DISC_MUTE, DISC_DEAF, SUPER_ALT_TAB, @@ -76,17 +74,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; -void map_via_keycode(uint16_t * keycode) { - if (abs(*keycode - VIA_KEYCODE_RANGE) < NUM_CUST_KEYCODES) { //make into macro? - dprintf("VIA custom keycode found, mapping to QMK keycode.\n"); - uint16_t new_keycode = (*keycode - VIA_KEYCODE_RANGE) + SAFE_RANGE; - dprintf("VIA KC: %u QMK KC: %u\n", *keycode, new_keycode); - *keycode = new_keycode; - } -} bool process_record_user(uint16_t keycode, keyrecord_t *record) { - map_via_keycode(&keycode); // Send keystrokes to host keyboard, if connected (see readme) process_record_remote_kb(keycode, record); switch(keycode) { -- cgit v1.2.3