Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Danielo515/redox #8232

Merged
merged 27 commits into from
Mar 12, 2020
Merged

Danielo515/redox #8232

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
c620f79
feat(build): added script for compiling with docker easily
danielo515 Oct 31, 2018
5a3e76f
chore: bring my own build with docker to master
danielo515 Jan 25, 2020
b502334
chore: delete a file that does not make sense anymore
danielo515 Jan 30, 2020
31e9c35
feat: first redox for danielo
danielo515 Jan 30, 2020
db17b26
chore: basic compatibility between redox and my space
danielo515 Jan 31, 2020
ac18543
refactor: removed some old stuff
danielo515 Feb 14, 2020
6350561
feat: added go coding symbols
danielo515 Feb 14, 2020
fe30547
feat: name control_k and alt_j
danielo515 Feb 16, 2020
b15612f
chore: reduce combo term
danielo515 Feb 16, 2020
ecd4279
feat: improved first layer of redox
danielo515 Feb 19, 2020
1c82379
feat: add configurations to the redox
danielo515 Feb 19, 2020
4d4c803
feat: make alt tab more portable
danielo515 Feb 19, 2020
2d290cc
feat: small improvements to redox layout
danielo515 Feb 19, 2020
ef45684
feat: added leader
danielo515 Feb 20, 2020
046a917
refactor: move leader defs to my userspace config
danielo515 Feb 20, 2020
1e8e37c
chore: movement modified
danielo515 Feb 20, 2020
5f47f5c
feat: more predefined keys and a a new combo
danielo515 Feb 20, 2020
ce5be7b
feat: redox alt tab functionality
danielo515 Feb 23, 2020
467e05b
refactor: move alt_tab processing to a separate file
danielo515 Feb 23, 2020
fa7ee91
refactor: early return
danielo515 Feb 23, 2020
7abe631
refactor: move process record to a separate file
danielo515 Feb 23, 2020
2e527c8
format leader function
danielo515 Feb 23, 2020
ed56032
chore: backspace on digits layer
danielo515 Feb 24, 2020
f4dd142
feat: add extra combo
danielo515 Feb 24, 2020
17fc04c
feat: added more combos
danielo515 Feb 26, 2020
6fb646c
implement guard proposed by @drashna
danielo515 Mar 6, 2020
6db354a
chore: include @drashna placeholder suggestion
danielo515 Mar 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat: add configurations to the redox
  • Loading branch information
@danielo515
danielo515 committed Feb 19, 2020
commit 1c82379fba18e54d41d6670eefd042cd35310858
3 changes: 3 additions & 0 deletions keyboards/redox_w/keymaps/danielo515/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@

#define TAPPING_TERM 200
#define IGNORE_MOD_TAP_INTERRUPT
49 changes: 34 additions & 15 deletions keyboards/redox_w/keymaps/danielo515/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,26 @@
#include "danielo515.h"

// Shortcut to make keymap more readable
#define SYM_L OSL(_SYMB)
# define SYM_L OSL(_SYMB)

#define KC_ALAS LALT_T(KC_PAST) // alt + keypad *
#define KC_CTPL LCTL_T(KC_BSLS) // <C-\>
# define KC_ALAS LALT_T(KC_PAST) // alt or keypad *
# define KC_CTPL LCTL_T(KC_BSLS) // <C-\>

#define KC_NAGR LT(_NAV, KC_GRV)
#define KC_NAMI LT(_NAV, KC_MINS)
# define KC_NAGR LT(_NAV, KC_GRV)
# define KC_NAMI LT(_NAV, KC_MINS)
# define AD_ESC LT(_ADJUST, KC_ESC)
# define NAV_SPC LT(_NAV, KC_SPACE)

#define KC_ADEN LT(_ADJUST, KC_END)
#define KC_ADPU LT(_ADJUST, KC_PGUP)
#define WIN_LEFT WIN_TO_LEFT
#define WIN_RIGHT WIN_TO_RIGHT
# define TD_COPY TD(COPY_CUT)
# define KC_ADPU LT(_ADJUST, KC_PGUP)
# define WIN_LEFT WIN_TO_LEFT
# define WIN_RIGHT WIN_TO_RIGHT
# define COPY_CUT TD(COPY_CUT)
# define TD_PASTE TD(PASTE_DANCE)
# define CTL OSM(MOD_LCTL)
# define ALT OSM(MOD_LALT)
# define GUI OSM(MOD_LGUI)
# define ENT_SYM LT(_SYMB, KC_ENT)
# define __S LT(_S,KC_S)

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

Expand All @@ -28,11 +31,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
KC_TAB ,KC_Q ,KC_W ,KC_E ,KC_R ,KC_T ,TD_PASTE, SYM_L ,KC_Y ,KC_U ,KC_I ,KC_O ,KC_P ,KC_MINS ,
//├────────┼────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
KC_ESC ,KC_A ,KC_S ,KC_D ,KC_F ,KC_G ,TD_COPY , KC_UNDS ,HYPR_H ,ALT_J ,CTL_K ,KC_L ,TD_CLN ,CMD_QUOT,
KC_ESC ,KC_A ,__S ,KC_D ,KC_F ,KC_G ,COPY_CUT, KC_UNDS ,HYPR_H ,ALT_J ,CTL_K ,KC_L ,TD_CLN ,CMD_QUOT,
//├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
SHIFT ,KC_Z ,KC_X ,KC_C ,KC_V ,KC_B ,KC_ADPU ,KC_PGDN , KC_HOME ,KC_ADEN ,KC_N ,KC_M ,KC_COMM ,KC_DOT ,KC_SLSH ,KC_ASTR ,
KC_BSLS ,KC_Z ,KC_X ,KC_C ,KC_V ,KC_B ,KC_DEL ,KC_PGDN , KC_HOME ,AD_ESC ,KC_N ,KC_M ,KC_COMM ,KC_DOT ,KC_SLSH ,KC_ASTR ,
//├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤ ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
GUI ,CTL ,ALT ,KC_ALAS , KC_UNDS , KC_BSPC ,KC_DEL , KC_ENT ,KC_SPC , KC_RALT , KC_LEFT ,KC_DOWN ,KC_UP ,KC_RGHT
GUI ,CTL ,ALT ,KC_ALAS , GUI , SHIFT ,KC_BSPC , KC_DEL ,NAV_SPC , ENT_SYM , KC_LEFT ,KC_DOWN ,KC_UP ,KC_RGHT
//└────────┴────────┴────────┴────────┘ └────────┘ └────────┴────────┘ └────────┴────────┘ └────────┘ └────────┴────────┴────────┴────────┘
),

Expand Down Expand Up @@ -66,16 +69,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

[_ADJUST] = LAYOUT(
//┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
XXXXXXX ,KC_F1 ,KC_F2 ,KC_F3 ,KC_F4 ,KC_F5 , KC_F6 ,KC_F7 ,KC_F8 ,KC_F9 ,KC_F10 ,XXXXXXX ,
XXXXXXX ,KC_F1 ,KC_F2 ,KC_F3 ,KC_F4 ,KC_F5 , KC_F6 ,KC_F7 ,KC_F8 ,KC_F9 ,KC_F10 ,KC_F11 ,
//├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
XXXXXXX ,RESET ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
XXXXXXX ,RESET ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,KC_F12 ,
//├────────┼────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
//├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,XXXXXXX , XXXXXXX ,_______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
//├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤ ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , XXXXXXX , XXXXXXX ,XXXXXXX , XXXXXXX ,XXXXXXX , XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX
//└────────┴────────┴────────┴────────┘ └────────┘ └────────┴────────┘ └────────┴────────┘ └────────┘ └────────┴────────┴────────┴────────┘
),
[_S] = LAYOUT(
//┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
XXXXXXX ,KC_F1 ,KC_F2 ,KC_F3 ,KC_F4 ,KC_F5 , KC_F6 ,KC_F7 ,KC_F8 ,KC_F9 ,KC_F10 ,XXXXXXX ,
//├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
XXXXXXX ,RESET ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , XXXXXXX ,KC_HASH ,KC_LCBR ,KC_RCBR ,KC_ASTR ,KC_PERC ,KC_DLR ,
//├────────┼────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
XXXXXXX ,XXXXXXX ,_______ ,KC_EQL ,F_ARROW ,XXXXXXX ,XXXXXXX , XXXXXXX ,KC_AMPR ,KC_LPRN ,KC_RPRN ,CLN_EQ ,KC_PLUS ,KC_PIPE ,
//├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , XXXXXXX ,XXXXXXX ,KC_EXLM ,KC_TILD ,KC_CIRC ,ARROW ,KC_BSLASH,IARROW ,
//├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤ ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , XXXXXXX , XXXXXXX ,XXXXXXX , XXXXXXX ,XXXXXXX , XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX
//└────────┴────────┴────────┴────────┘ └────────┘ └────────┴────────┘ └────────┴────────┘ └────────┘ └────────┴────────┴────────┴────────┘
)

};
Expand All @@ -94,6 +110,9 @@ layer_state_t layer_state_set_user(layer_state_t state) {
case _ADJUST:
set_led_red;
break;
case _S:
set_led_magenta;
break;
default:
break;
}
Expand Down
6 changes: 6 additions & 0 deletions keyboards/redox_w/keymaps/danielo515/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@

TAP_DANCE_ENABLE = yes # Enable the tap dance feature.
COMBO_ENABLE = yes
LEADER_ENABLE = no
CONSOLE_ENABLE = no
LTO_ENABLE = yes