1
0
Fork 0
forked from forks/qmk_firmware
Commit graph

10030 commits

Author SHA1 Message Date
XScorpion2 270b39b2eb Spirals, Pinwheels, and Documentation....Oh My! RGB Matrix Effects (#5877)
* Spirals, Pinwheels, and Documentation....Oh My!

* Spiral effect band thickness adjustments

* Fixing animation spin directions
2019-05-19 09:19:46 -07:00
XScorpion2 a0d6c5a113 [Keymap] Update Xulkal user code (#5920) 2019-05-19 09:15:50 -07:00
XScorpion2 f11fde9bf5 Fixing hsv_to_rgb where s = 0 and v < 255 (#5915)
* Fixing hsv to rgb where s is 0 and v is < 255

* Update color.c
2019-05-19 09:11:08 -07:00
XScorpion2 0099bbf9a6 Single Color Band scrolling left to right effects (#5867) 2019-05-19 09:09:06 -07:00
Ryan Caltabiano ba26736d7e Fix bit count calculation for iterating layers 2019-05-18 13:47:34 -07:00
Josh d85110b6ec Adds a configurable initial delay to the audio clicky feature (#4286)
* Adding an AUDIO_CLICKY_DELAY_DURATION configurable value to the AUDIO_CLICKY feature.

* Tweaking my community keymap to work better with my rev 4 planck.
2019-05-17 13:48:53 -07:00
Alex Ong 00d1d7828c Typedef'ed layer_state_t to uint32_t (#3637)
* Typedef'ed layer_state_t to uint32_t.

This enables future work with layer_state_t to uint8_t for optimization purposes.

* Removed accidental xeal60 commit

* Revert to egyptian brackets, added sizeof(layer_state_t) so when layer_state_t is redefined it will automagically work.

* Add additional typedefs

* Add checks for setting layer state

* Update tmk_core/common/action_layer.h

Co-Authored-By: alex-ong <the.onga@gmail.com>

* Revert commit.
2019-05-17 13:47:50 -07:00
Jeremy Bernhardt 90a45aac6e [Keyboard] Butterstick fix (#5900)
* Working on chording

* Working on chording

* Got layouts in order

* Initial Georgi support

* forgot to add keymaps

* Updated readme

* Update keyboards/georgi/keymaps/template/readme.md

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Update keyboards/georgi/georgi.h

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Update keyboards/georgi/keymaps/default/keymap.c

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Update keyboards/georgi/keymaps/default/keymap.c

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Update keyboards/georgi/rules.mk

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Update keyboards/georgi/rules.mk

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Update keyboards/georgi/matrix.c

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Update keyboards/georgi/georgi.c

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Update keyboards/georgi/georgi.c

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Update keyboards/georgi/rules.mk

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Update keyboards/georgi/keymaps/default/keymap.c

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Update keyboards/georgi/keymaps/template/keymap.c

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Update keyboards/georgi/matrix.c

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Disabled features, updated info

* Update keyboards/georgi/config.h

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Update keyboards/georgi/config.h

Co-Authored-By: germ <jeremythegeek@gmail.com>

* Fixed info.json

* Split the number button and fixed gaming mode.

* started work on history feature

* Working history/multikeyfuckery

* type

* inital code reduction refactor

* Got multikey patched up, optimizing for size

* Forgot to remove stuff

* fixed key repeat

* Key repeat added.

* Symshift locking

* Midchord Sym shenanigans.

* Added only QWERTY mode

* Split out header

* Added stickybits, minimal layour

* Fixing user layout

* Whitespace fixing

* Fixing Version name

* Starting work on BS

* Fixing default layout and rules

* Updated Butter fw

* Copy-paste rebase

* more fixing from merge. Fuck

* Forgot to roll version

* Added revisions as per @mechmerlin

* Somehow forgot backspace

* Forgot Backspace?
2019-05-17 13:07:37 -07:00
Jeremy Bernhardt d0c9ad6433 [Keyboard] Georgi improvements (#5899)
* Georgi improvements

* The writing was in the -Wall
2019-05-17 13:02:22 -07:00
Chris Broekema 7a0174f871 [Keyboard] keypad enter should not be remapped in Model M default keymap (#5897) 2019-05-17 12:58:28 -07:00
kingwangwong b34d2c73fa [Keymap] Adding my keymap for the minivan/kumo (#5896)
* adding my keymap for the KUMO

* edited the readme file

* edited some more files

* edited some more files

* edited files from feedback

* edited one more files from feedback

* edited rules
2019-05-17 12:57:10 -07:00
MechMerlin 8be32e98d8 [Keyboard] New Keyboard: Mars 8.0 TKL (#5894)
* fix the things the stupid script broke

* create an appropriate LAYOUT macro using LAYOUT_tkl_ansi

* create an appropriate keymap stolen from the phantom default keymap

* add correct pins used and rgb led numbers

* change vendor and device name

* add QMK Configurator support

* fix up RGB underglow

* update readme

* introduce new layout macro tkl_iso

* add QMK Configurator support for new layout macro

* enable backlight and add community layout support
2019-05-17 12:54:10 -07:00
marksard 49464be645 [Keymap] Add keymap for minivan (#5887)
* Keyboard: add treeadstone48

* rename layout defines

* Use of pragma once

* move common include code

* fixed info.json

* change keymap layout from kc to normal

* fix alpha revision keymap

* fixed info.json

* remove USE_Link_Time_Optimization

* Added like_jis keymap for minivan/KUMO keyboard.

* Fixed comments

* Fixed review
2019-05-17 12:40:02 -07:00
mogira 9c7818582d Fix the modifier of font variable in ssd1306.c (#5880) 2019-05-17 12:37:12 -07:00
Drashna Jaelre 48b01446ba Make delay for Capslock in Hold-Tap functions configurable (#5497)
* Increase delay for Hold-Tap register for CAPSLOCK

Because it seems that the 80ms delay wasn't too much

* Screw it, make the caps delay a define and make it configurable
2019-05-16 10:28:06 -07:00
Jan Christoph Ebersbach 5a8e387b77 [Keymap] Signum 3.0 Swap positions (#5892) 2019-05-16 09:40:00 -07:00
ENDO Katsuhiro 63ddad86a9 Add a new keyboard Halberd (#5874)
* Add a new keyboard Halberd.

* Update default keymap and add new keymap.

* Use pragma once.

* Comment out IS_COMMAND macro.

* Remove unnecessary backslashes.

* Remove dead code.

* Change layer defines to enum.

* Remove DISABLE_JTAG definition.

* Change BOOTMAGIC_ENABLE to "lite".

* Remove unnecessary line.

Co-Authored-By: fauxpark <fauxpark@gmail.com>
2019-05-16 09:39:06 -07:00
Pavlos Vinieratos 1a28906a3d [Keymap] Pvinis/update for iris (#5889)
* add default functions

* some indenting

* add ctl and alt

* maybe?
2019-05-16 09:38:28 -07:00
MechMerlin a8af694d26 [Keyboard] Leaf60 hotswap and universal pcb (#5882)
* initial commit

* copy paste with some fixes the code from fox lab leaf60 repo

* add 60_ansi and 60_hhkb and community layout support

* add QMK Configurator support

* turn bootmagic to lite and turn on rgb and backlights

* disable some features so firmware isn't too big

* initial commit for hotswap leaf60

* add hotswap support

* edits for consistency

* add a generic leaf60 readme

* turn off console and command to save firmware space

* not enabling sleep led enable

* not enabling sleep led enable

* had one extra key in 60_hhkb

* get rid of limit val define

* Update keyboards/foxlab/leaf60/hotswap/readme.md

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/foxlab/leaf60/hotswap/rules.mk

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

* Update keyboards/foxlab/leaf60/universal/rules.mk

Co-Authored-By: fauxpark <fauxpark@gmail.com>
2019-05-16 08:52:38 -07:00
Pavlos Vinieratos b541369c45 [Docs] Fix typo in Userspace doc (#5871)
* typo

* Update docs/feature_userspace.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>
2019-05-16 08:21:51 -07:00
zvecr fc06975fa3 Add Configurator support for ai03/orbit (#5863)
* Add Configurator support for ai03/orbit

* Add Configurator support for ai03/orbit - align with documented KLE
2019-05-16 05:54:43 -07:00
zvecr 6764bb0157 Align Configurator support for ai03/lunar (#5864) 2019-05-16 05:53:48 -07:00
Takeshi ISHII 670a9b7f83 Add effect range to rgblight.c (#5856)
* add rgblight_set_effect_range()

* implement effect range

* Arrange the order of function list in rgblight.h .

* update docs/feature_rgblight.md

* fix RGBLIGHT_RAINBOW_SWIRL_RANGE default value

* add example code about Utility Functions

* add example code about direct operation functions

* When RGBLIGHT_SPLIT is defined, the following function has no meaning and is invalidated.

 * rgblight_setrgb_master(r, g, b)
 * rgblight_setrgb_slave(r, g, b)
 * rgblight_sethsv_master(h, s, v)
 * rgblight_sethsv_slave(h, s, v)

* add temporary test code for rgblight_set_effect_range

* fix rgblight_effect_knight() bug

* Test End. Revert "add temporary test code for rgblight_set_effect_range"

This reverts commit 5680cddd01.
2019-05-15 21:11:28 -07:00
yiancar acd3e79add NK65 Addition (#5865)
* Nk65 initial commit

* Minor fix for compatibility

* Make everything pretty

* Update keyboards/nk65/config.h

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/nk65/readme.md

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Chmod Dummy

* Update getting_started_introduction.md

* Revert "Update getting_started_introduction.md"

This reverts commit daf446acf7.
2019-05-15 21:09:36 -07:00
Erez Zukerman 8680c50d07 Removes Erez personally from QMK (#5883) 2019-05-15 19:53:45 -04:00
zvecr 8bcefc92d0 Port 40percentclub nein (#5876) 2019-05-15 12:57:35 -07:00
ENDO Katsuhiro 547eb55553 Add a new keybord Scythe (#5873)
* Add a new keyboard Scythe.

* Update info.json.

* Use pragma once.

* Comment out IS_COMMAND macro.

* Remove DISABLE_JTAG definition.

* Remove unnecessary backslashes.

* Change layer defines to enum.

* Remove dead code.

* Fix typo(RGBLIGHT_SPLIT).

* Change BOOTMAGIC_ENABLE to "lite".

* Remove unnecessary keys.

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Fix width.

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Fix hight.

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
2019-05-15 08:52:30 -07:00
Nicholas Shaff 7209266ea1 [Keyboard] Added capslock LED support to the Doro67 Multi PCB. (#5875) 2019-05-14 19:31:36 -07:00
Ben 4ed474b66a [Keyboard] Add Keycapsss O4L 5x12 keyboard (#5859)
* [Keyboard] Add Keycapsss O4L 5x12 keyboard

* Fix layout error in rules.mk

* Update keyboards/keycapsss/o4l_5x12/readme.md

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/keycapsss/o4l_5x12/readme.md

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/keycapsss/o4l_5x12/readme.md

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/keycapsss/o4l_5x12/readme.md

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/keycapsss/o4l_5x12/readme.md

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/keycapsss/o4l_5x12/config.h

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Remove trailing backslashes

* Add additional infos to the readme

* Remove remaining backslashes

* Change 2x2y layout to my needs

* Update keyboards/keycapsss/o4l_5x12/o4l_5x12.h

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

* Update keyboards/keycapsss/o4l_5x12/o4l_5x12.h

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

* Update keyboards/keycapsss/o4l_5x12/o4l_5x12.h

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

* Update keymaps to use new layout names

* Update keyboards/keycapsss/o4l_5x12/rules.mk

Co-Authored-By: Drashna Jaelre <drashna@live.com>
2019-05-14 17:00:31 -07:00
XScorpion2 3220b24819 Update Zen rev2 info.json file with option positions (#5872) 2019-05-14 15:25:26 -07:00
Markus Dieckmann fd0ba01d68 [Keymap] Correction for DE_Simple keymap readme (#5870)
Replaced erroneous second QWERTZ keymap with diagramm for 'Lower'
layer.
2019-05-14 12:27:49 -07:00
Morton Jonuschat 7c0f2ae6d1 [Keymap] Neo2 for ErgoDox on MacOS US QWERTY / ABC Extended keymap (#5862)
This is a Neo2 inspired layout that is meant to be fully usable on
MacOS when used with the default US QWERTY/ABC Extended keymap.

Neo2 layers 1-4 have been almost fully implemented in hardware.
Layers 5 and 6 (greek and mathematical symbols) have been left
out for now as most of them aren't available on the default
keymaps.

Layer toggling for layer 3 on the right hand side utilizes a
tap-toggle approach that is a combination of MO & LT macros.
This is required to allow sending Y when tapped, @ when tapped
while the SHIFT modifier is active and support momentarily
toggling the layer while the key is held.
2019-05-14 12:12:29 -07:00
zvecr 93a97ec6e5 Fix arch installs as 8.1 is unavailable and #5456 has been merged (#5857) 2019-05-14 12:05:09 -07:00
Pavlos Vinieratos b68d8fe82e [Keymap] Pvinis master (#5843)
* trying to make my global keymap

* refactoring the old keymap using userspace

* getting there

* move readme and remove community layout

* use pragma once instead of ifndefs

* just make iris work

* iris decent

* better naming

* add some modifiers on the home row

* use symbol and sysctl layers

* fix up

* a bit faster

* add < and > on symbol layer

* apparently im not using z all that much..

* okok

* fix up stuff

* led init is back

* bring back led indicators

* Update keyboards/ergotravel/keymaps/pvinis/config.h

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* not needed

* not needed

* delete these for now, until I use the userspace code

* remove katamari from here. made a new pr for it

* lower case

* drashna suggestion :)

* move files to correct place

* fix missing command
2019-05-14 12:02:22 -07:00
XScorpion2 4cdb86c730 [Keyboard] Create RGBKB Folder (#5858)
* Move Sol, Zen, & Zygomorph keyboards to RGBKB folder

* Updated default keymaps

* Fixing more areas due too folder moves

* Fixing Zen layer numbers

* Fixing zygomorph layer comments

* Fixing Colmak comments

* Fixing Sol Colmak readme

* Macro alignment

* Zen rev2 configuration json

* Fixing sol ifdef

* Fixing Sol info.json
2019-05-14 11:58:56 -07:00
roguepullrequest e8b27a965d Roguepullrequest mousepad (#5860)
* First publish of roguepullreqest programmer dvorak planck layout

* Removed junk line

* Update keyboards/planck/keymaps/roguepullrequest/keymap.c

Co-Authored-By: roguepullrequest <roguepullrequest@users.noreply.github.com>

* Update keyboards/planck/keymaps/roguepullrequest/keymap.c

Co-Authored-By: roguepullrequest <roguepullrequest@users.noreply.github.com>

* Update keyboards/planck/keymaps/roguepullrequest/keymap.c

Co-Authored-By: roguepullrequest <roguepullrequest@users.noreply.github.com>

* Update keyboards/planck/keymaps/roguepullrequest/keymap.c

Co-Authored-By: roguepullrequest <roguepullrequest@users.noreply.github.com>

* Removed layer songs

Removed layer songs for cleanliness. Will use them later.

* Update keyboards/planck/keymaps/roguepullrequest/readme.md

Co-Authored-By: roguepullrequest <roguepullrequest@users.noreply.github.com>

* Made basic LSHIFT framework but is not working. Listed other tapdances.

* Got LSHIFT to work

* Added working RSHIFT

* Added working TD_S

* Cleaned up LEFT and RIGHT [ { ] } on the UPPER layer.

* Cleaned up layout.

* Reenabled audio space is not needed right now.

* Added tap dances and layout image

* Started dactylmanuform layout

* Revert "Started dactylmanuform layout"

This reverts commit 5ef48e4a23.

* Started mousepad version of BDN9...wont compile for some reason.

* Fixed BDN9 mousepad layout

* Added readme.md to mousepad bdn9 layout.

* Updated readme.md for mousepad bdn9 layout. 

Fixed the tables to finally work.

* Unslashed the mousepad keymap for the BDN9
2019-05-13 08:00:20 -07:00
XScorpion2 9b46fabe08 Xulkal Keymap Changes (#5861) 2019-05-13 07:58:15 -07:00
fauxpark 8e3cbe030c Add Wasdat controller (#5855)
* Add Wasdat controller

* Add reset instructions

* Clarify ANSI & ISO support
2019-05-12 11:22:16 -07:00
zvecr 7e1d28673f [Keyboard] Fix file encoding and add readme (#5853) 2019-05-12 00:01:00 -07:00
Croktopus 94f104cb6c [Keyboard] Added hand wired keyboard "Daishi" (#5712)
* added daishi

* edits made based on feedback

* Update keyboards/handwired/daishi/readme.md

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/handwired/daishi/keymaps/default/readme.md

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/handwired/daishi/keymaps/default/readme.md

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* made more changes based on feedback

* Update keyboards/handwired/daishi/keymaps/default/readme.md

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* updated usb device info

* fixed layouts

* fixed LEDs and keymaps
2019-05-11 23:59:52 -07:00
takashiski 0db65190c2 [Keyboard] Enable RGBLED_SPLIT on hecomi/alpha (#5836)
* remove not need file

* set RGBLIGHT_SPLIT

* set RGBLIGHT by layer

* exchange LED color on layer

* Update keyboards/hecomi/alpha/rules.mk

I misunderstand RGBLIGHT_SPLIT

Co-Authored-By: Drashna Jaelre <drashna@live.com>
2019-05-11 23:20:45 -07:00
zvecr 2b78840ef7 [Keyboard] Fix dz60 LAYOUT_60_iso_split_space_bs_rshift api errors (#5852)
* Fix LAYOUT_60_iso_split_space_bs_rshift to match comments and Configurator

* Fix LAYOUT_60_iso_split_space_bs_rshift to match comments and Configurator
2019-05-11 23:15:17 -07:00
zvecr b32ad8b90c [Keyboard] Convert Staryu to use DIRECT_PINS and BACKLIGHT_PINS (#5848)
* Convert to use DIRECT_PINS and BACKLIGHT_PINS

* Convert to use DIRECT_PINS and BACKLIGHT_PINS - remove old comment
2019-05-11 22:57:51 -07:00
MechMerlin 831d765b52 [Keyboard] clarify readme for the growing number of kbd67 revisions (#5844)
* clarify readme for the growing number of kbd67 revisions

* some pr comment nits
2019-05-11 22:56:00 -07:00
XScorpion2 8d46bb9cab [Keyboard] Adding RGBKB Zygomorph Keyboard (#5841)
* Initial Zygomorph 5x6 code

Split is not working yet

* layout changes

implement 4 row config option (not done yet), remove layout comments in layout.c

* Zygomorph layouts for 5x12, 5x6, 4x12, and 4x6

Also, info.json *should* be nearly usable
 for the configurator

* temporary fix for pin D5 being broken

* show D5 issue comment

* add build notes

* Pin B7 broken in split why?

* remove fix

* Fix some pin assignments

* begin to fix keymap

* Create new 5x6 layout

* update key positions

* Initial Zygomorph 5x6 code

Split is not working yet

* layout changes

implement 4 row config option (not done yet), remove layout comments in layout.c

* Zygomorph layouts for 5x12, 5x6, 4x12, and 4x6

Also, info.json *should* be nearly usable
 for the configurator

* temporary fix for pin D5 being broken

* show D5 issue comment

* add build notes

* Pin B7 broken in split why?

* remove fix

* Fix some pin assignments

* begin to fix keymap

* Create new 5x6 layout

* Rough first pass at split common conversion.
Keymap cleanup to cover just the basics.
Broke OLED code out into separate example.

* Fix readme

* Removal of old encoder / oled driver, fix for layout macros

* small update

* xulkal zygomorph keymaps

* Removed the LED_MIRRORED option as leds are always mirrored on Zygomorph

* Xulkal keymaps update

* split rgb light support

* fix line endings

* Apply suggestions from code review

Co-Authored-By: zvecr <git@zvecr.com>

* More layout and compile fixes from pr review

* Cleaning up rules.mk files

* Apply suggestions from code review

Co-Authored-By: zvecr <git@zvecr.com>

* Updating defaults

* Apply suggestions from code review

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
2019-05-11 22:42:57 -07:00
XScorpion2 c6184d2e7e Added check for event pressed to clear space cadet (#5839)
* Added check for pressed to clear space cadet

* Found some docs to update

* Update docs/quantum_keycodes.md

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

* Changes from PR
2019-05-11 22:20:14 -07:00
noroadsleft ec302295b6 [Keyboard] Z-150 Blackheart refactor (#5823)
* Fix white space on z150_blackheart.h

* Update z150_blackheart.h to use #pragma once include guard

* Update z150_blackheart.h to use QMK-preferred K<row><col> notation

* Add QMK Configurator support

* Refactor the keymaps

- refactor the keymaps into separate files for each layout macro
- give credit where credit is due
- white space update (four-space indent)

* Make Hardware Availability link in readme a rich text link

* Convert LED indicators to GPIO commands

* Elevate Indicator LED set-up and toggling to keyboard level
2019-05-11 22:16:07 -07:00
Mike Roberts f542c0589b NEK Type A (#5175)
* project creation and config.h import

* fix name

* cleanup

* layout for left

* working left with feather pins

* full keymap

* ?

* let's do this

* non working twimaster version

* it fucking works!

* bluetooth!

* cleanup

* use auto output for ADAFRUIT_BLE

* remove auto from custom matrix

* better ble auto

* fix f1

* revert

* fix ble

* update readme

* Update readme.md

* Update readme.md
2019-05-11 18:12:06 -07:00
zvecr d53cbd2dc6 Update run command now that the install script is unattended, fix mount point for Debian (#5847) 2019-05-11 17:55:12 -07:00
stanrc85 5c4707eafc [Keymap] Minor keymap updates (#5850)
* Move layer toggle key for one handed operation

* Add print screen keycode

* Cleaning up some tab/space formatting
2019-05-11 17:51:37 -07:00