Commit Graph

13147 Commits

Author SHA1 Message Date
shela
3c7fc3c82e
[Docs] Update Japanese translation of feature_tap_dance.md. (#9808)
* Update Japanese translation of feature_tap_dance.md.

* fix original document version.

* Update docs/ja/feature_tap_dance.md
2020-07-30 22:31:34 -07:00
gadzkun
2ec2f80bfc
[Keyboard] Add otd_plus keyboard (#9726) 2020-07-30 21:23:06 -07:00
Ladniy
6ff08202a5
Add info.json for Jiran keyboard (#9857)
Co-authored-by: Joel Challis <git@zvecr.com>
2020-07-31 12:59:32 +10:00
shela
06cf6982bb
[Docs] Update Japanese translation of feature_ps2_mouse.md. (#9815) 2020-07-30 16:10:44 -07:00
shela
1ca7dcb0b2
[Docs] Update Japanese translation of feature_mouse_keys.md. (#9809)
* Update Japanese translation of feature_mouse_keys.md.

* fix original document version.

* Update docs/ja/feature_mouse_keys.md

* update based on comment
2020-07-30 15:22:22 -07:00
Klesh Wong
5d0c38794f
[Keyboard] Add new keyboard ks63 handwired (#9712)
* [feature] add ks63 split keyboard

* [bugfix] unable to compile and some rows are not working

* [feature] add info.json / update keymap

* [bugfix] keymap and fix slave not working issue

* [bugfix] keyboard unaviable on cold boot / unable to reset the board

* [misc] fine tune keymap

* [misc] fine tune keymap

* ...

* ...

* ...

* [misc] adjust brackets position

* [misc] add readme link

* [misc] comply to coding convention

* [misc] add default keymap readme file

* Update keyboards/handwired/ks63/README.md

* Update keyboards/handwired/ks63/ks63.h

* Update keyboards/handwired/ks63/keymaps/default/keymap.c

* Update keyboards/handwired/ks63/keymaps/default/keymap.c

* Update keyboards/handwired/ks63/keymaps/default/keymap.c

* Update keyboards/handwired/ks63/keymaps/default/keymap.c

* Update keyboards/handwired/ks63/keymaps/default/keymap.c

* Update keyboards/handwired/ks63/keymaps/default/keymap.c

* Update keyboards/handwired/ks63/rules.mk

* Update keyboards/handwired/ks63/README.md

* Update keyboards/handwired/ks63/keymaps/default/keymap.c

* [misc] to lowercase filename

* Update keyboards/handwired/ks63/rules.mk

* Update keyboards/handwired/ks63/rules.mk

* Update keyboards/handwired/ks63/config.h
2020-07-30 11:08:17 -07:00
NightlyBoards
83c12a516b
[keyboard] Add [n]2 support (#9862)
* Create Alter folder

* Revert "Create Alter folder"

This reverts commit 361103b821dbb22957b66cdedb0d11f996def71c.

* Add n2 keyboard

* Apply suggestions from code review

Edited config.h, keymap.c, readme.md, and rules.mk

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

* Update readme.md

Co-authored-by: Ryan <fauxpark@gmail.com>
2020-07-30 17:44:29 +01:00
Croktopus
08f31f664a
Timber Wolf - updated via keymap, reduced eeprom writing from backlight code (#9876)
Co-authored-by: Ryan <fauxpark@gmail.com>
2020-07-31 00:52:54 +10:00
shela
9758bcb28b
[Docs] Update Japanese translation of feature_macros.md. (#9767)
* Update Japanese translation of feature_macros.md.

* Update feature_macros.md

fix original document version.
2020-07-30 00:35:45 -07:00
tominabox1
4f7cd5699e
[Keyboard] Add KPRepublic BM40HSRGB keyboard (#9860)
* Initial Commit

* Add readme.md's

* Add license statements, cleaned up config, readme, and rules. Removed unused features from keymap and added ascii for Adjust layer

* Update keyboards/bm40hsrgb/info.json

* Update keyboards/bm40hsrgb/config.h
2020-07-29 20:25:20 -07:00
umi
bf05f773bd
[Docs] Japanese translation of docs/internals_gpio_control.md (#9751)
* add internals_gpio_control.md translation

* update based on comment

* update based on comment

* update based on comment
2020-07-29 19:44:23 -07:00
umi
de7da0b48f
[Docs] Japanese translation of docs/other_eclipse.md (#9755)
* add other_eclipse.md translation

* update based on comment

* update based on comment
2020-07-29 17:01:34 -07:00
Yu Hao Wong
b3e7a4e798
Added Via keymap to Spaceman 2% Milk (#9484)
* added via support to spaceman 2% milk

* changed kc trns in layers 1-3

* changed vendor and product ID per creator suggestion
2020-07-29 15:15:53 -07:00
kaylanm
0091897cc8
Add via configuration for adelheid. (#9830)
* Add via configuration for adelheid.

* Reformat adelheid VIA keymap.
2020-07-29 10:42:40 -07:00
Frothy
758bf20706
Added Via-enabled keymap for Physix (#9825)
* Added Via-enabled keymap for Physix

* Update keyboards/hineybush/physix/keymaps/via/keymap.c
2020-07-29 10:32:48 -07:00
umi
ea1c7f1856
[Docs] Japanese translation of docs/one_shot_keys.md (#9754)
* add one_shot_keys.md translation

* update based on comment

* update based on comment
2020-07-29 19:02:37 +09:00
umi
a57b313153
[Docs] Japanese translation of docs/mod_tap.md (#9753)
* add mod_tap.md translation

* update based on comment

* update based on comment
2020-07-29 19:01:42 +09:00
umi
7ff85e241b
[Docs] Japanese translation of docs/how_keyboards_work.md (#9683)
* add how_keyboards_work.md translation

* update based on comment

* update based on comment

* update based on comment
2020-07-29 19:00:26 +09:00
umi
7c7a2be4b0
[Docs] Japanese translation of docs/how_a_matrix_works.md (#9682)
* add how_a_matrix_works.md translation

* update based on comment

* update based on comment
2020-07-29 18:59:44 +09:00
chemicalwill
51dbca2332
[Keyboard] add bear_face/v2 (#9642)
* [keyboard] bear_face/v2 initial commit

* restructured keyboard dir for multiple versions
* fixed .json layouts for ISO
* reformatted hard tabs to soft tabs
* updated readmes

* [keyboard] removed top-level info.json, keymaps

* [bear_face/v2] changed matrix height, arrow key labels

* fixed height 6 instead of 5
* symbols for arrows now directions (i.e. "Left" etc.)

* [bear_face/v2] fixed ISO enter in .json

* corrected placement for ISO enter

* Update rules.mk

* DEFAULT_FOLDER = bear_face/v1

* [bear_face] fixed matrix width in info.json

* true matrix width is 15
* updated for v1 and v2 info.json

* Update keyboards/bear_face/config.h

* Update keyboards/bear_face/v1/info.json

* Update keyboards/bear_face/v2/info.json

* Update keyboards/bear_face/v2/info.json

* Update keyboards/bear_face/rules.mk

* Fixed default keymap tabs

* changed from tabs to spaces
2020-07-27 22:42:32 -07:00
Leivince John Marte
bcfb70a4cb
[Keyboard] PH Arisu (#9612)
* Port Arisu to QMK

* Update Change name to PH Arisu

* Update PH Arisu for PR

* Update Bootloader

* Using Pro Micro

* Update Manufacturer Name

* Clean rules.mk

* Update keyboards/ph_arisu/config.h

* Update keyboards/ph_arisu/config.h

* Update keyboards/ph_arisu/config.h

* Update keyboards/ph_arisu/config.h

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

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

* Update keyboards/ph_arisu/keymaps/via/keymap.c

* Update keyboards/ph_arisu/rules.mk

* https://github.com/qmk/qmk_firmware/pull/9612#discussion_r451659279 Update info.json using converter

* Fixed Clean endif

* LAYOUT not defined Error on Compile fix

* Fix implicit declaration of function 'LAYOUT'

* Update VIA keymap change KEYMAP to new LAYOUT method

* Update keyboards/ph_arisu/config.h

* Update Remove RGB_DI_PIN

* Update keyboards/ph_arisu/config.h

* Update keyboards/ph_arisu/readme.md

* Update keyboards/ph_arisu/readme.md

* Update keyboards/ph_arisu/ph_arisu.h

* Update keyboards/ph_arisu/ph_arisu.h

* Update keyboards/ph_arisu/keymaps/via/keymap.c

* Update keyboards/ph_arisu/readme.md

* Update keyboards/ph_arisu/config.h

* Add MO(1) on Keymaps

* Update info.json for QMK configurator support

* Add PH Arisu Image

* Use Smaller Size Image for Keyboard

* Change Image Host to Imgur

* Fix Imgur url

* Fix Imgur url

* Update Change Keyboard Maintainer

* Update Change Hardware Support to Pro Micro ATmega32U4

* Update keyboards/ph_arisu/config.h

* Update keyboards/ph_arisu/ph_arisu.h

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

* Update keyboards/ph_arisu/keymaps/via/keymap.c

* Update keyboards/ph_arisu/readme.md

* Update keyboards/ph_arisu/rules.mk

* Update Move ph_arisu to nightly_boards directory

* Update Readme make command

* Update keyboards/nightly_boards/ph_arisu/rules.mk
2020-07-27 22:39:31 -07:00
Croktopus
296f267f2b
Timber Wolf - updated keymaps, fixed info.json (#9787)
* updated keymaps, fixed info.json

* fixed info.json overlaps

* Update keyboards/metamechs/timberwolf/config.h
2020-07-27 19:35:59 -07:00
TerryMathews
14efd8aa41
[Keyboard] Initial support for TKC GodSpeed75 (#9723)
* Initial support for TKC GodSpeed75

* Correct compile error

* Update keyboards/tkc/godspeed75/rules.mk

* Update keyboards/tkc/godspeed75/readme.md

* Delete bootloader_defs.h

* Update keyboards/tkc/godspeed75/keymaps/via/keymap.c

* Update keyboards/tkc/godspeed75/readme.md

* Update keyboards/tkc/godspeed75/config.h

* Update keyboards/tkc/godspeed75/readme.md
2020-07-27 19:34:33 -07:00
AlisGraveNil
e999ade100
[Keyboard] Numeros macropad (#9725)
* First Push

* Update config.h

* Update numeros.c

* Update numeros.h

* Update rules.mk

* Update keyboards/clawsome/numeros/keymaps/default/keymap.c

* Update keyboards/clawsome/numeros/readme.md

* Update keyboards/clawsome/numeros/rules.mk

* Update keyboards/clawsome/numeros/info.json

* Update keyboards/clawsome/numeros/info.json

* Update keyboards/clawsome/numeros/rules.mk

* Update keyboards/clawsome/numeros/numeros.h

* Update keyboards/clawsome/numeros/info.json

* Update keyboards/clawsome/numeros/keymaps/default/keymap.c

* Update keyboards/clawsome/numeros/numeros.h

* Update keyboards/clawsome/numeros/keymaps/default/keymap.c

* Update keyboards/clawsome/numeros/numeros.c

* Update keyboards/clawsome/numeros/config.h

* Update keyboards/clawsome/numeros/rules.mk

* Update keyboards/clawsome/numeros/readme.md

* Update keyboards/clawsome/numeros/readme.md
2020-07-27 19:03:54 -07:00
Krishna Mani
f5fe6fe5cc
[Keyboard] Add akegata denki device one (#9690)
* add device one

* fix layouts

* add other layouts

* column fixes, device id changes

* layouts cleanup, add readme

* add info.json, fix readme

* add template readme

* add smaller image

* fix image links, address requested changes

* Apply suggestions from code review

* Update keyboards/device_one/keymaps/ansi_split_backspace/keymap.c

* add akegata vendor folder

* Apply suggestions from code review
2020-07-27 18:40:57 -07:00
Ladniy
84cd07b0d3
[Keyboard] Jiran keyboard (#9628)
* Add jirand folder from local catalog

* Add controller into readme

* Replace image of PCB

* Create rev2 folder for RGB version

* Rename keymap folder

* Add new rev for RGB light version

* Change some keycodes for RGB light

* Remove some unnecessary code

* Add via keymap

* Activate RBG light support

* Update some info

* Update layout image link

* Update keyboards/jiran/config.h

* Update keyboards/jiran/keymaps/via/config.h

* Update keyboards/jiran/keymaps/default/rules.mk

* Update keyboards/jiran/keymaps/default/readme.md

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

* Update keyboards/jiran/rev1/config.h

* Update keyboards/jiran/rev1/config.h

* Update keyboards/jiran/rules.mk

* Update keyboards/jiran/rules.mk

* Update keyboards/jiran/rules.mk

* Update keyboards/jiran/rev2/config.h

* Update keyboards/jiran/rev2/config.h

* Update keyboards/jiran/rules.mk

* Update keyboards/jiran/rev2/rev1.c

* Update keyboards/jiran/rules.mk

* Update keyboards/jiran/rules.mk

* Update keyboards/jiran/rules.mk

* Some fix

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

* Update keyboards/jiran/rev1/config.h

* Update keyboards/jiran/rev1/config.h

* Update keyboards/jiran/rev2/config.h

* Fix default keymap error

* Update keyboards/jiran/rules.mk

* Update keyboards/jiran/rev2/rules.mk

* Update keyboards/jiran/rev1/rules.mk

* Update keyboards/jiran/config.h

* Update keyboards/jiran/rev1/config.h

* Update keyboards/jiran/rev2/config.h

* Delete by request

* Update keyboards/jiran/config.h

* Update keyboards/jiran/keymaps/via/keymap.c

* Update keyboards/jiran/rules.mk

* Update keyboards/jiran/rules.mk

* Update keyboards/jiran/rules.mk

* Change some info by request

* Update keyboards/jiran/rev1/rev1.h

* Remove by request
2020-07-27 17:48:48 -07:00
tominabox1
6104609afa
QAZ Keyboard (#9714)
* Initial qaz commit

* Enable combos

* Improved default keymaps

* Fixed configurator json

* Via initial

* Corrected VIA json

* touch

* Via fixes

* Fixed via matrix

* Formatting

* Add lighting to qaz

* Add rgb animations, add rgb to l2, fix error in via json, enable rgblight by default

* Update QAZ readme

* Remove VIA json, prep for PR

* Correct default bootloader for pro-micro

* Remove accidentally added submodules

* Change names of layout macros

* Move combo defs to keymap folders, fix layout names in info.json

* Fixes transposition of comma and dot keys on default keymaps

* Update keyboards/qaz/keymaps/default/config.h

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/qaz/keymaps/default_big_space/config.h

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/qaz/rules.mk

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/qaz/readme.md

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/qaz/rules.mk

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2020-07-27 18:10:40 -04:00
Michael Stapelberg
5cbac94d08
[Keyboard] add support for the kinT kinesis keyboard controller (kint2pp variant) (#9687)
* branch keyboards/kinesis/kint2pp from keyboards/kinesis/stapelberg

Changes will be made in the next commit

* [Keyboard] update wiring for kinT (kint2pp variant)

* add QMK plumbing

* Apply zvecr’s suggestions from code review

* Update keyboards/kinesis/kint2pp/config.h

* Update keyboards/kinesis/kint2pp/config.h

* remove superfluous config.h include
2020-07-27 11:44:05 -07:00
Andrew Kannan
e937fc4513
Add Instant65 to QMK (#9804)
* Add Instant65 to QMK

* Fix via map

* Apply suggestions from code review

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

Co-authored-by: Ryan <fauxpark@gmail.com>
2020-07-27 14:29:09 -04:00
Andrew Kannan
b0e99c803d
Atlas Updates (#9343)
* Update atlas keyboard files and default keyboard layout

* Remove wierd LT things

* Update keyboards/cannonkeys/atlas/keymaps/via/keymap.c

Co-authored-by: Joel Challis <git@zvecr.com>

Co-authored-by: Joel Challis <git@zvecr.com>
2020-07-27 12:16:21 -04:00
umi
463c97f4c6
[Docs] Japanese translation of docs/feature_stenography.md (#9525)
* add feature_stenography.md translation

* update based on comment

* Update docs/ja/feature_stenography.md

Co-authored-by: shela <shelaf@users.noreply.github.com>

* Update docs/ja/feature_stenography.md

ご指摘ありがとうございます。
「速記プロトコル」で更新しました。

Co-authored-by: s-show <s1shimz@gmail.com>

Co-authored-by: shela <shelaf@users.noreply.github.com>
Co-authored-by: s-show <s1shimz@gmail.com>
2020-07-27 20:31:19 +09:00
Ryan
98f4cb4f87
Fix Squiggle info.json (#9841) 2020-07-27 12:22:14 +01:00
codecoffeecode
776b0bd2c9
[keymap] Adding personal keymap for Gingham (#9828) 2020-07-27 20:00:10 +10:00
Rys Sommefeldt
f0926f6c2a
[keymap] Update rys keymap with 5th semi-secure token and remap layer 1 (#9822) 2020-07-27 19:59:36 +10:00
kaylanm
245d355176
Add via keymap for kbdfans/kbdpad_mk2. (#9829) 2020-07-27 19:58:43 +10:00
Josh Hinnebusch
c3a9c8c177
update sm68 matrix, add via support (#9741)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: hineybush <hineybushkeyboards@gmail.com>
2020-07-27 19:57:57 +10:00
kakunpc
1ef5c639ce
Changed the VID/PID for choc_taro keyboards. (#9800) 2020-07-27 02:37:00 -07:00
CalciumNitride
d939f1041b
Fix Arabica37's default RGBLED NUM (#9797)
* adding arabica37

* jp_keymap

* update

* try refactor to use split_common

* fix and update to use split_common

* update and adjust

* clean up

* update

* update

* fix keymap.c

* update

* oled logo

* fix info.json

* remove pro_micro.h

* remove KC_ macro

* move font file

* fix led num
2020-07-27 02:15:49 -07:00
Dmitry Nosachev
dfa3017c92
[Keyboard] Add keyboard Zenith Z-150 (#9811)
* z150 black pill

* z150 docs

* z150: json layout

* Update keyboards/handwired/z150/keymaps/zyxx/keymap.c

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/handwired/z150/rules.mk

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/handwired/z150/rules.mk

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/handwired/z150/z150.c

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/handwired/z150/config.h

Co-authored-by: Joel Challis <git@zvecr.com>

* Delete bootloader_defs.h

Useless file

* Update keyboards/handwired/z150/readme.md

Co-authored-by: Joel Challis <git@zvecr.com>

Co-authored-by: Joel Challis <git@zvecr.com>
2020-07-26 22:44:50 +01:00
Salicylic-acid3
b49c5a562d
Added via support for 7sKB (#9799)
* Added via support for 7sKB

-Changing the VID
-Add a keymap via

* Update keyboards/7skb/keymaps/via/keymap.c

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/7skb/rev1/config.h

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

* Change of VID

I got a new VID and I'm changing the VID.

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2020-07-26 22:42:36 +01:00
John Helveston
688426b502
Adding keymaps for iris and kyria keyboards (#9783)
* updated iris and kyria keymaps

* added symbols I forgot to add to keymap

* Update keyboards/keebio/iris/keymaps/jhelvy/keymap.c

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

* condense code

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

* condense code

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

* made another small fix to a missing symbol in my iris keymap

Co-authored-by: Ryan <fauxpark@gmail.com>
2020-07-26 22:35:46 +01:00
Brandon Schlack
a6a13f9626
[Keyboard] Add Keybage folder for RadPad (#9745)
* [Keyboard] Initial Keybage/RadPad firmware

* [Keyboard] RadPad apply pull request feedback

- Change `LAYOUT_***_Encoders` to `LAYOUT_***_encoders` in <keyboard>.h
- Remove bootloader comments and unnecessary build options from rules.mk
- Use `LTO_ENABLE`
- Remove empty config.h from default keymap
- Remove trailing ` \` from keymap

* [Keyboard] RadPad fix info.json

- Change `LAYOUT_***_Encoders` to `LAYOUT_***_encoders` in info.json

* [Keyboard] Add host LED status to OLED display

* [Keyboard] Use LAYOUT_4x4_encoders, not LAYOUT

* [Keyboard] Use LAYOUT_4x4_encoders, not LAYOUT

* [Keyboard] Remove DESCRIPTION from config.h
2020-07-26 22:32:04 +01:00
Drashna Jaelre
d2be3a7339
Fix Variable Trace handling (#9831)
It wants a number, but a number of files have it set to "no", even
though it's commented out.  This means that if you set it to no, it
will cause a compiler error.  This sets the default to "no", and
checks to make sure it's not set to "no" before processing it, and
striping the value from it.
2020-07-26 21:57:37 +01:00
James Young
aaf58155c7
Remove HD44780 References, Part 1 (#9052)
* remove HD44780_ENABLE rules: 0-9, A-B

* remove HD44780_ENABLE config: 0-9, A-B
2020-07-27 06:11:16 +10:00
Valen Cheung
12946d0565
Keymap update - massdrop/ctrl/responsive_pattern (#8730)
* rewrite keyboards/massdrop/ctrl/keymaps/responsive_pattern/keymap.c in respopnse to the last update (#5328)

* remove print.h

* changed default parameters, modified readme
2020-07-26 09:45:35 +10:00
QMK Bot
95c742ec27 format code according to conventions [skip ci] 2020-07-25 22:33:55 +00:00
Joel Challis
d91987ab9a
Enable OLED support for Teensy 3.2/LC (#7591)
* I2C_TIMEOUT is not defined on arm teensy

* Work round teensy having different ChibiOS config options

* Stash OLED conf files

* update comment

* update comment

* Remove stm32 alias to allow teensy alt mode
2020-07-26 07:50:56 +10:00
RJ Bernau
db540e2832
Adding VIA support for Dactyl Manuform 5x7 (#9462)
* adding via support for Dactyl Manuform 5x7

* Changing Vendor ID from FEED to 444D (DM)

* Update keyboards/handwired/dactyl_manuform/4x6/config.h

Fixing typo in Dactyl Manuform 4x6 Product Id

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/handwired/dactyl_manuform/4x5/config.h

Fixing typo in Dactyl Manuform 4x5 Product Id

Co-authored-by: Joel Challis <git@zvecr.com>

Co-authored-by: Roland Bernau <roland@bernau.dev>
Co-authored-by: Joel Challis <git@zvecr.com>
2020-07-25 22:36:39 +01:00
Yoonbae Cho
a0b10593df
Keymap for keebio/iris rev.4 supporting VIA (#9749)
* Create keymap.c

* Create config.h

* Update first revision

* Enhance keymap

* Enhance keymap

* Update keymap

* Make Via compatable

* Support mouse key

* Apply reviewer's change requests

* Adjust mouse factors

* Update config.h
2020-07-25 09:44:45 -07:00
Ingar Almklov
65f4b94cda
Pinky4: add via support (#9711)
* Pinky4: add via support

* Pinky4/via: simplify rules.mk

* Pinky4/via: use built-in for KC_TRANS, enum for layer
_names

* Pinky4/via: remove redundant rules

* Pinky4/via: remove unnecessary slashes

* Pinky4/via: don't override default bootloader
2020-07-25 09:42:50 -07:00