diff options
| author | Joshua Diamond <josh@windowoffire.com> | 2020-06-05 05:01:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-05 02:01:47 -0700 |
| commit | d03bc3a9c185f97d3813758e7f6df7c879f42ad0 (patch) | |
| tree | 8b5a0b3aeede0aed5ab52061b8a129f808525526 /layouts/community | |
| parent | c12e429da28399004dddcf2c67f7cb4bca8d28e4 (diff) | |
| download | qmk_firmware-d03bc3a9c185f97d3813758e7f6df7c879f42ad0.tar.gz qmk_firmware-d03bc3a9c185f97d3813758e7f6df7c879f42ad0.zip | |
Major enhancements to spidey3 keymaps and userspace (#9261)
* Add Chrome OS specific keys to 75_ansi/spidey3
* Clean up duplicative settings in rules.mk
* Refactor spidey3 userspace to use rgb layer blink
* Blink green on wakeup
* Improve _FN layer indicator
* Glyph transformation modes: wide, script, fraktur, and enclosed characters
* Add spider unicode glyph
* Fix compile error when NO_ACTION_ONESHOT
* Add a few more emoji
* Further refinement of lighting layer usage
* Fix reversed yes/no ack
* Lighting layers override RGB off
* Fix missing wide and incorrect script numbers
* Add LOL and surprise emoji
* Add missing break in switch statement
* Trim firmware size
* Use usage ID definitions in report.h
* Some minor whitespace cleanup
* Disable some unused features to reduce firmware size
* Print version on startup
* Seed rand() on first keystroke
* Add a key to immediately sleep CrOS
* Switch to Bootmagic Lite
* Trim down firmware size a little bit more
* Make RGBLIGHT_MODE_TWINKLE+4 my default
* Scan rate debug / fix version printing
Delay printing version on startup (console may not be ready)
Better scan rate reporting
* Disable locking caps, etc. to save more space
* Enable LTO
* Better seed for rand()
* Set MAX_LAYER for some performance improvement
* Another scan rate improvement
* Set manufacturer
* New startup animation
* Add GUI lock for F-keys (for CrOS)
* Add visual indication for glyph replacement and F-keys GUI lock
* Some cleanup; run cformat on spidey3 userspace
* Cycle between debug verbosity options
* Fix disable RGB Lighting after wakeup on Mac
Diffstat (limited to 'layouts/community')
| -rw-r--r-- | layouts/community/75_ansi/spidey3/config.h | 9 | ||||
| -rw-r--r-- | layouts/community/75_ansi/spidey3/keymap.c | 9 | ||||
| -rw-r--r-- | layouts/community/75_ansi/spidey3/rules.mk | 8 |
3 files changed, 14 insertions, 12 deletions
diff --git a/layouts/community/75_ansi/spidey3/config.h b/layouts/community/75_ansi/spidey3/config.h new file mode 100644 index 000000000..7fe098f0e --- /dev/null +++ b/layouts/community/75_ansi/spidey3/config.h | |||
| @@ -0,0 +1,9 @@ | |||
| 1 | #pragma once | ||
| 2 | |||
| 3 | #define NO_ACTION_ONESHOT | ||
| 4 | #define NO_ACTION_MACRO | ||
| 5 | #define NO_ACTION_FUNCTION | ||
| 6 | #undef LOCKING_SUPPORT_ENABLE | ||
| 7 | |||
| 8 | #define LAYER_STATE_8BIT | ||
| 9 | #define MAX_LAYER 4 | ||
diff --git a/layouts/community/75_ansi/spidey3/keymap.c b/layouts/community/75_ansi/spidey3/keymap.c index fbb6a9806..aaa93ee2d 100644 --- a/layouts/community/75_ansi/spidey3/keymap.c +++ b/layouts/community/75_ansi/spidey3/keymap.c | |||
| @@ -1,6 +1,5 @@ | |||
| 1 | #include "spidey3.h" | 1 | #include "spidey3.h" |
| 2 | 2 | ||
| 3 | #define CH_MENU A(S(KC_S)) | ||
| 4 | #define OSX_PSC G(S(KC_4)) | 3 | #define OSX_PSC G(S(KC_4)) |
| 5 | #define FN_MENU LT(_FN,KC_APP) | 4 | #define FN_MENU LT(_FN,KC_APP) |
| 6 | 5 | ||
| @@ -34,11 +33,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 34 | ), | 33 | ), |
| 35 | // FN | 34 | // FN |
| 36 | [_FN] = LAYOUT_75_ansi( | 35 | [_FN] = LAYOUT_75_ansi( |
| 37 | RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SLEP, KC_WAKE, KC_PWR, | 36 | RESET, SPI_NORMAL, SPI_WIDE, SPI_SCRIPT, SPI_BLOCKS, SPI_CIRCLE, SPI_SQUARE, SPI_PARENS, SPI_FRAKTR, _______, _______, _______, SPI_GFLOCK, KC_SLEP, KC_WAKE, KC_PWR, |
| 38 | EEP_RST, _______, _______, _______, _______, _______, _______, _______, X_BUL, KC_MPRV, KC_MNXT, X_DASH, _______, KC_PAUS, KC_SLCK, | 37 | EEP_RST, X(SAD), X(MEH), X(HAPPY), X(ANGRY), X(THUMBDN), X(THUMBUP), X(SPIDER), X_BUL, X(LOL), X(SURPRISE),X_DASH, _______, KC_PAUS, KC_SLCK, |
| 39 | _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD, RGB_SPI, VLK_TOG, _______, _______, KC_BRIU, | 38 | _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD, RGB_SPI, VLK_TOG, _______, _______, KC_BRIU, |
| 40 | _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_G, RGB_M_T, SPI_LNX, _______, _______, _______, KC_BRID, | 39 | _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_G, RGB_M_T, SPI_LNX, _______, _______, _______, KC_BRID, |
| 41 | _______, SPI_GLO, _______, SPI_WIN, _______, NK_TOGG, TG(_NUMPAD),SPI_OSX, X(LARR), X(RARR), DEBUG, _______, KC_VOLU, KC_MUTE, | 40 | _______, SPI_GLO, CH_SUSP, SPI_WIN, _______, NK_TOGG, TG(_NUMPAD),SPI_OSX, X(LARR), X(RARR), DEBUG, _______, KC_VOLU, KC_MUTE, |
| 42 | _______, _______, _______, KC_MPLY, KC_APP, _______, CH_MENU, KC_MPRV, KC_VOLD, KC_MNXT | 41 | _______, _______, _______, KC_MPLY, CH_ASST, _______, CH_CPNL, KC_MPRV, KC_VOLD, KC_MNXT |
| 43 | ) | 42 | ) |
| 44 | }; | 43 | }; |
diff --git a/layouts/community/75_ansi/spidey3/rules.mk b/layouts/community/75_ansi/spidey3/rules.mk index fdb44b3ea..7d5c56841 100644 --- a/layouts/community/75_ansi/spidey3/rules.mk +++ b/layouts/community/75_ansi/spidey3/rules.mk | |||
| @@ -1,18 +1,12 @@ | |||
| 1 | # Build Options | 1 | # Build Options |
| 2 | # comment out to disable the options. | 2 | # comment out to disable the options. |
| 3 | # | 3 | # |
| 4 | BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration | ||
| 5 | MOUSEKEY_ENABLE = no # Mouse keys | 4 | MOUSEKEY_ENABLE = no # Mouse keys |
| 6 | EXTRAKEY_ENABLE = yes # Audio control and System control | ||
| 7 | CONSOLE_ENABLE = yes # Console for debug | 5 | CONSOLE_ENABLE = yes # Console for debug |
| 8 | COMMAND_ENABLE = no # Commands for debug and configuration | ||
| 9 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | ||
| 10 | NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work | ||
| 11 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality | 6 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality |
| 12 | AUDIO_ENABLE = no | ||
| 13 | RGBLIGHT_ENABLE = yes | ||
| 14 | UNICODEMAP_ENABLE = yes | 7 | UNICODEMAP_ENABLE = yes |
| 15 | VELOCIKEY_ENABLE = yes | 8 | VELOCIKEY_ENABLE = yes |
| 9 | GRAVE_ESC_ENABLE = no | ||
| 16 | 10 | ||
| 17 | # The following disabled to save space | 11 | # The following disabled to save space |
| 18 | SPACE_CADET_ENABLE = no | 12 | SPACE_CADET_ENABLE = no |
