Mark
/
QMK
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

Compare commits

base: Mark:27bbf48cbaeec15f6854019d55e7154e14d7e57c
Branches Tags
Mark:master
..
compare: Mark:c7a193a7d202c37f7a7739fd49f06b50ee40334c
Branches Tags
Mark:master

No commits in common. "27bbf48cbaeec15f6854019d55e7154e14d7e57c" and "c7a193a7d202c37f7a7739fd49f06b50ee40334c" have entirely different histories.
27bbf48cba ... c7a193a7d2

6 changed files with 12 additions and 67 deletions
Show Stats Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,5 +1,3 @@
/venv
/build
qmk/qmk.conf
secrets.h

12
keyboards/betalupi_ergodox/keymaps/default/config.h
View File

@ -1,12 +1,3 @@
// No timeout after initial leader key press
#define LEADER_NO_TIMEOUT
// Timeout resets after each keypress
#define LEADER_PER_KEY_TIMING
#define LEADER_TIMEOUT 250
// RGBLight effects
// Static color is always enabled.
//#define RGBLIGHT_EFFECT_ALTERNATING
@ -28,6 +19,9 @@
//#def DISABLE_RGB_MATRIX_FFT_ANIM // FFT Display (Requires framebuffer)
// Normal matrix effects
//#define DISABLE_RGB_MATRIX_SOLID_COLOR
#define DISABLE_RGB_MATRIX_ALPHAS_MODS // Static dual hue, speed is hue for secondary hue

48
keyboards/betalupi_ergodox/keymaps/default/keymap.c
View File

@ -1,11 +1,5 @@
#include "keymap.h"
// Values that should not be saved to git.
// Create a `secrets.h` in the keymap directory.
//
// It should define the following:
// SECRET_EMAIL
#include "secrets.h"
// Define custom keys
// (Must be done BEFORE keymaps)
@ -70,6 +64,7 @@ const uint8_t PROGMEM ledmap[][DRIVER_LED_TOTAL][3] = {
void keyboard_post_init_user(void) {}
void set_layer_color(int layer) {
for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
HSV hsv = {
@ -87,37 +82,6 @@ void set_layer_color(int layer) {
}
}
void leader_start(void) {
ergodox_right_led_3_on();
}
void leader_end(void) {
ergodox_right_led_3_off();
}
LEADER_EXTERNS();
void matrix_scan_user(void) {
LEADER_DICTIONARY() {
leading = false;
leader_end();
//SEQ_ONE_KEY(KC_F) {}
//
//SEQ_TWO_KEYS(KC_A, KC_S) {
// register_code(KC_LGUI);
// register_code(KC_S);
// unregister_code(KC_S);
// unregister_code(KC_LGUI);
//}
SEQ_TWO_KEYS(KC_E, KC_M) {
SEND_STRING(SECRET_EMAIL);
}
}
}
void rgb_matrix_indicators_user(void) {
if (keyboard_config.disable_layer_led) {
return;
@ -176,16 +140,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
layer_move(LAYER_RUSSIAN_IDX);
}
break;
case M_RU_ALT:
if (record->event.pressed) {
layer_move(LAYER_MAIN_IDX);
register_code16(KC_LALT);
} else {
unregister_code16(KC_LALT);
layer_move(LAYER_RUSSIAN_IDX);
}
break;
}
return true;
}

6
keyboards/betalupi_ergodox/keymaps/default/layers/main.h
View File

@ -5,7 +5,7 @@
KC_ESCAPE, KC_1, KC_2, KC_3, KC_4, KC_5, TG(LAYER_NUMPAD_IDX),\
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LGUI,\
KC_DELETE, KC_A, KC_S, KC_D, KC_F, KC_G,\
KC_LCTRL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_NO,\
M_RU_CTRL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_NO,\
MO(LAYER_DESKTOP_IDX), MO(LAYER_FKEYS_IDX), KC_LALT, KC_LSHIFT, MO(LAYER_ARROWS_IDX),\
\
KC_PSCREEN, KC_NO,\
@ -13,8 +13,8 @@
KC_SPACE, KC_BSPACE, LCTL(KC_BSPACE),\
\
\
KC_NO, KC_6, KC_7, KC_8, KC_9, KC_0, LGUI(KC_TAB),\
KC_NO, KC_Y, KC_U, KC_I, KC_O, KC_NO, KC_LEAD,\
LCTL(KC_LALT), KC_6, KC_7, KC_8, KC_9, KC_0, LGUI(KC_TAB),\
KC_NO, KC_Y, KC_U, KC_I, KC_O, KC_NO, KC_NO,\
KC_H, KC_J, KC_K, MO(LAYER_SYMBOLS_IDX), KC_L, KC_NO,\
KC_NO, KC_N, KC_M, KC_P, KC_DOT, KC_COMMA, KC_NO,\
KC_RIGHT, KC_NO, KC_NO, TO(LAYER_KEYBOARD_IDX), KC_NO,\

8
keyboards/betalupi_ergodox/keymaps/default/layers/russian.h
View File

@ -6,17 +6,17 @@
KC_TRANSPARENT, RU_CHE, RU_SHA, RU_IE, RU_ER, RU_TE, RU_YO,\
KC_TRANSPARENT, RU_A, RU_ES, RU_DE, RU_EF, RU_GHE,\
M_RU_CTRL, RU_ZE, RU_YA, RU_TSE, RU_VE, RU_BE, RU_E,\
KC_TRANSPARENT, KC_TRANSPARENT, M_RU_ALT, KC_TRANSPARENT, KC_TRANSPARENT,\
KC_TRANSPARENT, KC_TRANSPARENT, KC_LALT, KC_TRANSPARENT, KC_TRANSPARENT,\
\
KC_TRANSPARENT, KC_TRANSPARENT,\
KC_TRANSPARENT,\
KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\
\
\
KC_NO, RU_6, RU_7, RU_8, RU_9, RU_0, KC_TRANSPARENT,\
RU_SOFT, RU_U, RU_YU, RU_I, RU_O, RU_SHCH, KC_NO,\
KC_TRANSPARENT, RU_6, RU_7, RU_8, RU_9, RU_0, KC_TRANSPARENT,\
RU_SOFT, RU_U, RU_YU, RU_I, RU_O, RU_SHCH, KC_TRANSPARENT,\
RU_HA, RU_ZHE, RU_KA, MO(LAYER_SYMBOLS_RU_IDX), RU_EL, KC_NO,\
RU_HARD, RU_EN, RU_EM, RU_PE, RU_YERU, RU_SHTI, KC_NO,\
RU_HARD, RU_EN, RU_EM, RU_PE, RU_YERU, RU_SHTI, KC_TRANSPARENT,\
KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\
\
KC_TRANSPARENT, TO(LAYER_MAIN_IDX),\

1
keyboards/betalupi_ergodox/keymaps/default/rules.mk
View File

@ -1,6 +1,5 @@
# rules.mk overrides
LEADER_ENABLE = yes
TAP_DANCE_ENABLE = yes
SRC += \