Commit Graph

13436 Commits (28ff51175b6d45ce5a8dbfe7ed6e7a12df3bc8a8)

Author SHA1 Message Date
precondition 28ff51175b
[Docs] Wording & formatting changes in the Tapping Force Hold section of the Tap Hold page + removed trailing whitespaces (#10391)
* Wording & formatting changes in Tapping Force Hold

The Permissive Hold and the Ignore Mod Tap Interrupt sections were also modified to remove the quotes
around "tapping".

* Removed all trailing whitespaces from tap hold doc

* "it's simply really:" → "it's simple really:"

* "This allows to keep the ability" → "This allows keeping the ability"

Used the gerund form of "to keep" in the Tapping Force Hold section of the Tap Hold docs.

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>
2020-09-26 19:11:40 -04:00
Ryan c16ee22784
`setrgb()`: Use arrow operator (#10451) 2020-09-26 19:42:40 +01:00
Evy Dekkers 1b7101f065
[Keyboard] add Percent Canoe Gen2 (#10344)
* Add Canoe Gen2

* Fix info.json

* Update info.json

* Changes

* Move canoegen2 to canoe_gen2

* Update canoe_gen2.h
2020-09-25 22:39:14 -07:00
mechlovin c4cc697aef
[Keyboard] add hannah65 by Team Mechlovin (#10284)
* add hannah65

* add iso layout, ansi layout

* Update readme.md

* add mechlovin9

* update

* update

* update

* Update keyboards/mechlovin/hannah65/mechlovin9/info.json

* Update keyboards/mechlovin/hannah65/mechlovin9/info.json

* Update keyboards/mechlovin/hannah65/mechlovin9/readme.md

* Update keyboards/mechlovin/hannah65/readme.md

* Update keyboards/mechlovin/hannah65/rev1/info.json

* Update keyboards/mechlovin/hannah65/rev1/info.json

* Update keyboards/mechlovin/hannah65/rev1/rev1.h

* Update keyboards/mechlovin/hannah65/rev1/rev1.h

* Update keyboards/mechlovin/hannah65/mechlovin9/info.json

* update

* Update keyboards/mechlovin/hannah65/mechlovin9/info.json

* Update keyboards/mechlovin/hannah65/mechlovin9/info.json
2020-09-25 22:33:49 -07:00
Ryan b6f9ca3b09
Fix Belgian sendstring properly (#10444) 2020-09-26 14:14:34 +10:00
jackytrabbit 603c8d1f06
Add VIA support for lazydesigners/the30 (#10374)
* Create rules.mk

* Add files via upload

* Update keyboards/lazydesigners/the30/keymaps/via/keymap.c
2020-09-25 18:45:36 -07:00
doodboard 4a83021fe0
[Keyboard] add duckboard by doodboard (#10318)
* Adding duckboard to QMK

Adding duckboard support to QMK

* added duckboard under doodboard

* changed debouncing delay to debounce

* Update keyboards/doodboard/duckboard/config.h

* Update keyboards/doodboard/duckboard/config.h

* Update keyboards/doodboard/duckboard/kb.h

* Update keyboards/doodboard/duckboard/keymaps/default/keymap.c

* Update keyboards/doodboard/duckboard/rules.mk

* Update keyboards/doodboard/duckboard/kb.h

* Update keyboards/doodboard/duckboard/kb.c

* Update code per review

Update code per review

* folder name errod

folder name errod

* Update keyboards/doodboard/duckboard/config.h

* Update keyboards/doodboard/duckboard/rules.mk

* Update keyboards/doodboard/duckboard/rules.mk

* Update keyboards/doodboard/duckboard/config.h

* Create info.json

* Update keyboards/doodboard/duckboard/duckboard.h

* Update keyboards/doodboard/duckboard/info.json

* Update keyboards/doodboard/duckboard/info.json

* Update keyboards/doodboard/duckboard/duckboard.h

* Update keyboards/doodboard/duckboard/readme.md
2020-09-25 14:30:52 -07:00
Drashna Jaelre 9570b1bbb4
Fix Belgian sendstring file (#10443)
Specifically, the `BE_CIRC` is an alt-ed keycode, which means it 
doesn't fit into the 8 bit keycode range...  It should be `BE_SECT`,
as it is already alt-ed by the alt lut.

Confirmed that this change fixes compilation warnings and works 
correctly, on reddit. 
https://www.reddit.com/r/olkb/comments/iywin1/unsigned_conversion_from_int_to_unsigned_char/g6jvfgl/
2020-09-26 05:34:38 +10:00
Felix Jen 4511201d80
[Keyboard] added Bolsa65 keyboard by FJLabs (#10394)
* Modifed for BKS65

* Added test board

* attempts

* Working compile

* updated rules for processor frequency and documented

* Disabed some deprecated features

* Removed extraneous code

* remove test code

* Renamed board

* LED and layer code

* Added via support

* Update keyboards/fjlabs/bolsa65/bolsa65.c

Fixed indentation as suggested.

* Update keyboards/fjlabs/bolsa65/config.h

Removed extraneous defaults

* Update keyboards/fjlabs/bolsa65/keymaps/default/keymap.c

Different layer enumeration method

* Update keyboards/fjlabs/bolsa65/keymaps/via/keymap.c

New layer enumeration method.

* Update keyboards/fjlabs/bolsa65/config.h

Removed extraneous description.

* Update keyboards/fjlabs/bolsa65/keymaps/via/rules.mk

Removed extraneous bootmagic

* Update keyboards/fjlabs/bolsa65/rules.mk

Updated rules

* Update keyboards/fjlabs/bolsa65/readme.md

Markdown list formatting

* Update keyboards/fjlabs/bolsa65/bolsa65.h

Changed layout name

* Update keyboards/fjlabs/bolsa65/info.json

Changed layout name

* Update keyboards/fjlabs/bolsa65/keymaps/via/keymap.c

Changed Layout name

* Update keyboards/fjlabs/bolsa65/keymaps/via/keymap.c

Change layout name

* Changed layout names

* Updated readme to reflect new keyboard name

* Update keyboards/fjlabs/bolsa65/config.h

Removed extraneous code

* Added license file header

* Removed VSCode folder

* Update keyboards/fjlabs/bolsa65/keymaps/via/keymap.c

* Update keyboards/fjlabs/bolsa65/info.json

* Update keyboards/fjlabs/bolsa65/keymaps/via/keymap.c
2020-09-23 23:55:59 -07:00
Ryan 5f23f21216
CLI/Doctor: Print QMK_HOME (#10398) 2020-09-24 15:16:00 +10:00
Albert Dong 086c9c714e
Add Wyvern Keyboard (#10378)
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2020-09-24 15:15:18 +10:00
George Mao 9c596c1c5b
Adding Bear 65 Ergo Keyboard To QMK (#10384)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2020-09-24 14:10:40 +10:00
MechMerlin cd64425fdd
VIA Support: Gray Studio HB85 (#10329)
* edit vid and pid

* add VIA keymap

* add my name to the readme

* Update keyboards/gray_studio/hb85/keymaps/via/config.h

* we have a third endpoint, no need to disable mousekeys

* Update keyboards/gray_studio/hb85/keymaps/via/keymap.c

* add license header
2020-09-23 20:53:08 -07:00
QMK Bot 860deb774e format code according to conventions [skip ci] 2020-09-24 02:35:14 +00:00
Sendy YK ec7ce15c11
Add ai03/soyuz VIA Support (#10336)
* Add ai03/soyuz:via

* Update config.h

* Update keymap.c

* Revert "Update keymap.c"

This reverts commit e3766b3b603aecca82b337e5ae8d5613f47526d6.

* Update keymap.c

* Update keymap.c

* Update keyboards/ai03/soyuz/config.h
2020-09-23 19:34:22 -07:00
gooberpsycho 30ffae2317
[Keyboard] add 3dp660 handwired (#10296)
* Create keymap.c

* Add files via upload

* Added files for handwired 3d printed clueboard 660

* create via layout files

* added layout files for via

* updated product ID to fix id conflicts

* change product ID to fix ID conflicts.

* fixed capitalization error that was causing issues

* fixed capitalization issues.

* fix syntax errors

* Fixed syntax errors (stray punctuation)

* Compatibility fixes

* Compatibility fixes

* Compatibility fixes

* Compatibility fixes

* capitalization fixes

* Compatibility fixes

* Compatibility fixes

* Compatibility Fixes

* Compatibility fixes

* Compatibility fixes

* Compatibility changes

* upkeep, fixing typos

* Update keyboards/handwired/3dp660/config.h

Removed Description line

* Update keyboards/handwired/3dp660/rules.mk

correct bootloader

* Update keyboards/handwired/3dp660/3dp660.h

fix case sensitive typos

* Update keyboards/handwired/3dp660/keymaps/default/keymap.c

change tab indentation to space indentations.

* Update keyboards/handwired/3dp660/keymaps/via/keymap.c

change tab indentations to space indentations

* Delete 3dp660.json

This file was for VIA, and shouldn't be in this repo. I placed it here so I wouldn't misplace it in my filesystem. My apologies.

* Update info.json

change suggestions to other file said to lowercase "ansi", caused reference issues, changed all instances of "ANSI" to "ansi".

* Update keymap.c

change suggestions to other file said to lowercase "ansi", caused reference issues, changed all instances of "ANSI" to "ansi".

* Update keymap.c

more capitalization fixes

* Update keyboards/handwired/3dp660/readme.md

shortened imgur url

* Update keyboards/handwired/3dp660/rules.mk

remove extraneous comments

* Delete config.h

* Update keyboards/handwired/3dp660/rules.mk

* Update 3dp660.c

add license headers to all .c and .h files

* Update 3dp660.h

added license header to all .c and .h files.

* Update keymap.c

added license header to all .c and .h files.

* Update keymap.c

added license header to all .c and .h files.

* Update keyboards/handwired/3dp660/readme.md

Add maintainer URL

* Update keyboards/handwired/3dp660/keymaps/default/keymap.c

remove extraneous default keymap layers

* Update keyboards/handwired/3dp660/keymaps/default/rules.mk

* Update rules.mk

Moved LTO to keyboard level.

* Update rules.mk

Moved LTO to keyboard level.

* Delete rules.mk

Made obsolete by LTO move to keyboard level.

* Update keyboards/handwired/3dp660/rules.mk

capitalization errors.

* Apply suggestions from code review

Housekeeping, changing code for readability.
2020-09-23 19:32:33 -07:00
MechMerlin 940280c435
VIA Support for flehrad Big Switch (#10325)
* add VIA keymap

* Update keyboards/flehrad/bigswitch/keymaps/via/keymap.c
2020-09-23 18:52:04 -07:00
2Moons-JP 940c294d26
[Keyboard] add Basekeys Trifecta (#10375)
* Trifecta 09-20

* Update keyboards/basekeys/trifecta/config.h

* Update keyboards/basekeys/trifecta/config.h

* Update keyboards/basekeys/trifecta/config.h

* Update keyboards/basekeys/trifecta/keymaps/default/keymap.c

* Update keyboards/basekeys/trifecta/keymaps/via/keymap.c

* Update keyboards/basekeys/trifecta/rules.mk

* Update rules.mk

Suggested Changes

* Update keyboards/basekeys/trifecta/readme.md

* Update keyboards/basekeys/trifecta/readme.md

* Tap Dance Removal

* Update keyboards/basekeys/trifecta/keymaps/default/keymap.c

* Update keyboards/basekeys/trifecta/keymaps/default/keymap.c

* Update keyboards/basekeys/trifecta/keymaps/via/keymap.c
2020-09-23 18:47:27 -07:00
MelGeek f2dec4d3cf
[Keyboard] add MelGeek MJ61 (#10341)
* [Keyboard] Support MJ61 which is a 60% ANSI STD Hotswap RGB keyboard

* Update keyboards/melgeek/mj61/mj61.c

* Update keyboards/melgeek/mj61/mj61.c

* [Keyboard] MJ61 Add license header for files and the link for readme

* Update keyboards/melgeek/mj61/readme.md

* Update keyboards/melgeek/mj61/rev1/config.h

* Update keyboards/melgeek/mj61/rev1/rules.mk

* Update keyboards/melgeek/mj61/mj61.c

* Update keyboards/melgeek/mj61/mj61.c
2020-09-23 18:45:43 -07:00
myfreeweb 8b9617f93d
[Keyboard] Add Spider Island split 78 key ps2avrGB based keyboard (#9900) 2020-09-22 21:17:36 -07:00
Sendy YK 96101adea9
Minor updates ai03/soyuz:mrsendyyk (#10333)
* Minor updates ai03/soyuz:mrsendyyk

* Update keymap.c

* Update readme.md

* Update keymap.c

* Update readme.md
2020-09-23 02:31:05 +01:00
kingwangwong d828e991a9
[Keymap] update to king keymaps by kingwangwong (#10299)
Adding my kbd67mkii keymap and some changes to kumo

Keymaps for kbdfans/kbd67/mkii_soldered and thevankeyboards/minivan

* Changes to minivan layout

* KBD67 keymap

* commiting my files
2020-09-22 17:58:45 -07:00
Isaac afb9179b65
Add swap hands config for kyria (#10397)
* add swap hands config

* move to rev1
2020-09-23 01:35:04 +01:00
Brandon Claveria 5faf5383ad
add handwired/swiftrax/retropad (#10331)
* add retropad

* fix indicator leds

* fix bootmagic

* fix led indicators

* fix keymap

* fix keymap

* fix keymap

* fix keymap

* fix license headers

* Apply suggestions from code review

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

* Apply suggestions from code review

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

Co-authored-by: Swiftrax <swiftrax@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2020-09-22 23:39:09 +01:00
umi 4bf5f9424e
[Docs] Japanese translation of docs/understanding_qmk.md (#10136)
* add understanding_qmk.md translation

* update based on comment

* update based on comment

* update based on comment

* update based on comment

* update based on comment
2020-09-22 14:54:33 -07:00
Max Drasbeck 2fbf68f2d2
[Keymap] Adding drasbeck keymaps for lily58pro and preonic (#10013)
* added danskish keymap

* Added readme.md

* Clean up in keymap.c

* Added license

* Changed name of keymap

* adjusting tapping term

* added encoder functionality

* housekeeping

* layouts resemble the layout now

* implemented suggestions from drashna

* added keymap for preonic rev3

* added default layer to readme.md

* removed backslashes

* Update keyboards/lily58/keymaps/drasbeck/keymap.c

* Update keyboards/preonic/keymaps/drasbeck/readme.md

* Update keyboards/lily58/keymaps/drasbeck/rules.mk

* Update keyboards/preonic/keymaps/drasbeck/keymap.c

* Update keyboards/preonic/keymaps/drasbeck/keymap.c

* Update keyboards/preonic/keymaps/drasbeck/keymap.c

* Update keyboards/preonic/keymaps/drasbeck/keymap.c

* Update keyboards/lily58/keymaps/drasbeck/rules.mk

* Update keyboards/lily58/keymaps/drasbeck/rules.mk

* Update keyboards/lily58/keymaps/drasbeck/rules.mk

* Update keyboards/preonic/keymaps/drasbeck/rules.mk
2020-09-22 14:42:55 -07:00
Brian Marsh 9c31a7adba
[Keymap] Add pezhore preonic keymap (#10269)
* Squashing commits - adding preonic keymap

This adds a custom keymap, including numpad layer, emoji, and kamoji
key mappings.

* Removing unnecessary trailing backslash characters

* removing the unnecessary json keymap

* removing unnecessary trailing slashes from the default keymap

* switching to tap_code

* Apply suggestions from code review

This should enable a toggleable numpad

* adding license

* Stripping out FN keycodes in favor of a momentary layer
2020-09-22 13:02:01 -07:00
Roman Bange 1ff51579ec
Add VIA support for YD60MQ (#10321)
* add via support for yd60mq

* switch to bootmagic lite, to decrease firmware size

* Update PRODUCT_ID comment

* add license header
2020-09-22 12:39:50 -07:00
2Moons-JP e52fc935b0
Add VIA Support for Basekeys Slice rev1 (#10385)
* Slice Via

* Keymap Update

* Update keyboards/basekeys/slice/rev1/keymaps/via/keymap.c
2020-09-22 12:28:54 -07:00
Dmitry Nosachev 539cc45fba
[Keyboard] Fujitsu T111 keyboard (#10262)
* Fujitsu T111 keyboard

* info.json: fixed missing key on top row

* info.json: fixed name and maintaner fields

* Update keyboards/handwired/t111/keymaps/oleg/keymap.c

* Update keyboards/handwired/t111/config.h

* Update keyboards/handwired/t111/keymaps/oleg/keymap.c

* Update keyboards/handwired/t111/keymaps/oleg/keymap.c

* Apply suggestions from code review

* Update keyboards/handwired/t111/readme.md
2020-09-22 12:26:19 -07:00
Ethan Nguyen 57dd756507
[Keymap] Add ethan605 keymap for kbd75 (#10343)
* Add my KBD75 keymaps

* Acknowledge PR reviews

* Acknowledge PR reviews
2020-09-22 11:47:03 -07:00
Seaton Jiang e3395beda0
[Keyboard] Add Longnald Corin Keyboard (#10280)
* [Keyboard] Add Longnald Corin

* feat: optimized firmware

* feat: optimized firmware

* fix: keyboards/longnald/corin/rules.mk

* feat: rename layout macros

* feat: rename layout macros

* feat: rename layout macros

* feat: rename layout macros

* feat: rename layout macros

* feat: rename layout macros

* feat: rename layout macros
2020-09-22 11:44:51 -07:00
Reibl János Dániel 7a3a57e457
Updates to handwired/riblee_f401 keymaps (#10376)
* Add new keymap with Hungarian accent support
Add flashing support

* Remove unnecessary mcu config

* Use bootmagic instead of custom macros
2020-09-22 11:39:07 -07:00
Peter Landoll 0fbb1e550a
Add description in Bluetooth docs for requiring NKRO to be disabled (#10359) 2020-09-22 22:31:37 +10:00
moyi4681 0976db7e5e
[Keyboard] add Bella soldered keyboard (#10381)
* Add bella soldered keyboard

* Create info.json

* Update keyboards/kbdfans/bella/soldered/rules.mk

* Update keyboards/kbdfans/bella/soldered/rules.mk

* Update keyboards/kbdfans/bella/soldered/rules.mk

* Update keyboards/kbdfans/bella/soldered/rules.mk

* Update keyboards/kbdfans/bella/soldered/info.json
2020-09-22 00:48:55 -07:00
Spaceman 207f0b00fa
[Keyboard] add Handwired/Curiosity (#10369)
* Add curiosity

* Add default keymap

* Update config.h

* Apply suggestions from code review

* Update keyboards/handwired/curiosity/rules.mk

* Update keymap.c

* Apply suggestions from code review
2020-09-22 00:33:39 -07:00
DonutCables 4a37af79e9
[Keyboard] Budget96 info cleanup and updates (#10268)
* Cleanup/updates to Budget96 info

* Add personal keymap

* Requested config.h update

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

* Requested rules.mk update

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

* Requested keymap.c update

* Requested config.h update

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

Co-authored-by: Ryan <fauxpark@gmail.com>
2020-09-21 23:44:23 -07:00
Croktopus e4a4ed3b0c
moved encoder code to timberwolf.c (#10317)
* moved encoder code to timberwolf.c

* Update keyboards/metamechs/timberwolf/timberwolf.c

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

Co-authored-by: Drashna Jaelre <drashna@live.com>
2020-09-21 22:54:55 -07:00
Sergey Vlasov 7ddae97c89
Fix backlight for F401/F411 blackpill onekey examples (#10320)
Fix configs to make the `handwired/onekey/blackpill_f401:backlight` and
`handwired/onekey/blackpill_f411:backlight` examples actually compile
and work:

 - Use `PWMD5` instead of `PWMD2` for backlight, which matches the
   default value of `BACKLIGHT_PAL_MODE` (AF02 for pin A0 is `TIM5_CH1`)
   and does not conflict with the default value of `STM32_ST_USE_TIMER`.

 - Enable `HAL_USE_PWM` in halconf.h and `STM32_PWM_USE_TIM5` in
   mcuconf.h, so that `PWMD5` could be used.
2020-09-21 22:50:39 -07:00
Rustam Zagirov ea0cf42eef
[Keymap] Add stamm layout for ergodox_ez (#10365)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2020-09-21 22:12:29 -07:00
dezli bfbcfbc83e
[Keyboard] Add miniMACRO5 Macropad (#10392)
* add miniMACRO5

add all nessecary files for the miniMACRO5

I have rewritten the readme, and changed the keymaps to be more simple. I have tested compiling, and everything works perfectly.

* update miniMACRO5 readme

add the make example into the readme file

* Update keyboards/minimacro5/config.h

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

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

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

* Update keyboards/minimacro5/keymaps/media/keymap.c

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

* Update keyboards/minimacro5/keymaps/media/keymap.c

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

* Update keyboards/minimacro5/minimacro5.c

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

* Update keyboards/minimacro5/info.json

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

* Apply suggestions from code review

applied all suggestions.

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

* drashna suggestions - enum rather than define

committed enum update by drashna

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

* update keymap.c

incorrect brackets

Co-authored-by: dezli <m@dez.li>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2020-09-21 22:03:03 -07:00
Ole Westendorff 967ed19d77
[keyboard] xd60: add split layout for ansi and iso (#10337) 2020-09-21 20:35:51 -07:00
Jonathan Rascher 342ab6ab80
Update bcat keymaps for crkbd and lily58(#10298)
* Swap ergo lower layer shortcuts for zoom keys
2020-09-21 20:32:56 -07:00
marksard 0b2eae7686
Fixed info.json file for treadstone48/rev2 (#10290)
* 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

* Fixed info.json file.
2020-09-21 19:16:43 -07:00
jotix 924823cfb4
update jotix ortho_4x12 keymap: add some missing keycodes (#10289) 2020-09-21 18:54:09 -07:00
codecoffeecode ccab502241
[Keymap] add codecoffeecode keymap for Preonic (#10364)
* Adding preonic layout

* deleting unnecessary files

* Fixing spacing

* I need to not commit things while I'm not sober

* Update keyboards/preonic/keymaps/codecoffeecode/keymap.c

* Update keyboards/preonic/keymaps/codecoffeecode/keymap.c

* Update keyboards/preonic/keymaps/codecoffeecode/keymap.c

* Adding license header
2020-09-21 18:41:36 -07:00
Fred Silberberg c23667608c
Add OLED driver function to determine if the screen is currently on (#10382) 2020-09-21 18:39:50 -07:00
Adam Gwilliam dc037f1391
update vendor id of 4x12 to match 3x4 and 5x12 for boardsource (#10306) 2020-09-21 17:57:00 -07:00
2Moons-JP b86fa3daf3
Copyright Updates for basekeys/slice (#10383)
* Copyright Updates

* Copyright Updates
2020-09-21 17:33:17 -07:00
Eric N. Vander Weele bc8fe91fd1
massdrop/alt: Remove unused user functions and config in default keymaps (#10313)
The default keymaps don't make use of the global `keymap_config` 
variable nor the `matrix_*_user()` functions.  Therefore, remove them to
avoid confusion for future keymap authors.
2020-09-21 17:29:04 -07:00