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

Compare commits

base: Mark:242913a6426a0c29c749da7dd40f43b6a4fbd948
Branches Tags
Mark:master
...
compare: Mark:e02056c49db2eaedc6c26cde7b4c078b84dd2cbb
Branches Tags
Mark:master

2 Commits
242913a642 ... e02056c49d

Author SHA1 Message Date
Mark e02056c49d
Changed keymaps 2022-07-17 21:02:01 -07:00
Mark 37d5d7ac3d
Minor changes 2022-07-17 20:33:06 -07:00
9 changed files with 51 additions and 42 deletions
Show Stats Expand all files Collapse all files

10
Makefile
View File

@ -73,3 +73,13 @@ flash:
-e BUILD_DIR=$(BUILD_DIR) \ -e BUILD_DIR=$(BUILD_DIR) \
-kb betalupi_ergodox \ -kb betalupi_ergodox \
-km default -km default
# Compile and flash a keyboard
.PHONY: comp-db
comp-db:
@source $(VENV)/bin/activate && \
$(QMK) generate-compilation-database \
-kb betalupi_ergodox \
-km default

1
keyboards/betalupi_ergodox/animations/fft.h
View File

@ -19,7 +19,6 @@ bool FFT_ANIM(effect_params_t* params) {
} }
// Render heatmap & decrease
for (int i = led_min; i < led_max; i++) { for (int i = led_min; i < led_max; i++) {
uint8_t row = i % MATRIX_ROWS; uint8_t row = i % MATRIX_ROWS;
uint8_t col = i / MATRIX_ROWS; uint8_t col = i / MATRIX_ROWS;

12
keyboards/betalupi_ergodox/keymaps/default/layers/arrows.h
View File

@ -3,9 +3,9 @@
#define LAYER_ARROWS LAYOUT_ergodox(\ #define LAYER_ARROWS LAYOUT_ergodox(\
KC_TRANSPARENT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,\ KC_TRANSPARENT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,\
KC_TRANSPARENT, KC_LEFT, KC_RIGHT, KC_UP, KC_NO, KC_NO, KC_TRANSPARENT,\ KC_TRANSPARENT, LGUI(LCTL(KC_ENTER)), KC_NO, KC_UP, KC_NO, KC_NO, KC_TRANSPARENT,\
KC_TRANSPARENT, LALT(KC_LCTRL), KC_LEFT, KC_DOWN, KC_RIGHT, KC_NO,\ KC_LGUI, LALT(KC_LCTRL), KC_LEFT, KC_DOWN, KC_RIGHT, KC_NO,\
KC_TRANSPARENT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRANSPARENT,\ KC_TRANSPARENT, LGUI(KC_LCTRL), KC_NO, KC_NO, KC_NO, KC_NO, KC_TRANSPARENT,\
KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\ KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\
\ \
KC_TRANSPARENT, KC_TRANSPARENT,\ KC_TRANSPARENT, KC_TRANSPARENT,\
@ -26,9 +26,9 @@
#define LAYER_ARROWS_LEDS LEDS_ergodox(\ #define LAYER_ARROWS_LEDS LEDS_ergodox(\
LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \ LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
LC_YELLOW, LC_YELLOW, LC_GREEN, LC_OFF, LC_OFF, \ LC_YELLOW, LC_OFF, LC_GREEN, LC_OFF, LC_OFF, \
LC_OFF, LC_GREEN, LC_GREEN, LC_GREEN, LC_OFF, \ LC_ORANGE, LC_GREEN, LC_GREEN, LC_GREEN, LC_OFF, \
LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \ LC_ORANGE, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
LC_OFF, LC_OFF, LC_OFF, LC_PINK, \ LC_OFF, LC_OFF, LC_OFF, LC_PINK, \
\ \
LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \ LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \

26
keyboards/betalupi_ergodox/keymaps/default/layers/desktop.h
View File

@ -2,10 +2,10 @@
#include "keymap.h" #include "keymap.h"
#define LAYER_DESKTOP LAYOUT_ergodox(\ #define LAYER_DESKTOP LAYOUT_ergodox(\
KC_TRANSPARENT, LCTL(LGUI(LSFT(KC_1))), LCTL(LGUI(LSFT(KC_2))),LCTL(LGUI(LSFT(KC_3))), LCTL(LGUI(LSFT(KC_4))), KC_NO, M_RESETWM,\ KC_TRANSPARENT, LGUI(KC_1), LGUI(KC_2), LGUI(KC_3), LGUI(KC_4), LGUI(KC_5), M_RESETWM,\
KC_NO, KC_NO, KC_NO, KC_NO, LCTL(LGUI(KC_SPACE)), LGUI(KC_T), KC_NO,\ KC_NO, KC_NO, LGUI(LCTL(KC_ENTER)), KC_NO, KC_NO, LGUI(KC_T), KC_NO,\
KC_NO, KC_NO, KC_NO, KC_NO, LGUI(KC_F), LGUI(KC_M),\ KC_NO, LGUI(KC_PLUS), LGUI(KC_MINUS), KC_NO, LGUI(KC_F), LGUI(KC_G),\
KC_NO, KC_NO, KC_NO, LGUI(LSFT(KC_C)), LGUI(KC_N), KC_NO, KC_NO,\ KC_NO, KC_NO, KC_NO, LGUI(LSFT(KC_C)), LGUI(KC_N), LGUI(KC_M), KC_NO,\
TO(LAYER_MAIN_IDX), KC_NO, KC_NO, KC_NO, KC_NO,\ TO(LAYER_MAIN_IDX), KC_NO, KC_NO, KC_NO, KC_NO,\
\ \
KC_NO, KC_NO,\ KC_NO, KC_NO,\
@ -14,8 +14,8 @@
\ \
\ \
M_SHUTDOWN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,\ M_SHUTDOWN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,\
KC_NO, KC_NO, KC_NO, LCTL(LGUI(KC_UP)), KC_NO, LGUI(KC_P), KC_NO,\ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, LGUI(KC_P), KC_NO,\
KC_NO, LCTL(LGUI(KC_LEFT)), LCTL(LGUI(KC_DOWN)), LCTL(LGUI(KC_RIGHT)), KC_NO, KC_NO,\ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,\
KC_NO, KC_NO, LGUI(KC_H), LGUI(KC_J), KC_NO, KC_NO, KC_NO,\ KC_NO, KC_NO, LGUI(KC_H), LGUI(KC_J), KC_NO, KC_NO, KC_NO,\
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,\ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,\
\ \
@ -25,15 +25,15 @@
) )
#define LAYER_DESKTOP_LEDS LEDS_ergodox(\ #define LAYER_DESKTOP_LEDS LEDS_ergodox(\
LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \ LC_PINK, LC_PINK, LC_PINK, LC_PINK, LC_PINK, \
LC_OFF, LC_OFF, LC_OFF, LC_CYAN, LC_CYAN, \ LC_OFF, LC_GREEN, LC_OFF, LC_OFF, LC_CYAN, \
LC_OFF, LC_OFF, LC_OFF, LC_CYAN, LC_CYAN, \ LC_GREEN, LC_GREEN, LC_OFF, LC_CYAN, LC_CYAN, \
LC_OFF, LC_OFF, LC_OFF, LC_CYAN, LC_OFF, \ LC_OFF, LC_OFF, LC_ORANGE, LC_CYAN, LC_CYAN, \
LC_OFF, LC_OFF, LC_OFF, LC_OFF, \ LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
\ \
LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \ LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
LC_OFF, LC_OFF, LC_GREEN, LC_OFF, LC_ORANGE, \ LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_ORANGE, \
LC_OFF, LC_GREEN, LC_GREEN, LC_GREEN, LC_OFF, \ LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
LC_OFF, LC_CYAN, LC_CYAN, LC_OFF, LC_OFF, \ LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
LC_OFF, LC_OFF, LC_OFF, LC_OFF \ LC_OFF, LC_OFF, LC_OFF, LC_OFF \
) )

10
keyboards/betalupi_ergodox/keymaps/default/layers/fkeys.h
View File

@ -3,7 +3,7 @@
#define LAYER_FKEYS LAYOUT_ergodox(\ #define LAYER_FKEYS LAYOUT_ergodox(\
KC_TRANSPARENT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRANSPARENT,\ KC_TRANSPARENT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRANSPARENT,\
KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\ KC_TRANSPARENT, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, KC_TRANSPARENT,\
KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\ KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\
KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\ KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\
KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\ KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\
@ -13,8 +13,8 @@
KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\ KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\
\ \
\ \
KC_TRANSPARENT, KC_F6, KC_F7, KC_F9, KC_F9, KC_F10, KC_TRANSPARENT, \ KC_TRANSPARENT, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRANSPARENT, \
KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, \ KC_TRANSPARENT, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_TRANSPARENT, \
KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, \ KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, \
KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, \ KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, \
KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, \ KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, \
@ -26,13 +26,13 @@
#define LAYER_FKEYS_LEDS LEDS_ergodox(\ #define LAYER_FKEYS_LEDS LEDS_ergodox(\
LC_CYAN, LC_CYAN, LC_CYAN, LC_CYAN, LC_CYAN, \ LC_CYAN, LC_CYAN, LC_CYAN, LC_CYAN, LC_CYAN, \
LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \ LC_CYAN, LC_CYAN, LC_CYAN, LC_CYAN, LC_CYAN, \
LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \ LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \ LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
LC_OFF, LC_OFF, LC_OFF, LC_OFF, \ LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
\ \
LC_CYAN, LC_CYAN, LC_CYAN, LC_CYAN, LC_CYAN, \ LC_CYAN, LC_CYAN, LC_CYAN, LC_CYAN, LC_CYAN, \
LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \ LC_CYAN, LC_CYAN, LC_CYAN, LC_CYAN, LC_CYAN, \
LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \ LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \ LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
LC_OFF, LC_OFF, LC_OFF, LC_OFF \ LC_OFF, LC_OFF, LC_OFF, LC_OFF \

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

@ -20,6 +20,6 @@
KC_RIGHT, KC_TRANSPARENT, KC_TRANSPARENT, TO(LAYER_KEYBOARD_IDX), KC_TRANSPARENT,\ KC_RIGHT, KC_TRANSPARENT, KC_TRANSPARENT, TO(LAYER_KEYBOARD_IDX), KC_TRANSPARENT,\
\ \
LGUI(KC_SPACE), TO(LAYER_RUSSIAN_IDX),\ LGUI(KC_SPACE), TO(LAYER_RUSSIAN_IDX),\
TG(LAYER_COLEMAK_IDX),\ KC_NO,\
KC_DELETE, KC_RSHIFT, KC_ENTER\ KC_DELETE, KC_RSHIFT, KC_ENTER\
) )

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

@ -19,8 +19,8 @@
RU_HARD, RU_EN, RU_EM, RU_PE, RU_YERU, RU_SHTI, KC_TRANSPARENT,\ 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, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,\
\ \
KC_NO, TO(LAYER_MAIN_IDX),\ KC_TRANSPARENT, TO(LAYER_MAIN_IDX),\
KC_NO,\ KC_TRANSPARENT,\
KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT\ KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT\
) )

22
keyboards/betalupi_ergodox/keymaps/default/tapdance/wmlayout.c
View File

@ -11,12 +11,12 @@ static tap dance_state[1];
// Called on every tap // Called on every tap
void td_wmlayout_dance(qk_tap_dance_state_t *state, void *user_data) { void td_wmlayout_dance(qk_tap_dance_state_t *state, void *user_data) {
if(state->count == 3) { if(state->count == 3) {
tap_code16(LGUI(KC_L)); tap_code16(LGUI(KC_COMMA));
tap_code16(LGUI(KC_L)); tap_code16(LGUI(KC_COMMA));
tap_code16(LGUI(KC_L)); tap_code16(LGUI(KC_COMMA));
} }
if(state->count > 3) { if(state->count > 3) {
tap_code16(LGUI(KC_L)); tap_code16(LGUI(KC_COMMA));
} }
} }
@ -25,14 +25,14 @@ void td_wmlayout_finished(qk_tap_dance_state_t *state, void *user_data) {
dance_state[0].step = dance_step(state); dance_state[0].step = dance_step(state);
switch (dance_state[0].step) { switch (dance_state[0].step) {
case SINGLE_TAP: case SINGLE_TAP:
register_code16(LGUI(KC_L)); register_code16(LGUI(KC_COMMA));
break; break;
case DOUBLE_TAP: case DOUBLE_TAP:
register_code16(LGUI(KC_K)); register_code16(LGUI(KC_DOT));
break; break;
case DOUBLE_SINGLE_TAP: case DOUBLE_SINGLE_TAP:
tap_code16(LGUI(KC_L)); tap_code16(LGUI(KC_COMMA));
register_code16(LGUI(KC_L)); register_code16(LGUI(KC_COMMA));
break; break;
} }
} }
@ -42,13 +42,13 @@ void td_wmlayout_reset(qk_tap_dance_state_t *state, void *user_data) {
wait_ms(10); wait_ms(10);
switch (dance_state[0].step) { switch (dance_state[0].step) {
case SINGLE_TAP: case SINGLE_TAP:
unregister_code16(LGUI(KC_L)); unregister_code16(LGUI(KC_COMMA));
break; break;
case DOUBLE_TAP: case DOUBLE_TAP:
unregister_code16(LGUI(KC_K)); unregister_code16(LGUI(KC_DOT));
break; break;
case DOUBLE_SINGLE_TAP: case DOUBLE_SINGLE_TAP:
unregister_code16(LGUI(KC_L)); unregister_code16(LGUI(KC_COMMA));
break; break;
} }
dance_state[0].step = 0; dance_state[0].step = 0;