From 32d03eef902a1ac9cec53804dcb72ace5c585960 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Rodr=C3=ADguez=20Rivero?= Date: Thu, 12 Mar 2020 03:50:19 +0100 Subject: Danielo515/redox (#8232) * feat(build): added script for compiling with docker easily * chore: bring my own build with docker to master * chore: delete a file that does not make sense anymore * feat: first redox for danielo * chore: basic compatibility between redox and my space * refactor: removed some old stuff * feat: added go coding symbols * feat: name control_k and alt_j * chore: reduce combo term * feat: improved first layer of redox * feat: add configurations to the redox * feat: make alt tab more portable * feat: small improvements to redox layout * feat: added leader * refactor: move leader defs to my userspace config * chore: movement modified * feat: more predefined keys and a a new combo * feat: redox alt tab functionality * refactor: move alt_tab processing to a separate file * refactor: early return * refactor: move process record to a separate file * format leader function * chore: backspace on digits layer * feat: add extra combo * feat: added more combos * implement guard proposed by @drashna Co-Authored-By: Drashna Jaelre * chore: include @drashna placeholder suggestion Co-Authored-By: Drashna Jaelre Co-authored-by: Drashna Jaelre --- users/danielo515/combo.c | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) (limited to 'users/danielo515/combo.c') diff --git a/users/danielo515/combo.c b/users/danielo515/combo.c index bf7d5f9a8a..1c84143772 100644 --- a/users/danielo515/combo.c +++ b/users/danielo515/combo.c @@ -1,21 +1,36 @@ #include "combo.h" + enum combos { - JK_ESC, - YU_COM, - UI_COM, - IO_COM, - OP_COM, - QW_COM + JK_ESC, + YU_COM, + UI_COM, + IO_COM, + QW_COM, + COM_SLS, + COM_DOT, + M_COMM, + N_M, + OP_COM, }; const uint16_t PROGMEM ui_combo[] = {KC_U, KC_I, COMBO_END}; const uint16_t PROGMEM jk_combo[] = {KC_J, KC_K, COMBO_END}; const uint16_t PROGMEM yu_combo[] = {KC_Y, KC_U, COMBO_END}; const uint16_t PROGMEM io_combo[] = {KC_I, KC_O, COMBO_END}; +const uint16_t PROGMEM qw_combo[] = {KC_Q, KC_W, COMBO_END}; +const uint16_t PROGMEM com_sls[] = {KC_COMMA, KC_SLSH, COMBO_END}; +const uint16_t PROGMEM com_dot[] = {KC_COMMA, KC_DOT, COMBO_END}; +const uint16_t PROGMEM m_comm[] = {KC_M,KC_COMMA, COMBO_END}; +const uint16_t PROGMEM n_m[] = {KC_N, KC_M,COMBO_END}; combo_t key_combos[COMBO_COUNT] = { - [JK_ESC] = COMBO(jk_combo, KC_ESC), - [YU_COM] = COMBO(yu_combo, KC_CIRC), - [UI_COM] = COMBO(ui_combo, KC_ESC), - [IO_COM] = COMBO(io_combo, KC_TILD) + [JK_ESC] = COMBO(jk_combo, KC_ESC), + [YU_COM] = COMBO(yu_combo, KC_CIRC), + [UI_COM] = COMBO(ui_combo, KC_DLR), + [IO_COM] = COMBO(io_combo, KC_TILD), + [QW_COM] = COMBO(qw_combo, KC_AT), + [COM_SLS] = COMBO(com_sls, KC_QUES), + [COM_DOT] = COMBO(com_dot, KC_QUES), + [M_COMM] = COMBO(m_comm, KC_ESC), + [N_M] = COMBO(n_m, KC_DLR), }; -- cgit v1.2.3