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

Compare commits

base: Mark:b20b5b12717c2f9b9c141236e84e7351a64d21d7
Branches Tags
Mark:master
..
compare: Mark:f4a7960eedc7c6da393797b30d1083aae044180d
Branches Tags
Mark:master

No commits in common. "b20b5b12717c2f9b9c141236e84e7351a64d21d7" and "f4a7960eedc7c6da393797b30d1083aae044180d" have entirely different histories.
b20b5b1271 ... f4a7960eed

5 changed files with 14 additions and 68 deletions
Show Stats Expand all files Collapse all files

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

@ -51,11 +51,6 @@ void matrix_scan_user(void) {
SEND_STRING(SECRET_SCHOOL_EMAIL);
}
SEQ_TWO_KEYS(KC_P, KC_L) {
layer_move(LAYER_PLAIN);
}
//SEQ_ONE_KEY(KC_F) {}
//
//SEQ_TWO_KEYS(KC_A, KC_S) {

24
keyboards/betalupi_ergodox/keymaps/default/layers/definitions/fkeys.h
View File

@ -9,15 +9,15 @@
#ifdef BETA_LAYER_KEYS
#define BETA_LAYER_CONTEXT_DATA LAYOUT_ergodox(\
KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_NO,\
KC_TRNS, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, KC_NO,\
KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,\
KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,\
KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO,\
KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_NO,\
KC_NO, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, 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, KC_NO,\
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,\
\
KC_TRNS, KC_TRNS,\
KC_TRNS,\
KC_TRNS, KC_TRNS, KC_TRNS,\
KC_NO, KC_NO,\
KC_NO,\
KC_NO, KC_NO, KC_NO,\
\
\
KC_NO, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_NO, \
@ -26,9 +26,9 @@
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(LAYER_MAIN), \
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
\
KC_TRNS, KC_TRNS,\
KC_TRNS, \
KC_TRNS, KC_TRNS, KC_TRNS \
KC_NO, KC_NO,\
KC_NO, \
KC_NO, KC_NO, KC_NO \
)
BETA_LAYER_MAGIC_MACRO
@ -46,7 +46,7 @@
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_OFF, LC_OFF, LC_OFF, LC_OFF, LC_CYAN, \
LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
LC_OFF, LC_OFF, LC_OFF, LC_OFF \
)

3
keyboards/betalupi_ergodox/keymaps/default/layers/definitions/layers.inc
View File

@ -12,9 +12,6 @@
#include "main.h"
#include "russian.h"
#include "plain.h"
// The order of these doesn't really matter,
// since only one will be active at a time.
#include "symbols.h"

4
keyboards/betalupi_ergodox/keymaps/default/layers/definitions/main.h
View File

@ -13,11 +13,11 @@
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, TO(LAYER_NUMPAD),\
KC_LALT, OSL(LAYER_DESKTOP), KC_NO, KC_LSHIFT, MO(LAYER_ARROWS),\
OSL(LAYER_DESKTOP), KC_NO, KC_LALT, KC_LSHIFT, MO(LAYER_ARROWS),\
\
TD(TD_SCREENSHOT), TD(TD_OCR),\
TD(TD_WMLAYOUT),\
KC_SPACE, KC_BSPACE, KC_NO,\
KC_SPACE, KC_BSPACE, LCTL(KC_BSPACE),\
\
\
KC_NO, KC_6, KC_7, KC_8, KC_9, KC_0, LGUI(KC_TAB),\

46
keyboards/betalupi_ergodox/keymaps/default/layers/definitions/plain.h
View File

@ -1,46 +0,0 @@
// See symbols.h for docs
#define BETA_LAYER_MAGIC_MACRO BETA_LAYER(PLAIN)
#ifdef BETA_LAYER_LAYOUTS
#define BETA_LAYER_CONTEXT_DATA LAYOUT_EN
BETA_LAYER_MAGIC_MACRO
#endif
#ifdef BETA_LAYER_KEYS
#define BETA_LAYER_CONTEXT_DATA LAYOUT_ergodox(\
KC_ESCAPE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_PSCR,\
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_PGUP,\
KC_LALT, KC_NO, KC_NO, KC_LSHIFT, MO(LAYER_ARROWS),\
\
KC_F1, KC_F2,\
KC_F3,\
KC_SPACE, KC_BSPACE, KC_F4,\
\
\
KC_SCRL, KC_6, KC_7, KC_8, KC_9, KC_0, TO(LAYER_MAIN),\
KC_PAUSE, KC_Y, KC_U, KC_I, KC_O, KC_QUES, KC_HOME,\
KC_H, KC_J, KC_K, KC_DOT, KC_L, KC_END,\
KC_PGDN, KC_N, KC_M, KC_P, KC_COLON, KC_GRAVE, TT(LAYER_FKEYS),\
KC_UP, KC_DOWN, KC_LCBR, KC_RCBR, KC_DQUO,\
\
KC_F7, KC_F8,\
KC_F6,\
KC_F5, KC_RSHIFT, KC_ENTER\
)
BETA_LAYER_MAGIC_MACRO
#endif
#ifdef BETA_LAYER_INDICATORS
case BETA_LAYER_MAGIC_MACRO:
//ergodox_right_led_1_on();
ergodox_right_led_2_on();
//ergodox_right_led_3_on();
break;
#endif
#undef BETA_LAYER_CONTEXT_DATA
#undef BETA_LAYER_MAGIC_MACRO