diff options
Diffstat (limited to 'keyboards/converter/usb_usb')
-rw-r--r-- | keyboards/converter/usb_usb/custom_matrix.cpp | 3 | ||||
-rw-r--r-- | keyboards/converter/usb_usb/info.json | 1 | ||||
-rw-r--r-- | keyboards/converter/usb_usb/keymaps/chriskopher/config.h | 3 | ||||
-rw-r--r-- | keyboards/converter/usb_usb/keymaps/chriskopher/keymap.c | 10 | ||||
-rw-r--r-- | keyboards/converter/usb_usb/keymaps/chriskopher/tap_dance.c | 16 | ||||
-rw-r--r-- | keyboards/converter/usb_usb/rules.mk | 2 |
6 files changed, 17 insertions, 18 deletions
diff --git a/keyboards/converter/usb_usb/custom_matrix.cpp b/keyboards/converter/usb_usb/custom_matrix.cpp index a92feeb6c1..e94b6b07fb 100644 --- a/keyboards/converter/usb_usb/custom_matrix.cpp +++ b/keyboards/converter/usb_usb/custom_matrix.cpp @@ -233,6 +233,7 @@ extern "C" { if (kbd2.isReady()) kbd2.SetReport(0, 0, 2, 0, 1, &usb_led); if (kbd3.isReady()) kbd3.SetReport(0, 0, 2, 0, 1, &usb_led); if (kbd4.isReady()) kbd4.SetReport(0, 0, 2, 0, 1, &usb_led); - led_set_kb(usb_led); + led_set_user(usb_led); + led_update_kb((led_t){.raw = usb_led}); } } diff --git a/keyboards/converter/usb_usb/info.json b/keyboards/converter/usb_usb/info.json index 1bacf928a3..7292f2f3e9 100644 --- a/keyboards/converter/usb_usb/info.json +++ b/keyboards/converter/usb_usb/info.json @@ -8,6 +8,7 @@ "pid": "0x005B", "device_version": "0.0.1" }, + "community_layouts": ["fullsize_ansi", "fullsize_iso"], "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/converter/usb_usb/keymaps/chriskopher/config.h b/keyboards/converter/usb_usb/keymaps/chriskopher/config.h index 7714f713bd..04066edc02 100644 --- a/keyboards/converter/usb_usb/keymaps/chriskopher/config.h +++ b/keyboards/converter/usb_usb/keymaps/chriskopher/config.h @@ -18,8 +18,7 @@ #define TAPPING_TERM 200 // Delay for tap modifiers until it is considered a hold -#define IGNORE_MOD_TAP_INTERRUPT // Enable ignore mod tap interrupt: https://docs.qmk.fm/#/tap_hold?id=ignore-mod-tap-interrupt -#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY // Allows configuration of ignore mod tap interrupt per key in keymap.c +#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY // Allows configuration of hold on other key press per key in keymap.c #define COMBO_COUNT 2 // Number of defined combos #define COMBO_TERM 20 // Delay for combo keys to be chained together diff --git a/keyboards/converter/usb_usb/keymaps/chriskopher/keymap.c b/keyboards/converter/usb_usb/keymaps/chriskopher/keymap.c index 4113cdc67c..76cf311462 100644 --- a/keyboards/converter/usb_usb/keymaps/chriskopher/keymap.c +++ b/keyboards/converter/usb_usb/keymaps/chriskopher/keymap.c @@ -174,13 +174,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; // clang-format on -// Configure ignore mod tap interrupt per key -bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) { +// Configure hold on other key press per key +bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - // I don't like how mod tap interrupt feels with these keys specifically when I'm typing + // I don't like how ignore interrupt feels with these keys specifically when I'm typing case LCTL_T(KC_ESC): - return false; - default: return true; + default: + return false; } } diff --git a/keyboards/converter/usb_usb/keymaps/chriskopher/tap_dance.c b/keyboards/converter/usb_usb/keymaps/chriskopher/tap_dance.c index 8600d83996..51a677a588 100644 --- a/keyboards/converter/usb_usb/keymaps/chriskopher/tap_dance.c +++ b/keyboards/converter/usb_usb/keymaps/chriskopher/tap_dance.c @@ -31,7 +31,7 @@ static int espc_r_tap_state = 0; static int scln_cln_tap_state = 0; // Watch the state of the tap dance -int cur_dance(qk_tap_dance_state_t *state) { +int cur_dance(tap_dance_state_t *state) { if (state->pressed) { return SINGLE_HOLD; } @@ -49,7 +49,7 @@ int cur_dance(qk_tap_dance_state_t *state) { } // Extended Space Cadet Shift - Left ================================== -void espc_l_finished(qk_tap_dance_state_t *state, void *user_data) { +void espc_l_finished(tap_dance_state_t *state, void *user_data) { espc_l_tap_state = cur_dance(state); switch (espc_l_tap_state) { case SINGLE_TAP: // ( @@ -69,7 +69,7 @@ void espc_l_finished(qk_tap_dance_state_t *state, void *user_data) { } } -void espc_l_reset(qk_tap_dance_state_t *state, void *user_data) { +void espc_l_reset(tap_dance_state_t *state, void *user_data) { switch (espc_l_tap_state) { case SINGLE_TAP: // ( unregister_code16(LSFT(KC_9)); @@ -89,7 +89,7 @@ void espc_l_reset(qk_tap_dance_state_t *state, void *user_data) { // ====================================================================// // Extended Space Cadet Shift - Right ================================== -void espc_r_finished(qk_tap_dance_state_t *state, void *user_data) { +void espc_r_finished(tap_dance_state_t *state, void *user_data) { espc_r_tap_state = cur_dance(state); switch (espc_r_tap_state) { case SINGLE_TAP: // ) @@ -109,7 +109,7 @@ void espc_r_finished(qk_tap_dance_state_t *state, void *user_data) { } } -void espc_r_reset(qk_tap_dance_state_t *state, void *user_data) { +void espc_r_reset(tap_dance_state_t *state, void *user_data) { switch (espc_r_tap_state) { case SINGLE_TAP: // ) unregister_code16(LSFT(KC_0)); @@ -129,7 +129,7 @@ void espc_r_reset(qk_tap_dance_state_t *state, void *user_data) { // ====================================================================// // Semicolon - Colon ================================================== -void scln_cln_finished(qk_tap_dance_state_t *state, void *user_data) { +void scln_cln_finished(tap_dance_state_t *state, void *user_data) { scln_cln_tap_state = cur_dance(state); switch (scln_cln_tap_state) { case SINGLE_TAP: // ; @@ -141,7 +141,7 @@ void scln_cln_finished(qk_tap_dance_state_t *state, void *user_data) { } } -void scln_cln_reset(qk_tap_dance_state_t *state, void *user_data) { +void scln_cln_reset(tap_dance_state_t *state, void *user_data) { switch (scln_cln_tap_state) { case SINGLE_TAP: // ; unregister_code16(KC_SCLN); @@ -154,7 +154,7 @@ void scln_cln_reset(qk_tap_dance_state_t *state, void *user_data) { // ====================================================================// // Associate tap dance with defined functionality -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { // Extended space cadet shift left: Hold - Shift, One - (, Two - {, Three - [ [ESPC_L] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, espc_l_finished, espc_l_reset), // Extended space cadet shift right: Hold - Shift, One - ), Two - }, Three - ] diff --git a/keyboards/converter/usb_usb/rules.mk b/keyboards/converter/usb_usb/rules.mk index 1bdf3416aa..a33c0aaa54 100644 --- a/keyboards/converter/usb_usb/rules.mk +++ b/keyboards/converter/usb_usb/rules.mk @@ -22,5 +22,3 @@ CUSTOM_MATRIX = yes SRC += custom_matrix.cpp DEFAULT_FOLDER = converter/usb_usb/hasu - -LAYOUTS = fullsize_ansi fullsize_iso |