Commit graph

68 commits

Author SHA1 Message Date
Mark Stosberg
48cc61b188 Update msiu's xd75 keymap README to be accurate (#6443) 2019-07-30 23:59:46 +01:00
Boy_314
28539fd67f [Keymap] Create Boy_314's Canoe layout, small update on xd75 layout (#6060)
* create canoe layout, update caps lock on xd75 layout

* added readme

* fixed copyright comments
2019-06-03 12:01:49 -07:00
Markus Weimar
5ed7d9c9ca Update XD75 keymap by markus (#5651) 2019-04-19 07:27:23 -07:00
David Rambo
b23752c840 [Keymap] Minor update to my XD75 keymap (#5531)
* Updated iris, planck, and xd75 keymaps

* Added brightness down and up to commented layout of Symbol layer.

* updated config files for planck and iris

* removed unnecessary include lines from iris and planck config files

* updated XD75's PC layer and its NAVPC toggle layer

* fixed typo in alias declaration for C_BSPS

* changed alias names for BSPC toggle keys
2019-04-02 11:50:22 -07:00
David Rambo
4f7dd9edf8 [Keymap] Updated my iris, planck, and xd75 keymaps (#5515)
* Updated iris, planck, and xd75 keymaps

* Added brightness down and up to commented layout of Symbol layer.

* updated config files for planck and iris

* removed unnecessary include lines from iris and planck config files
2019-03-30 11:05:31 -07:00
martinmksiu
795c2c27b9 [Keymap] adding keymaps (#3583)
* add key map

* QWERTY with 40% layers

* updated line 21

updated line 21 from "#include "xd75.h" to "#include QMK_KEYBOARD_H" as requested

* upload contra folders

* Update .directory

* Update config.h

* Update config.h

* Update keymap.c

* Update config.h

* Update rules.mk

* Update keyboards/contra/keymaps/martin_bac/config.h

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

* Update keyboards/xd75/keymaps/martin_cennum/config.h

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

* Delete .directory

* upload

* Delete rules.mk

* Update keyboards/contra/keymaps/msiu/config.h

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

* Update keyboards/katana60/keymaps/msiu/config.h

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

* Update keyboards/katana60/keymaps/msiu/config.h

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

* Update keyboards/katana60/keymaps/msiu/config.h

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

* Update keyboards/katana60/keymaps/msiu/config.h

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

* Delete nano.save

* Delete rules.mk

* Update keymap.c

* Update keymap.c

* Update config.h

* Update keyboards/lets_split_eh/keymaps/msiu/keymap.c

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

* Update keyboards/lets_split_eh/keymaps/msiu/keymap.c

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

* Update keymap.c

* Update keyboards/planck/keymaps/msiu/config.h

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

* Apply suggestions from code review

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

* Update keymap.c

* Update readme.md

* Update keymap.c
2019-03-26 20:22:56 -07:00
noroadsleft
e30c993d75 [Keyboard] XD75 refactor (#5420)
* Refactor layout macro names

Update the names of the layout macros to reflect QMK's desired usage.

- KEYMAP renamed to LAYOUT
  - colinta keymap updated accordingly
- KC_KEYMAP renamed to LAYOUT_kc
  - mtdjr keymap updated accordingly

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

* Update keymaps to use QMK_KEYBOARD_H

* Refactor default keymap

- updated to use layout macro
- remove deprecated action_get_macro function
- add functions from QMK keymap.c template
  - process_record_user
  - matrix_init_user
  - matrix_scan_user
  - led_set_user

* Update supporting files

- updated config.h files to use #pragma once include guard
- remove errant QUANTUM_DIR code block

* Rename readme files to fully lowercase filenames

* Restructure keyboard readme

Updated the readme to better align with the current QMK template.

* Bugfixes to supporting files
2019-03-17 10:04:50 -07:00
Christopher Browne
dbfbe0d7f0 Adopted LAYOUT, added some keys (#5320)
* Add HOME/END keys as upper/lower on arrow-up/down

* Reduce .hex file size by turning off unneeded options

* Put digit keypad onto left hand upon RAISE; this will sometimes be preferable to double-hits of right hand

* Latest super latest version merge

* cbbrowne keymap for XD75re

* starting notes on XD75re keymap plans

* First draft of bottom row of QWERTY

* Switch my special bottom line over to QCENT

* Dunno

* Filling in wanted keys, bit by bit...

* Add copyright, extra macro

* Clean up comments, remove some experimental code I didn't like

* TODO plans for xd75re

* clean up keyboard layout

* QCENT2 is my new experiment for the main keyboard...

* Add a few more main layer keys, and modify LOWER to shift things outwards to conform with main layer

* Clean up RAISE layer to conform with main layer, remove QCENT layer as QCENT2 is the new thing

* More xd75 changes, now that I actually have it in hand

* shift keymap around, as original attempt was a bit too aggressive in keeping to the edges

* more revs to XD75

* Dropping parts of the centre keypad in favor of Keys I Really Need

* Improve documentation to conform with how builds are done now

* Improve documentation to conform with how builds are done now

* Add cbbrowne rules file as alternative to having the rules in Makefile

* Makefile not needed anymore for individual keymap

* Some revs to my keymapping

* Add {}

* Add PGUP/PGDN

* Shifted some middle-range keys around

* Needed Tilde, Backquote, and to shift RESET onto FUNCTION layer

* Wanted ~

* cbbrowne hasn't anything to do with hadron keymaps

* trim unneeded bits

* I prefer OrgMode for my notes

* Have a right-alt

* Layer keys make LED colors change

* Add sample user rules for cbbrowne

* Add source of xd75 rules

* Individualized xd75 rules

* Adopt LAYOUT to genericize the layout as an ortholinear 5x15 keyboard
2019-03-05 12:22:51 -08:00
Konstantin Đorđević
5cb713148d Change Command keycode defaults to match corresponding Bootmagic codes (#5078)
* Change Command keycode defaults to match corresponding Bootmagic codes

* Make alternate magic key keycodes consistent

* Reflect changes from previous commit in tmk_core/common/command.c

* Remove unnecessary MAGIC_KEY_* definitions from keymaps compatible with these changes

* Swap E and BSPACE for MAGIC_KEY_EEPROM

* Add MAGIC_KEY_EEPROM_CLEAR instead of MAGIC_KEY_EEPROM_ALT

* Remove BOOTMAGIC_ENABLE checks around EECONFIG stuff

* Update Command descriptions
2019-02-17 22:23:32 -08:00
fauxpark
3b2a484a5b Remove redundant KC_TRNS and KC_NO fillers in remaining keymaps (#5154) 2019-02-17 07:38:46 -08:00
Boy_314
8f6285d3b3 [Keyboard] 40percent.club's Half 'n' half keyboard port (#5005)
* fixed arrow keys and left control

* added right shift

* latest version

* reverted arrow keys

* edited readme

* added osu layer

* updated osu layout

* updated osu layout

* added full arrow keys to osu layout

* in case i mess up creating macros

* added the best meme key in the world

* added plover steno layer

* updated boy314 layout

* removed unused layers

* added boy314 xd75 layout, inspired by preonic layout

* added boy314 xd75 layout, inspired by preonic layout

* version 2 of boy314's xd75 layout

* added readme notes

* updated readme for boy314 xd75 layout

* qwerty support, brackets on bottom row, caps lock underglow

* fixed readme/

* small changes to allow merging

* minor changes to format

* fixed up default readme

* added numpad and tweaked bottom row

* updated xd75 and preonic rev3 keymaps

* added initial half n half files

* fixed .h file

* updated names

* fixed layout in halfnhalf.h

* fixed manu name, changed bootloader in rules.mk

* removed redundancies in preonic and xd75 layouts

* readme updated
2019-01-30 18:14:27 -08:00
Kenny Hung
fa583e9c60 Add cursor keys to top layer (#4876) 2019-01-18 07:30:41 -08:00
fauxpark
67adc29aa3 Remove empty fn_actions[] 2019-01-11 18:32:43 -08:00
noroadsleft
7f4f0f7685 Remove deprecated QUANTUM_DIR code blocks from makefiles (#4754)
* Remove QUANTUM_DIR code blocks from keyboard rules

This commit removes the deprecated "QUANTUM_DIR" code block from
rules.mk files that affect entire keyboards.

* remove QUANTUM_DIR code blocks from rules for default keymaps

This commit removes the deprecated "QUANTUM_DIR" code block from
rules.mk files that affect default keymaps.

* remove QUANTUM_DIR code blocks from rules for user keymaps

This commit removes the deprecated "QUANTUM_DIR" code block from
rules.mk files that affect "user" keymaps. (It's actually any keymap
that isn't named `default`.)

* remove QUANTUM_DIR code blocks from rules for community layouts

This commit removes the deprecated "QUANTUM_DIR" code block from
rules.mk files for community layouts.

* remove QUANTUM_DIR code blocks from rules for userspaces

This commit removes the deprecated "QUANTUM_DIR" code block from
rules.mk files for userspaces.
2019-01-04 07:25:48 -08:00
Konstantin Đorđević
e76bf17d36 Remove redundant, language-specific aliases for KC_ALGR (#4720)
* Use standard KC_ALGR, remove language-specific redefinitions

* Use ALGR instead of ALTGR in BÉPO and Canadian multilingual keymaps

* Remove BE_LALT, BE_LGUI aliases
2019-01-03 08:13:55 -08:00
Konstantin Đorđević
28fbf84cc5 Add standard definitions for ALGR and KC_ALGR (#4389)
* Add standard ALGR defition, remove (re)definitions from language files

* Use ALGR(kc) consistently in ALTGR(kc) aliases

* Non-Nordic keymaps should not use NO_ALGR

* Add standard KC_ALGR definition

* Update docs with ALGR and KC_ALGR

* Update SS_ALGR and ALGR_T aliases
2018-12-12 10:17:19 -08:00
jtcarrasco
04de0533b8 Keymap: Jtcarrasco (#4513)
* my XD75 builds for idobo and XD75

these are my xd75 layouts for the 2 versions of the board

* clearing of free space

spring cleaning

* additional cleaning

more spring cleaning

* removed lighting commands

don't need lighting on the idobo board so removal of such commands to keep the sizing down

* update for readme.md

* Update config.h

* commiting with keymap erros on idobo for review

* syntax fix for idobo and xd75 revok75, addition of del key switch on fn layer

* config edit to config user and keymap QMK_KEYBOARD_H

* update to vol controls for both idobo and xd75 for revok75 keymap

* filename changes
2018-12-05 15:13:31 -08:00
Konstantin Đorđević
1904319745 Remove RGB_SMOD alias and replace uses with RGB_MOD (#4319) 2018-11-27 15:34:06 -08:00
Boy_314
d9453a93f3 Updating Boy_314's XD75 Layout (#4440)
* fixed arrow keys and left control

* added right shift

* latest version

* reverted arrow keys

* edited readme

* added osu layer

* updated osu layout

* updated osu layout

* added full arrow keys to osu layout

* in case i mess up creating macros

* added the best meme key in the world

* added plover steno layer

* updated boy314 layout

* removed unused layers

* added boy314 xd75 layout, inspired by preonic layout

* added boy314 xd75 layout, inspired by preonic layout

* version 2 of boy314's xd75 layout

* added readme notes

* updated readme for boy314 xd75 layout

* qwerty support, brackets on bottom row, caps lock underglow

* fixed readme/

* small changes to allow merging

* minor changes to format

* fixed up default readme

* added numpad and tweaked bottom row
2018-11-16 14:47:06 -08:00
Konstantin Đorđević
945dd946ab Fix misspelled make option, format rules.mk files (#4382) 2018-11-07 09:29:57 -08:00
Danilo Vulicevic
a30dd2bb17 Add xd75/billypython keymap (#4381)
* Add xd75/billypython keymap

* Expand rules.mk

(cherry picked from commit 806fee94ae3a21b6ca7a34624101349b57d41b75)

* Expand billypython's rules.mk

* Remove unused stuff in whitefox/billypython
2018-11-06 17:04:02 -08:00
Drashna Jaelre
00b6f14821 Replace outdated RGB/Audio information 2018-10-22 14:55:05 -04:00
Kenny Hung
533f684887 Keymap: Move navigation buttons closer to the middle on XD75:skewwhiffy (#4118)
* RGB toggle button

* Remove custom lighting effects

* Fix small bug in Symbols layer

* Ignore mod tap interrupt in XD75 for skewwhiffy, and split layers into two for more flexibility and fix persistent layer issue

* Replace shift in nav layer with IntelliJ omnibox shortcut to avoid a sticky shift

* Remove custom setting in config, because it were annoying, it were.

* Move navigation buttons in one key

* Some review markups

* Use enums for layers

* Use LAYOUT_ortho_5x15

* Revert some capitalization changes made by accident
2018-10-13 13:46:46 -07:00
Bramver
66b793730e Keymap: Personal XD75 keymap added. (#4045)
* Personal XD75 keymap added.

Nothing fancy, has emojisupport.

* Converted to spaces to follow guidelines

* Fixed requested changes.

Replacing include guards with pragma once.
Omitting unnecessary lines.
PR #4045
2018-10-02 13:06:31 -07:00
Jarred Steenvoorden
5c2ac733af Keymap: Adding my DZ60, Satan, XD75 kemaps and updates to userspace (#4039)
* Update userspace with common config.h

* Add my dz60, satan and xd75 keyboard keymaps

* Fixing executable bits changed during last upstream merge

* Cleanup unnecessary files and defines

* Remove unnecessary defines from userspace config
2018-10-02 08:14:37 -07:00
Joe Wasson
743449472e Make PREVENT_STUCK_MODIFIERS the default (#3107)
* Remove chording as it is not documented, not used, and needs work.

* Make Leader Key an optional feature.

* Switch from `PREVENT_STUCK_MODIFIERS` to `STRICT_LAYER_RELEASE`

* Remove `#define PREVENT_STUCK_MODIFIERS` from keymaps.
2018-09-17 13:48:02 -04:00
Boy_314
661ca4440c Keymap: Boy_314's Preonic and XD75 Layouts (#3781)
* fixed arrow keys and left control

* added right shift

* latest version

* reverted arrow keys

* edited readme

* added osu layer

* updated osu layout

* updated osu layout

* added full arrow keys to osu layout

* in case i mess up creating macros

* added the best meme key in the world

* added plover steno layer

* updated boy314 layout

* removed unused layers

* added boy314 xd75 layout, inspired by preonic layout

* added boy314 xd75 layout, inspired by preonic layout

* version 2 of boy314's xd75 layout

* added readme notes

* updated readme for boy314 xd75 layout

* qwerty support, brackets on bottom row, caps lock underglow

* fixed readme/

* small changes to allow merging

* minor changes to format

* fixed up default readme
2018-08-28 18:17:52 -07:00
ArpinFidel
0346bc2c5b Keymap: XD75 keymap (#3553)
* cloned colinta as base

* switched to default base. started customising

* minor changes to layout

* added mouse keys

* minor tweaks to layout and mouse speed

* updated readme

* tweaked layout

- added middle fn keys
- moved rgb controls to fn layer middle
- added special keys to fn layer right

* moved scroll buttons as to not interfere with lshift

* turned on backlight

* fixed backlight

* changed user keycodes to differentiate

* changed folder name to lowercase

* updated readme

* stop processing after custom keycode

* edits to suit new standards

* added layer indicator using gp100 and gp103
2018-08-05 08:55:17 -07:00
Kenny Hung
6c20c6219c Keymap: Refactor symbols layer with layer tap workaround (#3520)
* Squash layout to fit on Planck

* Replace AST with PAST keycode so that it works with layer tap

* Review markups
2018-08-02 13:47:06 -07:00
Brosseau Valentin
bcc1a7ca30 Keymap: Change the bepo layout for only 1U keys (#3514) 2018-07-29 09:07:16 -07:00
lebastaq
b5d9bee969 Keymap: Add software development oriented bepo layout to xd75 (#3451)
* added special keys

* formatting

* disabled autoshift

* updated readme to follow guidelines

* changed copyright

* minor fixes

* added changes requested

* update traditional bepo layout
2018-07-23 11:43:13 -07:00
Batuhan Baserdem
738a9fc16c Userspace update for user bbaserdem (#3443)
* Put in my keymaps

* Fixed all but weird lets split issue

* Organized and tried to trobleshoot lets split

* Organized and tried to trobleshoot lets split

* Added bbaserdem keymaps

* Added bbaserdem keymaps

* Fixed stuff

* FIxed a filename error

* Lets split eh

* Finalized things regarding keymap
2018-07-18 20:17:55 -07:00
zerovectorspace
08c1997db1 Add Dynamic Macro Toggle using Tap Dance keymap to xd75 (#3297)
* Add Dynamic Macro Toggle using Tap Dance

One Tap    -> Play Macro 1
Two Taps   -> Stop Recording
Three Taps -> Start Recording Macro 1

* Move feature from default to dyn_macro_tap_dance

* Convert 4 space tabs to 2 space tabs

Follows qmk style guidelines
2018-07-03 12:13:49 -07:00
Markus Weimar
1230ecb73d Add XD75 keymap (#3263) 2018-06-29 15:05:05 -07:00
mtdjr
e8eaf5630c Updates to mtdjr userspace and keymaps (#3206)
* slight tweaks to xd75 keymap

* update to config.h to remove undef of solenoid active

* code organization for userspace

* updates to userspace and keymaps

* add rgb to userspace and lets split

* add conditional around rgb functions in userpsace

* move rgb layer changes into layer_state_set_user
2018-06-20 15:13:00 -07:00
Kenny Hung
e59bfd3359 Some lightshow code for XD75. (#3203)
* Add shift key to navigation layer to save pinky when double tapping shift key in IntelliJ

* Fancy effects on the lights
2018-06-19 13:04:13 -07:00
Batuhan Baserdem
8eaf23ae81 User space fixed (#3095)
* Put in my keymaps

* Fixed all but weird lets split issue

* Organized and tried to trobleshoot lets split

* Organized and tried to trobleshoot lets split

* Added bbaserdem keymaps

* Added bbaserdem keymaps

* Fixed stuff

* FIxed a filename error
2018-05-31 18:55:45 -07:00
mtdjr
ee9a7aba39 add not-so-minidox handwire keyboard (#3061)
* add not-so-minidox handwire keyboard

* corrected keymap

* multiple adjustments to not_so_minidox keyboard

* remove I2C master left define

* update default layer set function

* move solenoid code into userspace

* minor adjustments to config.h

* update keymaps to utilize userspace

* move features and config to userspace, correct build issue

* correct solenoid pin

* adjust defaults for solenoid pin and enable

* default solenoid to on for not_so_minidox

* disable RGBLIGHT_SLEEP for xd75

* tweaking solenoid enable/disable in userspace and keymaps
2018-05-31 08:30:05 -07:00
mtdjr
504ce1b4bc Add mtdjr keymaps for Iris, Let's Split, TADA68, XD75, and handwired dox (#3058)
* Add keymaps for Iris, Let's Split, TADA68, XD75, and handwired not_so_minidox

* remove handwired not_so_minidox
2018-05-26 11:06:08 -07:00
Lawrence Ng
7f35a62902 Fix/update XD75 default layout (#2963)
Fix layout to match current official default layout: http://www.keyboard-layout-editor.com/#/gists/ac341208e023e4a4d982bccf711ae38f

Also add LED controls on FN layer
2018-05-14 06:59:31 -07:00
tdl-jturner
ec7223d9f0 Added new layout to XD75. See Readme for details (#2871)
* Clean commit of xd75 layout. See Readme for details

* Corrected header

* Switched to HSV and added init
2018-05-01 12:29:49 -07:00
David Rambo
2286cedb70 Update personal colemak Iris layout and deleted redundant folders (#2794)
* DRambo Planck keymap in Colemak

* DRambo Planck keymap in Colemak

* Satan GH60 keymap for Bri

QWERTY layout with Navigation layer toggled with "Caps Lock" key.

* xd75 keymap in Colemak for Mac and Win

* DRambo Planck keymap in Colemak

* Satan GH60 keymap for Bri

QWERTY layout with Navigation layer toggled with "Caps Lock" key.

* xd75 keymap in Colemak for Mac and Win

* Added Iris Colemak layout for Mac, Windows, and Gaming.

* changed comment text

* DRambo Planck keymap in Colemak

* Satan GH60 keymap for Bri

QWERTY layout with Navigation layer toggled with "Caps Lock" key.

* xd75 keymap in Colemak for Mac and Win

* Added Iris Colemak layout for Mac, Windows, and Gaming.

* changed comment text

* Added Iris keymap from DavidRambo

* Added planck keymap from DavidRambo

* Added xd75 keymap from DavidRambo

* Added readme

* Deleted redundant repos in Iris, Planck, and XD75 keymaps.

* Tweaked XD75 keymap

* DRambo Planck keymap in Colemak

* Tweaked XD75 keymap

* Merge branch 'master' of https://github.com/DavidRambo/qmk_firmware

Removed redundant repos with "Rambo" title.

* changed iris nav layers

* changed nav layers for xd75

* Updated Iris, tweaked nav on xd75
2018-04-24 09:03:02 -07:00
youdroid
5d36118eaa Add French Layout for XD75 (#2681) 2018-04-15 09:50:46 -07:00
David Rambo
32fd5e4f61 keymaps for Iris, Planck, Satan, and XD75 (#2747)
* DRambo Planck keymap in Colemak

* DRambo Planck keymap in Colemak

* Satan GH60 keymap for Bri

QWERTY layout with Navigation layer toggled with "Caps Lock" key.

* xd75 keymap in Colemak for Mac and Win

* DRambo Planck keymap in Colemak

* Satan GH60 keymap for Bri

QWERTY layout with Navigation layer toggled with "Caps Lock" key.

* xd75 keymap in Colemak for Mac and Win

* Added Iris Colemak layout for Mac, Windows, and Gaming.

* changed comment text

* DRambo Planck keymap in Colemak

* Satan GH60 keymap for Bri

QWERTY layout with Navigation layer toggled with "Caps Lock" key.

* xd75 keymap in Colemak for Mac and Win

* Added Iris Colemak layout for Mac, Windows, and Gaming.

* changed comment text

* Added Iris keymap from DavidRambo

* Added planck keymap from DavidRambo

* Added xd75 keymap from DavidRambo

* Added readme
2018-04-15 09:46:26 -07:00
Kenny Hung
bb5c98699f Duplicate KC space to UK (#2541)
* Fix tilde in xd75 skewwhiffy

* Small tidy up

* Tidy up Colemak row

* Tidy up navigation layer

* Symbols layer redefined

* Fix UK Quote issue

* Use UK_QUOT rather than KC_QUOT
2018-03-16 16:39:51 -04:00
adiron
04d72590af New keymap for XD75re ("adi") (#2530)
* My XD75 keymap

* Proper readme for `adi` keymap for xd75re
2018-03-16 16:36:41 -04:00
hypnocrat
400f410c45 XD75 keymap - Germanized (#2441)
* Added a heavily customized German keymap to the XD75RE

* A heavily customized alternative layout for the XD75, for German users

* Fixed capitalization, removed unnecessary files

* Hopefully fixed capitalization, some keymap changes
2018-03-09 13:32:03 -05:00
Kenny Hung
586aa15cef A small tidy up (#2490)
* Add extra RGUI key to make keyboard more MAC friendly

* Remove enumerators for no longer used layers in layout Skewwhiffy for XD75

* Make layer numbers even better
2018-03-07 16:56:31 -05:00
Brosseau Valentin
3cf752f83f Xd75 : Bépo layout for the XD75 (#2166)
* Add xd75 layout

* Add Readme

* Update layout

* Remove Backlight keys

* Move ENTER / BACKSP / DEL

* Commit my bepo layout instead of the qwerty version since i will not use it

* Use 0 instead of 00

* Fix TODO key

* Update the readme

* Replace wrong key placment

* Update center column

* Update the layout with 2-u key

* Adjust the fn layer

* Adjust the main layer

* Adjust the fn layer
2018-02-02 01:00:39 -05:00
Koen Klinkers
38ab86e8f2 updated xd75 layout (#2321)
* plank layout

* ergodone

* x75

* readmes

* added rgb controls

* bslash

* added backlighting based on layer/modifier

* changed colors
2018-02-01 23:08:39 -05:00