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

Move my custom functions and keymaps to userspace #10502

Merged
merged 3 commits into from
Oct 4, 2020
Merged

Move my custom functions and keymaps to userspace #10502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c7fa6d
Move my custom functions and keymaps to userspace to be able to add t…
riblee Oct 1, 2020
e8a8434
Move keymaps to community layouts
riblee Oct 1, 2020
250b5ca
Remove keymaps from userspace readme.md
riblee Oct 1, 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
2 changes: 1 addition & 1 deletion keyboards/handwired/riblee_f401/riblee_f401.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2020 QMK Community, Daniel Reibl <janos.daniel.reibl@protonmail.com>
Copyright 2020 QMK Community, Janos Daniel Reibl <janos.daniel.reibl@protonmail.com> @riblee

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 2 additions & 0 deletions keyboards/handwired/riblee_f401/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,5 @@ BACKLIGHT_DRIVER = software
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
BLUETOOTH_ENABLE = no # Enable Bluetooth
AUDIO_ENABLE = no # Audio output

LAYOUTS = ortho_5x12
2 changes: 1 addition & 1 deletion ...wired/riblee_f401/keymaps/riblee/config.h → layouts/community/ortho_5x12/riblee/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright 2020 Daniel Reibl <janos.daniel.reibl@protonmail.com>
/* Copyright 2020 Janos Daniel Reibl <janos.daniel.reibl@protonmail.com> @riblee
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
184 changes: 3 additions & 181 deletions ...wired/riblee_f401/keymaps/riblee/keymap.c → layouts/community/ortho_5x12/riblee/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/* Copyright 2015-2017 Jack Humbert
* Copyright 2020 Daniel Reibl <janos.daniel.reibl@protonmail.com>
/* Copyright 2020 Janos Daniel Reibl <janos.daniel.reibl@protonmail.com> @riblee
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand All @@ -14,146 +13,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "riblee.h"

#include QMK_KEYBOARD_H

enum preonic_layers {
_QWERTY,
_COLEMAK,
_DVORAK,
_LOWER,
_RAISE,
_ADJUST
};

enum preonic_keycodes {
QWERTY = SAFE_RANGE,
COLEMAK,
DVORAK,
BACKLIT
};

#define LOWER MO(_LOWER)
#define RAISE MO(_RAISE)

// Tap Dance declarations
enum {
TD_A,
TD_E,
TD_I,
TD_O,
TD_U,
};

const uint8_t shift = MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT);

// Tap Dance functions
void dance_key_a (qk_tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
SEND_STRING("a");
reset_tap_dance(state);
} else if (state->count == 2) {
if (!(keyboard_report->mods & shift)) {
send_unicode_string("á");
} else {
send_unicode_string("Á");
}

reset_tap_dance(state);
}
}

void dance_key_e (qk_tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
SEND_STRING("e");
reset_tap_dance(state);
} else if (state->count == 2) {
if (!(keyboard_report->mods & shift)) {
send_unicode_string("é");
} else {
send_unicode_string("É");
}

reset_tap_dance(state);
}
}

void dance_key_i (qk_tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
SEND_STRING("i");
reset_tap_dance(state);
} else if (state->count == 2) {
if (!(keyboard_report->mods & shift)) {
send_unicode_string("í");
} else {
send_unicode_string("Í");
}

reset_tap_dance(state);
}
}

void dance_key_o (qk_tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
SEND_STRING("o");
reset_tap_dance(state);
} else if (state->count == 2) {
if (!(keyboard_report->mods & shift)) {
send_unicode_string("ó");
} else {
send_unicode_string("Ó");
}

reset_tap_dance(state);
} else if (state->count == 3) {
if (!(keyboard_report->mods & shift)) {
send_unicode_string("ö");
} else {
send_unicode_string("Ö");
}

reset_tap_dance(state);
} else if (state->count == 4) {
if (!(keyboard_report->mods & shift)) {
send_unicode_string("ő");
} else {
send_unicode_string("Ő");
}

reset_tap_dance(state);
}
}

void dance_key_u (qk_tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
SEND_STRING("u");
reset_tap_dance(state);
} else if (state->count == 2) {
if (!(keyboard_report->mods & shift)) {
send_unicode_string("ú");
} else {
send_unicode_string("Ú");
}

reset_tap_dance(state);
} else if (state->count == 3) {
if (!(keyboard_report->mods & shift)) {
send_unicode_string("ü");
} else {
send_unicode_string("Ü");
}

reset_tap_dance(state);
} else if (state->count == 4) {
if (!(keyboard_report->mods & shift)) {
send_unicode_string("ű");
} else {
send_unicode_string("Ű");
}

reset_tap_dance(state);
}
}

// Tap Dance definitions
qk_tap_dance_action_t tap_dance_actions[] = {
Expand Down Expand Up @@ -299,43 +160,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
)

};

layer_state_t layer_state_set_user(layer_state_t state) {
return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
}

bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
case QWERTY:
if (record->event.pressed) {
set_single_persistent_default_layer(_QWERTY);
}
return false;
break;
case COLEMAK:
if (record->event.pressed) {
set_single_persistent_default_layer(_COLEMAK);
}
return false;
break;
case DVORAK:
if (record->event.pressed) {
set_single_persistent_default_layer(_DVORAK);
}
return false;
break;
case BACKLIT:
if (record->event.pressed) {
register_code(keycode_config(KC_LGUI));
#ifdef BACKLIGHT_ENABLE
backlight_step();
#endif
} else {
unregister_code(keycode_config(KC_LGUI));
}
return false;
break;
}
return true;
};
};
0 ...ired/riblee_f401/keymaps/riblee/readme.md → ...uts/community/ortho_5x12/riblee/readme.md
View file
Open in desktop
File renamed without changes.
0 ...wired/riblee_f401/keymaps/riblee/rules.mk → layouts/community/ortho_5x12/riblee/rules.mk
View file
Open in desktop
File renamed without changes.
14 changes: 14 additions & 0 deletions users/riblee/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
Copyright 2020 Janos Daniel Reibl <janos.daniel.reibl@protonmail.com> @riblee

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Loading