Commit graph

330 commits

Author SHA1 Message Date
stanrc85
33bd17a68a
[Keymap] my alice community layout (#10696) 2020-10-23 17:11:52 -07:00
Jack Humbert
7622678bd0
[Keymap] Adds Jack's 4x12 grid keymap (#10586)
* add jack's planck keymap

* move to community layouts

* add image to readme

* fix imgae

* fix image for real

* Update layouts/community/ortho_4x12/jackhumbert/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

Co-authored-by: Drashna Jaelre <drashna@live.com>
2020-10-18 13:51:15 -07:00
Sendy YK
f663ba5ed0
mrsendyyk Keymap Cleanup (#10539)
* Cleanup

* Update info.json

* Update license notice

* Fix license notice

* Update keymap.c

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Add RGB Light Mode Static Gradient 26

* Update
2020-10-17 12:14:02 -07:00
Drashna Jaelre
855dd2d218
[Keymap] Drashna Code Cleanup (#10656)
* Add Launchpad keymap

Note: RGB and Audio won't work when using B pins for audio

* Add support for rgb matrix on launchpad

* Update config for launchpag

* Disable wait on layer change

* Update config for ErgoDox EZ

* Fixup rgb light userspace code

* Move Corne layout to community layouts folder

* Update config for corne to support community layouts

* Add license header to files

* Minor cleanup of userspace config

* Update Pimironi Trackball code

* Increase debounce time on ergodox

* Fix keymap handling

* Enable wait for USB for moonlander

* Update/add license headers

* fix review issues
2020-10-17 11:46:57 -07:00
jotix
92b7dff3ae
Jotix ortho_4x12_layout (#10647)
* back_to_the_roots

* mouse layer is gone

* mouse layer is gone
2020-10-16 11:09:57 -07:00
George Mao
c0b3034721
Add alice community layout (#10518)
* Added LAYOUT_alice

* Added fauxpark's suggestions as well as updating keymap graphic

* Added file header and used noroadleft's fix to the info.json for fast input mode
2020-10-15 19:23:35 +01:00
Reibl János Dániel
661f4aaa8a
[Keymap] Move my custom functions and keymaps to userspace (#10502)
* Move my custom functions and keymaps to userspace to be able to add the STM32F411 variant of my keyboard with mostly the same functionality

* Move keymaps to community layouts

* Remove keymaps from userspace readme.md

Co-authored-by: Janos Daniel Reibl <janos.daniel.reibl@protonmail.com>
2020-10-04 15:35:28 -07:00
Fred Silberberg
1aacbc44d1
[Keymap] Added 333fred 5x6_5 keymap (#10272)
* First pass at manuform layout.

* Updates from actual usage on my board. Fixed a couple of bugs, added a stormlight quote randomizer.

* Use a 32-bit timer that can actually hit 5 minutes.

* Some updates after a day of usage:

* Turn off WPM. It's too inaccurate and takes up a decent amount of space that can be devoted to quotes.
* Turn off the OLEDs after 5 minutes
* Move the keys around a bit.
* Add many more quotes.

* Adjust the quotes to make room for missing and misswritten WoT quote. Adjusted the keymap slightly. Adjust the mods display to include one_shots.

* Revert osm on lgui as it makes start menu search impossible to use.

* Use LTO_ENABLE flag.

* License all of my (333fred's) keymaps as MIT.

* Update users/333fred/rgb.c

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Ryan <fauxpark@gmail.com>
2020-10-04 12:24:35 -07:00
Danilo de Klerk
f68bb0cc3d
Add ddeklerk split_3x6_3 layout (#10470) 2020-10-01 22:14:46 +01:00
Juno Nguyen
2f01c6ee18
Update make rules for community/ortho_4x12/junonum (#10467) 2020-10-01 22:13:13 +01:00
James Young
10f5767010
Add 64_ansi and 64_iso Community Layouts (#10463)
* Add 64_ansi Community Layout

* Add 64_iso Community Layout

* Add readme.md with layout drawings

* Edit readme.md - fix layout drawings

Fix 65_ansi_blocker_split_bs and 65_ansi_blocker_tsangan drawings.

* Edit readme.md - suggestions per fauxpark

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Ryan <fauxpark@gmail.com>
2020-10-01 21:57:56 +01:00
Sendy YK
d844f5af70
Update mrsendyyk Community Layouts (#10338)
* Add layouts/community/numpad_5x4/mrsendyyk

* Update keymap.c

* Update readme.md

* Update readme.md

* Update readme.md

* Rename my community layouts

* Rename

* Rename

* Cleanup my code

* Update readme.md

* Cleanup

* Update keymap.c

* Delete unnecessary files
2020-09-28 21:32:38 -07:00
jotix
924823cfb4
update jotix ortho_4x12 keymap: add some missing keycodes (#10289) 2020-09-21 18:54:09 -07:00
Sendy YK
becaf325a3
Minor updates 60_ansi_arrow (#10332)
* Minor updates 60_ansi_arrow

* Update keymap.c

* Update keymap.c

* Minnor updates

* Minnor updates

* Update readme.md
2020-09-21 13:34:06 -07:00
Xyverz
bdb1b10e99
Update Xyverz ortho_5x12 keymap (#10346)
* Fixing my 5x12 Ortho layout

Minor fixes.
2020-09-19 12:59:45 -07:00
Callum Oakley
3d4f0028d6
[Keymap] major keymap overhaul (#10185)
* experiment with userspace

* reorganise

* readme

* missing oneshot shift from ignored keys

* recombine hands in layout macro
2020-09-09 15:37:34 -07:00
jotix
e7cc5a35c2
[Keymap] update ortho_4x12 jotix (#10157)
* mouse_layout

* add_mouse_btns

* reset_with_ctrl+esc+bspc

* add_mousekeys_on_right

* mod-tap-mouse-layer

* fn_layer
2020-09-03 01:28:07 -07:00
Danilo de Klerk
a9a2817f3a
[Keymap] Add ddeklerk ortho_4x12 layout (#10109)
* Add ddeklerk ortho_4x12 layout

* Add license header
2020-08-31 21:44:47 -07:00
Sendy YK
993d4058a1
60_ansi_arrows Community Layout; mrsendyyk keymaps for dz60 and maartenwut/eon65 (#9993)
* Add Layout and Keymap

* Add and Update Keymap

* Update readme.md

* Update keymap.c

* Update readme.md

* Update

* delete

* update

* Revert "update"

This reverts commit 91a3ff800c043094469dd0bb60cc454857b3a2d0.

* Update config.h

remove `DESCRIPTION` as per PR checklist

* Update config.h

* Revert "Update config.h"

This reverts commit 269df0535efb4548828463eecc3a022c99d98949.

* Revert "Update config.h"

This reverts commit cad5a3320123da4694f09fb4e3ac08cc75bab1cc.

* Update keyboards/dz60/dz60.h

* Update keyboards/dz60/keymaps/mrsendyyk/keymap.c

* Update keyboards/dz60/keymaps/mrsendyyk/keymap.c

* Update keyboards/dz60/keymaps/mrsendyyk/keymap.c

* Update keyboards/dz60/keymaps/mrsendyyk/keymap.c

* Update keyboards/dz60/keymaps/mrsendyyk/keymap.c

* Update keyboards/dz60/keymaps/mrsendyyk/keymap.c

* Update keyboards/dz60/keymaps/mrsendyyk/keymap.c

* Update keymap.c

* Update keymap.c

* Update keymap.c

* Update dz60.h

* Update keymap.c

* Update readme.md

* Update keymap.c

* Update keymap.c

* Update readme.md

* Update dz60.h

* Update keymap.c

* Update readme.md

* Update readme.md

* Update

* Update keymap.c

* Update keymap.c

* Update keymap.c

* Update readme.md

* Update keymap.c

* Update readme.md

* Update readme.md

* Update keymap.c

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Rename readme.md to README.md

* Rename readme.md to README.md

* Rename README.md to readme.md

* Rename README.md to readme.md

* Update rules.mk

* Update dz60.h

* Update keymap.c

* Update readme.md

* Update keymap.c

* Update readme.md

* Update

* Update keymap.c

* Update keymap.c

* Update keymap.c

* Update keymap.c

* Update readme.md

* Update info.json

* Update keyboards/dz60/dz60.h

* Update keyboards/dz60/dz60.h

* Update keyboards/dz60/rules.mk

* Update layouts/community/60_ansi_arrow/mrsendyyk/keymap.c

* Update layouts/community/60_ansi_arrow/mrsendyyk/keymap.c

* Update layouts/community/60_ansi_arrow/mrsendyyk/keymap.c

* Update layouts/community/60_ansi_arrow/readme.md

* Update layouts/default/60_ansi_arrow/default_60_ansi_arrow/keymap.c

* Update layouts/default/60_ansi_arrow/default_60_ansi_arrow/keymap.c

* Update layouts/default/60_ansi_arrow/default_60_ansi_arrow/keymap.c

* Update layouts/default/60_ansi_arrow/readme.md

* Update layouts/community/60_ansi_arrow/mrsendyyk/readme.md

* Update layouts/community/60_ansi_arrow/mrsendyyk/readme.md

* Update layouts/community/60_ansi_arrow/readme.md

* Update layouts/community/60_ansi_arrow/readme.md

* Update layouts/community/60_ansi_arrow/readme.md

* Update layouts/community/60_ansi_arrow/readme.md

* Update layouts/community/60_ansi_arrow/readme.md

* Update keymap.c

* Update readme.md

* Update keymap.c

* Update keymap.c

* Update readme.md
2020-08-19 11:16:10 -07:00
Alpha Chen
d9fe855923
[Keymap] update kejadlen keymaps (#9954)
Standardizing my keymaps under my username, rather than a keymap name.
2020-08-18 19:21:50 -07:00
jotix
df1467c86d
[Keymap] jotix_ortho_4x12_layout (#10075) 2020-08-18 18:48:40 -07:00
Jonathan Rascher
d699fd1fb4
Switch bcat Chrome OS media keys workaround from mouse keys to NKRO (#9790)
* Switch Chrome OS mouse keys workaround to NKRO

* Add NKRO toggle to keymaps

* USE NK_TOGG keycode instead of defining my own
2020-07-23 15:27:01 +01:00
ajp10304
c5e255a417
Create ajp10304 userspace and ortho_4x12 layout. (#9304) 2020-07-09 20:18:51 +01:00
Danilo de Klerk
91efcfb43a
Add layouts for split 3x5 and 3x6 keyboards (#9562)
Co-authored-by: Ryan <fauxpark@gmail.com>
2020-06-30 18:14:42 +01:00
Xyverz
62ceb46e9d
Fixed MACLOCK key (#9555) 2020-06-29 12:52:23 +10:00
jotix
7369e195c2
tap toggle to lower layer (#9542) 2020-06-26 22:04:09 +01:00
jotix
2521b970e5
add_adjust_layer (#9532) 2020-06-25 09:27:25 +10:00
Joshua Diamond
9b398a8f31
Partial and window screenshots (#9332) 2020-06-24 12:02:12 +10:00
Manna Harbour
f0bde7906d
Update miryoku (#9442)
- Add mouse buttons overlay layer
- Change button order
- Remove crkbd hardware specifics
- Add alternative base layer alphas
- Change title
- Add logo
- Reword intro text
- Add dev branch and new commits links
- Replace manual toc and remove anchors
- Unindent lists
- Reduce headings
- Update docs
- Build keymap as object instead of including .c file
- Add kle subset mapping images
- Add alternative mapping support
- Change default mapping for ortho_4x12
- Add split mapping for ortho_4x12
- Add contact section
- Add #pragma once to layout and keyboard config.h
2020-06-22 22:30:05 -07:00
Drashna Jaelre
357a888d80
[Keymap] Drashna's Keymap Update - Display Edition (#9282)
OLED Display fixes
Add support for RGBLIGHT Layers
Add gaming layer to corn and kyria
RGBLight Startup Animation fixes and improvements (uses matrix_scan now!)
Pimoroni Trackball support added (IT'S RGB!!!)
Fix issues due to code changes
2020-06-15 03:41:28 -07:00
Ryan
407d6a2b67
[Keyboard] Fix error_log complaint about handwired/onekey layout macro (#9263) 2020-06-07 22:49:18 -07:00
Joshua Diamond
d03bc3a9c1
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
2020-06-05 02:01:47 -07:00
jotix
0def9ed528
jotix ortho_4x12 layout (#9209)
Co-authored-by: Ryan <fauxpark@gmail.com>
2020-06-02 21:51:24 +10:00
KOBAYASHI Daisuke
5f5a6fff8b
Remove the extra comma in the macro in the community keymap (#9175) 2020-06-02 06:29:28 +10:00
James Young
fced377ac0
2020 May 30 Breaking Changes Update (#9215)
* Branch point for 2020 May 30 Breaking Change

* Migrate `ACTION_LAYER_TOGGLE` to `TG()` (#8954)

* Migrate `ACTION_MODS_ONESHOT` to `OSM()` (#8957)

* Migrate `ACTION_DEFAULT_LAYER_SET` to `DF()` (#8958)

* Migrate `ACTION_LAYER_MODS` to `LM()` (#8959)

* Migrate `ACTION_MODS_TAP_KEY` to `MT()` (#8968)

* Convert V-USB usbdrv to a submodule (#8321)

* Unify Tap Hold functions and documentation (#8348)

* Changing board names to prevent confusion (#8412)

* Move the Keyboardio Model01 to a keyboardio/ subdir (#8499)

* Move spaceman keyboards (#8830)

* Migrate miscellaneous `fn_actions` entries (#8977)

* Migrate `ACTION_MODS_KEY` to chained mod keycodes (#8979)

* Organizing my keyboards (plaid, tartan, ergoinu) (#8537)

* Refactor Lily58 to use split_common (#6260)

* Refactor zinc to use split_common (#7114)

* Add a message if bin/qmk doesn't work (#9000)

* Fix conflicting types for 'tfp_printf' (#8269)

* Fixed RGB_DISABLE_AFTER_TIMEOUT to be seconds based & small internals cleanup (#6480)

* Refactor and updates to TKC1800 code (#8472)

* Switch to qmk forks for everything (#9019)

* audio refactor: replace deprecated PLAY_NOTE_ARRAY (#8484)

* Audio enable corrections (2/3) (#8903)

* Split HHKB to ANSI and JP layouts and Add VIA support for each (#8582)

* Audio enable corrections (Part 4) (#8974)

* Fix typo from PR7114 (#9171)

* Augment future branch Changelogs (#8978)

* Revert "Branch point for 2020 May 30 Breaking Change"
2020-05-30 13:14:59 -07:00
Joe Doh
38d2c8cedf
[Keymap] dohmain 60_tsangan_hhkb layout (#9157)
* initial commit for tsangan_hhkb community layout

* keymap.c done

* wrote readme

* move media keys; add shortcuts

* edit to reflect changes in keymap

* update readme with imgur link
2020-05-21 19:51:36 -07:00
Jonathan Arnett
ebc274209e
Update j3rn keymap (#9100) 2020-05-16 04:14:47 +10:00
Xyverz
774384ce31
Added defines for RAISE and LOWER (#9083)
I like being able to use layers. This fixes my screw-up from my last
code overhaul.
2020-05-13 10:59:47 +10:00
Jonathan Rascher
81c648e947
More community layout support for legacy KBD67 PCBs (#8933)
* Community layout support for KBD67 hotswap

* Community layout support for KBD67 rev1

* Community layout support for KBD67 rev2

* Move bcat's KBD67 hotswap layout to community
2020-05-06 22:47:55 -07:00
Juno Nguyen
ab1650606c
[Keymap] Minor keymap update to layouts/community/ortho_4x12/junonum/ (#9021) 2020-05-05 23:05:16 +10:00
Jonathan Rascher
4597f2bcc8
[Keymap] Make personal keymaps a bit more consistent (#8915)
* Move menu key on ergo boards to match staggered

* Unify 60_tsangan_hhkb and 60_ansi_split_bs_rshift

* Sync KBD67, Quefrency with community layouts

* Update ergo KLE images

* Update community layout KLE images

* Update KLE images/descriptions for remaining keebs
2020-04-25 23:01:43 -07:00
Brandon Schlack
3337eb10b2
New 65 ANSI Blocker layouts: Split BS, Tsangan (#8793)
* Add 65 ANSI Blocker Split BS default layout

- Add new 65 ANSI Blocker Split BS layout as many 65 ANSI Blocker layouts also support split backspace

* Add 65 ANSI Blocker Tsangan default layout

- Add new 65 ANSI Blocker Tsangan layout as many 65 ANSI Blocker layouts also support a split backspace and a 7u bottom row configuration.

* Fix file names

* Fix 65_ansi_blocker_tsangan keymap

* Fix 65_ansi_blocker_split_bs alignment

* Fix readme name for 65_ansi_blocker_split_bs

* Change 65_ansi_blocker_tsangan to 2u backspace

* Change spaces in preview to NBSP

* Change more spaces in preview to NBSP (right-alt)
2020-04-25 14:29:43 -07:00
Fred Silberberg
2dca087b04
Add naked60 layout, clean up my userspace files and rules.mk. (#8848) 2020-04-20 11:00:14 +01:00
Jonathan Rascher
d600631ad1
[Keymap] Rework my Tsangan layout; turn off mousekeys (#8836)
* Give Tsangan layout a real Fn2 layer

* Disable mouse keys to work around qmk#8323

I don't actually use this feature, so there's no reason for it to be
enabled anyway, and it seems to cause spurious wakeups on Windows.
2020-04-18 18:41:40 -07:00
Joshua Moses Diamond
e4cc642a79
Some refinements of 75_ansi/spidey3 layout (#8581)
* First cut at Josh Diamond's KBD75 customizations.
Includes:
* My unique keymap with ChromeOS specific keys
* Use RGB underglow to indicate Caps Lock
* Some unicode bindings
* Some changes to make debugging easier

* Updated spidey3 to be applicable to all 75_ansi boards

* Sadly, ChromeOS doesn't pay attention to most consumer codes

* Add mac layer; fix flakeyness in CAPS_LOCK underglow.

* Make layers.json match the keymap (to the extent possible)

* Major cleanup; fix broken debug persistence

* Cleanup some whitespace issues

* Fix incorrect log message.

* Rework layer indication to user RGBLIGHT_LAYERS

* Update layouts/community/75_ansi/spidey3/keymap.c

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Rename users/spidey3/rgblight.c to layer_rgb.c per suggestion

* Refactor to use set_single_persistant_default_layer().

* Use dprint/f to make logging more elegant.

* Update users/spidey3/config.h

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Update users/spidey3/config.h

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Update layouts/community/75_ansi/spidey3/rules.mk

Co-Authored-By: Ryan <fauxpark@gmail.com>

* Update users/spidey3/spidey3.c

Co-Authored-By: Ryan <fauxpark@gmail.com>

* Update users/spidey3/layer_rgb.c

Co-Authored-By: Ryan <fauxpark@gmail.com>

* Update users/spidey3/init.c

Co-Authored-By: Ryan <fauxpark@gmail.com>

* Changes from code review

* Numpad layer, various keys for 75_ansi/spidey3

* Add Fn-B to toggle NKRO

* Blink rgb to acknowledge some setting changes

* Updated media control & reset key location

* Minor cleanup

Co-authored-by: Joshua Diamond <jdiamond@Deep-Thought.local>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2020-04-11 10:10:37 +10:00
Yan-Fa Li
6ef13f83e2
[Keymap] Updates to personal keymaps (#8665) 2020-04-08 18:20:58 -07:00
jotix
26cb83b8c0
jotix layouts (#8644)
* jotix layouts

* jotix ortho 4x4 layout

* Update layouts/community/ortho_4x4/jotix/keymap.c

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* jotix

Co-authored-by: Drashna Jaelre <drashna@live.com>
2020-04-05 23:15:24 +01:00
Xyverz
0742f9fc96
Changes to my Ergodox & Planck keymaps (#8622)
* Changes to my Ergodox & Planck keymaps

* Fixed Typos

Corrected some typos and omissions to my Ergodox layout and readme

* Fixed Typos

Fixed some typos in my ErgoDox Readme and keymap.c files
2020-04-02 00:03:52 +01:00
Drashna Jaelre
c67e304593
[Keymap] Drashna's Cleanup and RGB Divide (#8506)
* Enable External EEPROM on Planck Rev6

* Update KC_MAKE macro to use qmk cli util

* Disable additional gradients for rgb matrix

* Update analog code for newer methods

* Update ergodox layout

* Disable Grave Escape

* Cleanup OLED code a bit

* Remove old unicode code

* Seperate RGB Matrix code from RGB Light code in userspace

* Massive overhaul an generalization of personal OLED code

Now lets hope I NEVER get a keyboard using a 128x32 in a normal orientation.

* Super tiny cleanup

* Enable Diablo layer on kyria

* clang format pass

* Additional OLED cleanup
2020-03-31 16:26:43 -07:00
spidey3
7e0dc5376f
[Keymap] Add spidey3 keymap for 75_ansi, and a spidey3 userspace (#8470)
* First cut at Josh Diamond's KBD75 customizations.
Includes:
* My unique keymap with ChromeOS specific keys
* Use RGB underglow to indicate Caps Lock
* Some unicode bindings
* Some changes to make debugging easier

* Updated spidey3 to be applicable to all 75_ansi boards

* Sadly, ChromeOS doesn't pay attention to most consumer codes

* Add mac layer; fix flakeyness in CAPS_LOCK underglow.

* Make layers.json match the keymap (to the extent possible)

* Major cleanup; fix broken debug persistence

* Cleanup some whitespace issues

* Fix incorrect log message.

* Rework layer indication to user RGBLIGHT_LAYERS

* Update layouts/community/75_ansi/spidey3/keymap.c

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Rename users/spidey3/rgblight.c to layer_rgb.c per suggestion

* Refactor to use set_single_persistant_default_layer().

* Use dprint/f to make logging more elegant.

* Update users/spidey3/config.h

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Update users/spidey3/config.h

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Update layouts/community/75_ansi/spidey3/rules.mk

Co-Authored-By: Ryan <fauxpark@gmail.com>

* Update users/spidey3/spidey3.c

Co-Authored-By: Ryan <fauxpark@gmail.com>

* Update users/spidey3/layer_rgb.c

Co-Authored-By: Ryan <fauxpark@gmail.com>

* Update users/spidey3/init.c

Co-Authored-By: Ryan <fauxpark@gmail.com>

* Changes from code review

Co-authored-by: Joshua Diamond <jdiamond@Deep-Thought.local>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2020-03-22 21:11:41 -07:00