diff options
| author | stanrc85 <47038504+stanrc85@users.noreply.github.com> | 2021-02-10 09:21:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-10 09:21:46 -0500 |
| commit | 7ef4aba52c40e8e4638f9b948e271ec41baa321a (patch) | |
| tree | f205a704a8743892e93ad6ee2c91ff197aa596f0 /users/stanrc85 | |
| parent | 0aed8746bee2ff60727de0663dca4d82072e6632 (diff) | |
| download | qmk_firmware-7ef4aba52c40e8e4638f9b948e271ec41baa321a.tar.gz qmk_firmware-7ef4aba52c40e8e4638f9b948e271ec41baa321a.zip | |
Userspace updates (#11841)
* enable LTO for smaller firmware size
* delete since this was added to userspace rules.mk
* readme updates and new images
* Add -j to compile and flash commands in userpsace
* Enable NKRO
* Enable NKRO, VIA, LTO by default
* Stanrc85-ansi readme update
* Stanrc85-alice readme
* quick RGB layer indicator fix in keymap
Diffstat (limited to 'users/stanrc85')
| -rw-r--r-- | users/stanrc85/config.h | 1 | ||||
| -rw-r--r-- | users/stanrc85/readme.md | 27 | ||||
| -rw-r--r-- | users/stanrc85/rules.mk | 10 | ||||
| -rw-r--r-- | users/stanrc85/stanrc85.c | 4 |
4 files changed, 22 insertions, 20 deletions
diff --git a/users/stanrc85/config.h b/users/stanrc85/config.h index a45f9c861..60592c3c6 100644 --- a/users/stanrc85/config.h +++ b/users/stanrc85/config.h | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | #define TAPPING_TERM 250 | 3 | #define TAPPING_TERM 250 |
| 4 | #define RETRO_TAPPING | 4 | #define RETRO_TAPPING |
| 5 | #define FORCE_NKRO | ||
| 5 | 6 | ||
| 6 | #ifdef RGBLIGHT_ENABLE | 7 | #ifdef RGBLIGHT_ENABLE |
| 7 | #define RGBLIGHT_LAYERS | 8 | #define RGBLIGHT_LAYERS |
diff --git a/users/stanrc85/readme.md b/users/stanrc85/readme.md index 9009a71d5..8dff9c8e3 100644 --- a/users/stanrc85/readme.md +++ b/users/stanrc85/readme.md | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!-- Copyright 2019 Stanrc85 | 1 | <!-- Copyright 2021 Stanrc85 |
| 2 | 2 | ||
| 3 | This program is free software: you can redistribute it and/or modify | 3 | This program is free software: you can redistribute it and/or modify |
| 4 | it under the terms of the GNU General Public License as published by | 4 | it under the terms of the GNU General Public License as published by |
| @@ -13,11 +13,12 @@ GNU General Public License for more details. | |||
| 13 | You should have received a copy of the GNU General Public License | 13 | You should have received a copy of the GNU General Public License |
| 14 | along with this program. If not, see <http://www.gnu.org/licenses/>.--> | 14 | along with this program. If not, see <http://www.gnu.org/licenses/>.--> |
| 15 | 15 | ||
| 16 | # Stanrc85's Standard ANSI 60% Layout | 16 | # Stanrc85's Standard Layout |
| 17 | 17 | ||
| 18 | Shared keymap between two 60% PCB: | 18 | Shared keymap between 60%, 65%, Alice layouts: |
| 19 | - 1upkeyboards60HSE | 19 | - 1upkeyboards60HSE |
| 20 | - DZ60 (hotswap) | 20 | - Mark65 |
| 21 | - Sneakbox Alice | ||
| 21 | 22 | ||
| 22 | ## Keymap Notes | 23 | ## Keymap Notes |
| 23 | - Layer 0 is default QWERTY layout with additional custom features: | 24 | - Layer 0 is default QWERTY layout with additional custom features: |
| @@ -26,12 +27,12 @@ Shared keymap between two 60% PCB: | |||
| 26 | - Tap Dance on `Fn1` for `CTRL+ALT+DEL` and `WIN+L` | 27 | - Tap Dance on `Fn1` for `CTRL+ALT+DEL` and `WIN+L` |
| 27 | - Tap Dance on `ESC` for `ESC` and ` ` ` | 28 | - Tap Dance on `ESC` for `ESC` and ` ` ` |
| 28 | 29 | ||
| 29 |  | 30 |  |
| 30 | 31 | ||
| 31 | - Layer 1 is default QWERTY with no custom features used mostly for gaming | 32 | - Layer 1 is default QWERTY with no custom features used mostly for gaming |
| 32 | - Enabled by `Fn2+CAPS` from base layer | 33 | - Enabled by `Fn2+RCTL` from base layer |
| 33 | 34 | ||
| 34 |  | 35 |  |
| 35 | 36 | ||
| 36 | - Layer 2 is Function layer: | 37 | - Layer 2 is Function layer: |
| 37 | - F keys | 38 | - F keys |
| @@ -41,12 +42,16 @@ Shared keymap between two 60% PCB: | |||
| 41 | - AHK Mic is used to mute/unmute microphone | 42 | - AHK Mic is used to mute/unmute microphone |
| 42 | - AHK Speaker switches audio output between headphones and speakers | 43 | - AHK Speaker switches audio output between headphones and speakers |
| 43 | 44 | ||
| 44 |  | 45 |  |
| 45 | 46 | ||
| 46 | - Layer 3 is RGB Underglow control and RESET | 47 | - Layer 3 is RGB Underglow control and RESET |
| 47 | - `Fn2+CAPS` used to toggle Default QWERTY layer on and off | 48 | - `Fn2+RCTL` used to toggle Default QWERTY layer on and off |
| 49 | - `qmk compile` command on `Fn2+Enter` | ||
| 50 | - `qmk flash` command on `Fn2+Shift+enter` | ||
| 51 | |||
| 52 |  | ||
| 53 | |||
| 48 | 54 | ||
| 49 |  | ||
| 50 | 55 | ||
| 51 | ### Build | 56 | ### Build |
| 52 | To build the firmware file associated with this keymap, simply run `make your_keyboard:stanrc85-ansi`. | 57 | To build the firmware file associated with this keymap, simply run `make your_keyboard:stanrc85-ansi` or `make your_keyboard:stanrc85-alice`. |
diff --git a/users/stanrc85/rules.mk b/users/stanrc85/rules.mk index 1406c6838..e88d605f5 100644 --- a/users/stanrc85/rules.mk +++ b/users/stanrc85/rules.mk | |||
| @@ -6,7 +6,9 @@ BOOTMAGIC_ENABLE = no | |||
| 6 | MOUSEKEY_ENABLE = no | 6 | MOUSEKEY_ENABLE = no |
| 7 | AUDIO_ENABLE = no | 7 | AUDIO_ENABLE = no |
| 8 | CONSOLE_ENABLE = no | 8 | CONSOLE_ENABLE = no |
| 9 | NKRO_ENABLE = no | 9 | NKRO_ENABLE = yes |
| 10 | LTO_ENABLE = yes | ||
| 11 | VIA_ENABLE = yes | ||
| 10 | 12 | ||
| 11 | SRC += stanrc85.c | 13 | SRC += stanrc85.c |
| 12 | 14 | ||
| @@ -14,8 +16,6 @@ ifeq ($(strip $(KEYBOARD)), projectkb/alice/rev2) | |||
| 14 | SRC += rgblight_layers.c | 16 | SRC += rgblight_layers.c |
| 15 | SRC += startup_fanfare.c | 17 | SRC += startup_fanfare.c |
| 16 | OPT_DEFS += -DHAS_INDICATORS | 18 | OPT_DEFS += -DHAS_INDICATORS |
| 17 | VIA_ENABLE = yes | ||
| 18 | LTO_ENABLE = no | ||
| 19 | VELOCIKEY_ENABLE=yes | 19 | VELOCIKEY_ENABLE=yes |
| 20 | endif | 20 | endif |
| 21 | ifeq ($(strip $(KEYBOARD)), sneakbox/aliceclone) | 21 | ifeq ($(strip $(KEYBOARD)), sneakbox/aliceclone) |
| @@ -23,13 +23,9 @@ ifeq ($(strip $(KEYBOARD)), sneakbox/aliceclone) | |||
| 23 | SRC += startup_fanfare.c | 23 | SRC += startup_fanfare.c |
| 24 | OPT_DEFS += -DHAS_INDICATORS | 24 | OPT_DEFS += -DHAS_INDICATORS |
| 25 | OPT_DEFS += -DHAS_ROTARY | 25 | OPT_DEFS += -DHAS_ROTARY |
| 26 | VIA_ENABLE = yes | ||
| 27 | LTO_ENABLE = no | ||
| 28 | endif | 26 | endif |
| 29 | ifeq ($(strip $(KEYBOARD)), tkc/osav2) | 27 | ifeq ($(strip $(KEYBOARD)), tkc/osav2) |
| 30 | SRC += rgblight_layers_osa.c | 28 | SRC += rgblight_layers_osa.c |
| 31 | VIA_ENABLE = yes | ||
| 32 | LTO_ENABLE = no | ||
| 33 | VELOCIKEY_ENABLE=yes | 29 | VELOCIKEY_ENABLE=yes |
| 34 | endif | 30 | endif |
| 35 | ifeq ($(strip $(KEYBOARD)), boardsource/the_mark) | 31 | ifeq ($(strip $(KEYBOARD)), boardsource/the_mark) |
diff --git a/users/stanrc85/stanrc85.c b/users/stanrc85/stanrc85.c index 8bc52b0ff..d5e56571d 100644 --- a/users/stanrc85/stanrc85.c +++ b/users/stanrc85/stanrc85.c | |||
| @@ -109,11 +109,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 109 | uint8_t mods = get_mods(); | 109 | uint8_t mods = get_mods(); |
| 110 | clear_mods(); | 110 | clear_mods(); |
| 111 | if (mods & MOD_MASK_SHIFT) { | 111 | if (mods & MOD_MASK_SHIFT) { |
| 112 | send_string_with_delay_P(PSTR("qmk flash -kb " QMK_KEYBOARD " -km " QMK_KEYMAP "\n"), 10); //New way | 112 | send_string_with_delay_P(PSTR("qmk flash -j 6 -kb " QMK_KEYBOARD " -km " QMK_KEYMAP "\n"), 10); //New way |
| 113 | reset_keyboard(); | 113 | reset_keyboard(); |
| 114 | } | 114 | } |
| 115 | else | 115 | else |
| 116 | send_string_with_delay_P(PSTR("qmk compile -kb " QMK_KEYBOARD " -km " QMK_KEYMAP "\n"), 10); //New way | 116 | send_string_with_delay_P(PSTR("qmk compile -j 6 -kb " QMK_KEYBOARD " -km " QMK_KEYMAP "\n"), 10); //New way |
| 117 | set_mods(mods); | 117 | set_mods(mods); |
| 118 | } | 118 | } |
| 119 | break; | 119 | break; |
