diff options
| author | George Petri <jaxartez@gmail.com> | 2020-03-30 00:14:43 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-29 22:14:43 +0100 |
| commit | 74c01654c771f120ab29ffabac833497a086eacf (patch) | |
| tree | 141947d68a22e66c14793b3735c35c41b759a252 | |
| parent | dc98d44582eac7b4bcdafc21e5c43814aa7959ab (diff) | |
| download | qmk_firmware-74c01654c771f120ab29ffabac833497a086eacf.tar.gz qmk_firmware-74c01654c771f120ab29ffabac833497a086eacf.zip | |
Update keymap keebio/nyquist (#8602)
* format code, add shift color
* testing colors
* todos, shift on right
* changed colors
* use rgh layers api
* impl shift layer
* replace xor with !=
* moved shift rbg
* breathing animation, simplyfy layers
* remove breating animation
* use tt
* minor cleanup
* debounce eager, lto
* shut down rbg when poweroff
* update readme
* readme.md fix
* more readme.md fix
* more readme.md fix
4 files changed, 57 insertions, 40 deletions
diff --git a/keyboards/keebio/nyquist/keymaps/georgepetri/config.h b/keyboards/keebio/nyquist/keymaps/georgepetri/config.h index bc7fed826..d13d3294f 100644 --- a/keyboards/keebio/nyquist/keymaps/georgepetri/config.h +++ b/keyboards/keebio/nyquist/keymaps/georgepetri/config.h | |||
| @@ -17,11 +17,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 17 | 17 | ||
| 18 | #pragma once | 18 | #pragma once |
| 19 | 19 | ||
| 20 | // #define USE_I2C | ||
| 21 | |||
| 22 | /* Select hand configuration */ | ||
| 23 | // #define MASTER_RIGHT | ||
| 24 | // #define EE_HANDS | ||
| 25 | |||
| 26 | #undef RGBLED_NUM | 20 | #undef RGBLED_NUM |
| 27 | #define RGBLED_NUM 12 | 21 | #define RGBLED_NUM 12 |
| 22 | #define RGBLIGHT_LAYERS | ||
| 23 | |||
| 24 | #define TAPPING_TOGGLE 2 | ||
| 25 | #define TAPPING_TERM 150 | ||
diff --git a/keyboards/keebio/nyquist/keymaps/georgepetri/keymap.c b/keyboards/keebio/nyquist/keymaps/georgepetri/keymap.c index 6b427e06d..96ea4ff19 100644 --- a/keyboards/keebio/nyquist/keymaps/georgepetri/keymap.c +++ b/keyboards/keebio/nyquist/keymaps/georgepetri/keymap.c | |||
| @@ -6,10 +6,6 @@ extern keymap_config_t keymap_config; | |||
| 6 | #define _L 1 | 6 | #define _L 1 |
| 7 | #define _R 2 | 7 | #define _R 2 |
| 8 | 8 | ||
| 9 | enum custom_keycodes { | ||
| 10 | QWERTY = SAFE_RANGE | ||
| 11 | }; | ||
| 12 | |||
| 13 | #define KC_TL LCTL(KC_PGUP) | 9 | #define KC_TL LCTL(KC_PGUP) |
| 14 | #define KC_TR LCTL(KC_PGDN) | 10 | #define KC_TR LCTL(KC_PGDN) |
| 15 | #define KC_TC LCTL(KC_W) | 11 | #define KC_TC LCTL(KC_W) |
| @@ -26,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 26 | //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ | 22 | //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ |
| 27 | KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_ENT , | 23 | KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_ENT , |
| 28 | //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ | 24 | //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ |
| 29 | KC_CAPS, KC_LCTL, KC_LGUI, KC_LALT, MO(_L) , KC_SPC , KC_SPC , TG(_R) , KC_LEFT, KC_DOWN, KC_UP , KC_RGHT | 25 | KC_CAPS, KC_LCTL, KC_LGUI, KC_LALT, MO(_L) , KC_SPC , KC_RSFT, TT(_R) , KC_LEFT, KC_DOWN, KC_UP , KC_RGHT |
| 30 | //└────────┴────────┴────────┴────────┴────────┴────────┘ └────────┴────────┴────────┴────────┴────────┴────────┘ | 26 | //└────────┴────────┴────────┴────────┴────────┴────────┘ └────────┴────────┴────────┴────────┴────────┴────────┘ |
| 31 | ), | 27 | ), |
| 32 | 28 | ||
| @@ -59,33 +55,54 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 59 | ) | 55 | ) |
| 60 | }; | 56 | }; |
| 61 | 57 | ||
| 58 | const rgblight_segment_t PROGMEM left[] = RGBLIGHT_LAYER_SEGMENTS( | ||
| 59 | {0, 12, HSV_MAGENTA} | ||
| 60 | ); | ||
| 61 | |||
| 62 | const rgblight_segment_t PROGMEM right[] = RGBLIGHT_LAYER_SEGMENTS( | ||
| 63 | {0, 12, HSV_RED} | ||
| 64 | ); | ||
| 65 | |||
| 66 | const rgblight_segment_t PROGMEM capslock[] = RGBLIGHT_LAYER_SEGMENTS( | ||
| 67 | {0, 3, HSV_GOLD}, | ||
| 68 | {6, 3, HSV_GOLD} | ||
| 69 | ); | ||
| 70 | |||
| 71 | const rgblight_segment_t* const PROGMEM rgb_layers[] = RGBLIGHT_LAYERS_LIST(left, right, capslock); | ||
| 72 | |||
| 62 | void keyboard_post_init_user(void) { | 73 | void keyboard_post_init_user(void) { |
| 63 | rgblight_sethsv_noeeprom(HSV_BLUE); | 74 | rgblight_sethsv_noeeprom(HSV_SPRINGGREEN); |
| 75 | rgblight_layers = rgb_layers; | ||
| 64 | } | 76 | } |
| 65 | 77 | ||
| 66 | void update_led(void) { | 78 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 67 | switch (biton32(layer_state)) { | 79 | rgblight_set_layer_state(0, layer_state_cmp(state, _L)); |
| 68 | case _BASE: | 80 | rgblight_set_layer_state(1, layer_state_cmp(state, _R)); |
| 69 | rgblight_sethsv_noeeprom(HSV_BLUE); | 81 | return state; |
| 70 | break; | ||
| 71 | case _L: | ||
| 72 | rgblight_sethsv_noeeprom(HSV_CORAL); | ||
| 73 | break; | ||
| 74 | case _R: | ||
| 75 | rgblight_sethsv_noeeprom(HSV_MAGENTA); | ||
| 76 | break; | ||
| 77 | } | ||
| 78 | if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) { | ||
| 79 | rgblight_sethsv_range(HSV_WHITE,0,3); | ||
| 80 | rgblight_sethsv_range(HSV_WHITE,9,12); | ||
| 81 | } | ||
| 82 | } | 82 | } |
| 83 | 83 | ||
| 84 | uint32_t layer_state_set_user(uint32_t state) { | 84 | void suspend_power_down_user(void) { |
| 85 | update_led(); | 85 | rgblight_disable(); |
| 86 | return state; | ||
| 87 | } | 86 | } |
| 88 | 87 | ||
| 89 | void led_set_user(uint8_t usb_led) { | 88 | void suspend_wakeup_init_user(void) { |
| 90 | update_led(); | 89 | rgblight_enable(); |
| 90 | } | ||
| 91 | |||
| 92 | bool is_shift_pressed = false; | ||
| 93 | |||
| 94 | bool led_update_user(led_t led_state) { | ||
| 95 | rgblight_set_layer_state(2, is_shift_pressed != led_state.caps_lock); | ||
| 96 | return true; | ||
| 97 | } | ||
| 98 | |||
| 99 | bool process_record_user(uint16_t keycode, keyrecord_t* record) { | ||
| 100 | switch (keycode) { | ||
| 101 | case KC_LSFT: | ||
| 102 | case KC_RSFT: | ||
| 103 | is_shift_pressed = record->event.pressed; | ||
| 104 | rgblight_set_layer_state(2, is_shift_pressed != host_keyboard_led_state().caps_lock); | ||
| 105 | default: | ||
| 106 | return true; | ||
| 107 | } | ||
| 91 | } | 108 | } |
diff --git a/keyboards/keebio/nyquist/keymaps/georgepetri/readme.md b/keyboards/keebio/nyquist/keymaps/georgepetri/readme.md index a659905f8..5d1855e93 100644 --- a/keyboards/keebio/nyquist/keymaps/georgepetri/readme.md +++ b/keyboards/keebio/nyquist/keymaps/georgepetri/readme.md | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # George Petri's Nyquist layout | 1 | # George Petri's Nyquist layout |
| 2 | 2 | ||
| 3 | ``` | 3 | ``` |
| 4 | make keebio/nyquist/rev2:georgepetri | 4 | sudo make keebio/nyquist/rev2:georgepetri:dfu |
| 5 | ``` | 5 | ``` |
| 6 | 6 | ||
| 7 | Features a dedicated navigation layer on rise and current layer status on rgb underglow. | 7 | Features a dedicated navigation layer on rise and current layer status on rgb underglow. |
| @@ -15,9 +15,9 @@ Features a dedicated navigation layer on rise and current layer status on rgb un | |||
| 15 | ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤ | 15 | ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤ |
| 16 | │ ESC │ A │ S │ D │ F │ G │ │ H │ J │ K │ L │ SCLN│ QUOT │ | 16 | │ ESC │ A │ S │ D │ F │ G │ │ H │ J │ K │ L │ SCLN│ QUOT │ |
| 17 | ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤ | 17 | ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤ |
| 18 | │ LSFT│ Z │ X │ C │ V │ B │ │ N │ M │ COMM │ DOT │ SLSH│ ENT │ | 18 | │ LSFT│ Z │ X │ C │ V │ B │ │ N │ M │ COMM│ DOT │ SLSH│ ENT │ |
| 19 | ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤ | 19 | ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤ |
| 20 | │ CAPS│ LCTL│ LGUI │ LALT │MO(_L)│ SPC │ │ SPC │MO(_R)│ LEFT │ DOWN│ UP │ RGHT │ | 20 | │ CAPS│ LCTL│ LGUI │ LALT │MO(_L)│ SPC │ │ RSFT│MO(_R)│ LEFT│ DOWN│ UP │ RGHT │ |
| 21 | └──────┴──────┴──────┴──────┴──────┴──────┘ └──────┴──────┴──────┴──────┴──────┴──────┘ | 21 | └──────┴──────┴──────┴──────┴──────┴──────┘ └──────┴──────┴──────┴──────┴──────┴──────┘ |
| 22 | ``` | 22 | ``` |
| 23 | 23 | ||
| @@ -28,7 +28,7 @@ Features a dedicated navigation layer on rise and current layer status on rgb un | |||
| 28 | ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤ | 28 | ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤ |
| 29 | │ │ F11 │ F12 │ │ │ │ │ │ MINS│ EQL │ LBRC│ RBRC│ BSLS │ | 29 | │ │ F11 │ F12 │ │ │ │ │ │ MINS│ EQL │ LBRC│ RBRC│ BSLS │ |
| 30 | ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤ | 30 | ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤ |
| 31 | │ │ │ │ │ │ │ │ LEFT │ DOWN │ UP │ RGHT │ │ │ | 31 | │ │ │ │ │ │ │ │ LEFT│ DOWN│ UP │ RGHT│ │ │ |
| 32 | ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤ | 32 | ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤ |
| 33 | │ │ │ │ │ │ │ │ │ PGDN│ PGUP │ HOME│ END │ │ | 33 | │ │ │ │ │ │ │ │ │ PGDN│ PGUP │ HOME│ END │ │ |
| 34 | ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤ | 34 | ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤ |
| @@ -43,9 +43,9 @@ Features a dedicated navigation layer on rise and current layer status on rgb un | |||
| 43 | ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤ | 43 | ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤ |
| 44 | │ │ TAB_L│ TAB_R│ TAB_C│ TAB_R│ │ │ │ TAB_L│ TAB_R│ TAB_C│ TAB_R│ │ | 44 | │ │ TAB_L│ TAB_R│ TAB_C│ TAB_R│ │ │ │ TAB_L│ TAB_R│ TAB_C│ TAB_R│ │ |
| 45 | ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤ | 45 | ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤ |
| 46 | │ │ LEFT │ DOWN │ UP │ RGHT │ │ │ LEFT │ DOWN │ UP │ RGHT │ │ │ | 46 | │ │ LEFT│ DOWN│ UP │ RGHT│ │ │ LEFT│ DOWN│ UP │ RGHT│ │ │ |
| 47 | ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤ | 47 | ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤ |
| 48 | │ │ PGDN │ PGUP │ HOME│ END │ │ │ │ PGDN │ PGUP │ HOME│ END │ │ | 48 | │ │ PGDN│ PGUP│ HOME│ END │ │ │ │ PGDN│ PGUP│ HOME│ END │ │ |
| 49 | ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤ | 49 | ├──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┤ |
| 50 | │ │ │ │ │ │ │ │ │ │ │ │ │ │ | 50 | │ │ │ │ │ │ │ │ │ │ │ │ │ │ |
| 51 | └──────┴──────┴──────┴──────┴──────┴──────┘ └──────┴──────┴──────┴──────┴──────┴──────┘ | 51 | └──────┴──────┴──────┴──────┴──────┴──────┘ └──────┴──────┴──────┴──────┴──────┴──────┘ |
diff --git a/keyboards/keebio/nyquist/keymaps/georgepetri/rules.mk b/keyboards/keebio/nyquist/keymaps/georgepetri/rules.mk index 2e145d5a8..4010d90f0 100644 --- a/keyboards/keebio/nyquist/keymaps/georgepetri/rules.mk +++ b/keyboards/keebio/nyquist/keymaps/georgepetri/rules.mk | |||
| @@ -1,3 +1,5 @@ | |||
| 1 | RGBLIGHT_ENABLE = yes | ||
| 2 | MOUSEKEY_ENABLE = no | 1 | MOUSEKEY_ENABLE = no |
| 3 | COMMAND_ENABLE = no | 2 | COMMAND_ENABLE = no |
| 3 | RGBLIGHT_ENABLE = yes | ||
| 4 | LTO_ENABLE = yes | ||
| 5 | DEBOUNCE_TYPE = eager_pk | ||
