Commit graph

25747 commits

Author SHA1 Message Date
Constantine Karos
1fbd45a594
Add missing gpio and chibios defs to uart.h (#22033) 2023-09-17 13:18:26 +01:00
Joel Challis
39fafdac0f
Move Digitizer to "Software Features" (#22031) 2023-09-17 08:11:32 +01:00
James Young
4162d1f056
Sho Studios ARC Layout Addition (#22037)
* Add layout/matrix diagram

[docs]

* Format `info.json`

Apply four-space indent.

[style]

* Add `LAYOUT_ansi_split_bs`

[enhancement]
2023-09-16 14:19:09 -07:00
James Young
6b1b746f66
RuckerMachine RM Fullsize Layout Additions (#22036)
* Add layout/matrix diagram

[docs]

* Rename `LAYOUT` to `LAYOUT_all`

[refactor]

* Add `LAYOUT_fullsize_108_ansi`

[enhancement]

* Add `LAYOUT_fullsize_108_ansi_tsangan`

[enhancement]
2023-09-16 13:41:40 -07:00
James Young
71d5d14c13
Rico Phoenix Project No. 1 Layout Additions (#22035)
* Add layout/matrix diagram

[docs]

* Rename `LAYOUT` to `LAYOUT_all`

[refactor]

* Add `LAYOUT_65_ansi_rwkl_split_bs`

[enhancement]

* Add `LAYOUT_65_ansi_rwkl`

[enhancement]

* Add `LAYOUT_65_ansi_wkl_split_bs`

[enhancement]

* Add `LAYOUT_65_ansi_wkl`

[enhancement]

* Add `LAYOUT_65_iso_rwkl_split_bs`

[enhancement]

* Add `LAYOUT_65_iso_rwkl`

[enhancement]

* Add `LAYOUT_65_iso_wkl_split_bs`

[enhancement]

* Add `LAYOUT_65_iso_wkl`

[enhancement]
2023-09-15 16:39:34 -07:00
James Young
4767554562
Raindrop Layout Updates (#22032)
* Add layout/matrix diagram

[docs]

* Rename `LAYOUT_all` to `LAYOUT_64_ansi_split_bs`

[refactor]

* Add `LAYOUT_60_ansi_split_bs_rshift`

[enhancement]
2023-09-15 15:25:52 -07:00
TreasureTypes
d83ac7a124
[Keyboard] Adding Treasure TYPE-9 series III (#21748)
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-09-15 14:44:41 -07:00
ziptyze
29d1a2cc51
[Keyboard] add 1upkeyboards 1upslider8 (#21546)
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-09-15 11:56:41 -07:00
harveysch
e7ae5ec07c
[Keyboard] Add splitkb.com's Aurora Helix (#21871)
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-09-15 11:34:21 -07:00
James Young
49f1cbd40e
Neson Design Nico Layout Additions (#22027)
* Add layout/matrix diagram

[docs]

* Rename `LAYOUT` to `LAYOUT_65_xt_ansi_blocker_split_bs`

[refactor]

* Add `LAYOUT_65_xt_ansi_blocker`

[enhancement]

* Add `LAYOUT_65_xt_ansi_blocker_tsangan`

[enhancement]

* Add `LAYOUT_65_xt_ansi_blocker_tsangan_split_bs`

[enhancement]

* Touch-up keymaps

- grid-align keycodes
- use four-space indent
- use QMK-native keycode aliases

[refactor]

* Update `via` keymap

Update the `via` keymaps to have the same key assignments as the
`default` keymap, which is more fleshed out.

[chore]
2023-09-15 00:47:10 -07:00
James Young
06dfa1cafc
Nix Studio Lilith Layout Additions (#22028)
* Add layout/matrix diagram

[docs]

* Sort keys in `info.json`

[style]

* Add `LAYOUT_65_ansi_blocker_split_bs`

[enhancement]

* Add `LAYOUT_65_ansi_blocker_tsangan`

[enhancement]

* Add `LAYOUT_65_iso_blocker_split_bs`

[enhancement]

* Add `LAYOUT_65_iso_blocker_tsangan_split_bs`

[enhancement]

* Extend Community Layout support

[enhancement]
2023-09-14 23:18:28 -07:00
James Young
598303fa95
OwLab Jelly Evolv Solder Layout Additions (#22029)
* Add layout/matrix diagram

[docs]

* Friendly-format `info.json`

[style]

* Rename `LAYOUT` to `LAYOUT_all`

[refactor]

* Add `LAYOUT_ansi_blocker`

[enhancement]

* Add `LAYOUT_ansi_blocker_split_bs`

[enhancement]

* Add `LAYOUT_ansi_blocker_tsangan_split_bs`

[enhancement]

* Add `LAYOUT_ansi_blocker_tsangan`

[enhancement]

* Add `LAYOUT_iso_blocker`

[enhancement]

* Add `LAYOUT_iso_blocker_split_bs`

[enhancement]

* Add `LAYOUT_iso_blocker_tsangan_split_bs`

[enhancement]

* Add `LAYOUT_iso_blocker_tsangan`

[enhancement]
2023-09-14 18:07:48 -07:00
James Young
3d86b92511
QVEX Tech Lynepad2 Layout Update (#22030)
* Add layout/matrix diagram

[docs]

* Update layout data

Update layout data to disambiguate the key/joystick/thumbpad functions
in Configurator.

[chore]
2023-09-14 23:47:03 +01:00
Andrew Kannan
46d679ab11
qmk format-json: Add an in-place mode to format json command (#21610) 2023-09-14 21:38:42 +01:00
James Young
4f26a8b308
MonsGeek M1: Correct layout data (#22026)
Apply vertical offset to the arrow keys.

[chore]
2023-09-14 21:37:24 +01:00
James Young
58c2dae32e
Mode M256-WH Community Layout Support (#22019)
* Add layout/matrix diagram

[docs]

* Rename `LAYOUT` to `LAYOUT_65_ansi_blocker`

[refactor]

* Add `LAYOUT_65_ansi_blocker_tsangan`

[enhancement]

* Enable Community Layout support

[enhancement]
2023-09-14 12:44:07 -07:00
James Young
294fc6caef
Mode M256-WS Community Layout Support (#22020)
* Add layout/matrix diagram

[docs]

* Rename `LAYOUT` to `LAYOUT_all`

[refactor]

* Add `LAYOUT_65_ansi_blocker_split_bs`

[enhancement]

* Add `LAYOUT_65_ansi_blocker`

[enhancement]

* Add `LAYOUT_65_ansi_blocker_tsangan_split_bs`

[enhancement]

* Add `LAYOUT_65_ansi_blocker_tsangan`

[enhancement]

* Add `LAYOUT_65_iso_blocker_split_bs`

[enhancement]

* Add `LAYOUT_65_iso_blocker`

[enhancement]

* patch `LAYOUT_65_iso_blocker_split_bs`

* patch `LAYOUT_65_iso_blocker`

* Add `LAYOUT_65_iso_blocker_tsangan_split_bs`

[enhancement]

* Add `LAYOUT_65_iso_blocker_tsangan`

[enhancement]

* Enable Community Layout support

[enhancement]
2023-09-14 12:07:22 -07:00
James Young
269c7b6e5b
Mechlovin Zed65 910 Layout Standardization (#22018)
* Add layout/matrix diagram

[docs]

* Rename `LAYOUT_65_iso_tsangan_split_bs` to `LAYOUT_iso_split_bs`

[refactor]

* Rename `LAYOUT_65_ansi_tsangan` to `LAYOUT_ansi`

[refactor]

* Rename `LAYOUT_65_ansi_blocker_tsangan` to `LAYOUT_ansi_blocker_tsangan`

[refactor]

* Rename `LAYOUT_65_ansi_tsangan_split_bs` to `LAYOUT_all`

[refactor]
2023-09-14 10:57:44 -07:00
James Young
cfe52b6e6e
Maze Studio Jocker 1800 Layout Additions (#22016)
* Add layout/matrix diagram

[docs]

* Rename `LAYOUT` to `LAYOUT_ansi_split_bs`

[refactor]

* Add `LAYOUT_ansi`

[enhancement]

* Add `LAYOUT_ansi_wkl_split_bs`

[enhancement]

* Add `LAYOUT_ansi_wkl`

[enhancement]
2023-09-14 10:20:14 -07:00
James Young
78eb69ead5
Linworks Fave60a Community Layout Support (#22015)
* Friendly-format `info.json`

[style]

* Correct layout data

[chore]

* Add layout/matrix diagram

[docs]

* Rename `LAYOUT` to `LAYOUT_60_tsangan_hhkb`

[refactor]

* Add `LAYOUT_60_ansi_tsangan`

[enhancement]

* Enable Community Layout support

[enhancement]
2023-09-14 02:48:09 -07:00
James Young
02e6c04ac2
Krado Industries Promenade Layout Additions (#22014)
* Add layout/matrix diagram

[docs]

* Rename `LAYOUT` to `LAYOUT_all`

[refactor]

* Correct key order

[bugfix]

* Add `LAYOUT_2x2u`

[enhancement]

* Add `LAYOUT_2x3u`

[enhancement]

* Add `LAYOUT_6u_space`

[enhancement]

* Add `LAYOUT_7u_space`

[enhancement]

* Touch-up `via` keymap

Update keycode grid alignment to match the `default` keymap.

[style]
2023-09-14 02:16:04 -07:00
Luis Garcia
e67a4ba7ce
Update to 'peterfalken' userspace configurations (#21836) 2023-09-14 13:08:00 +10:00
James Young
9f0f39555c
Kopibeng XT87 Layout Additions & Touch-Up (#22002)
* Add `LAYOUT_tkl_ansi_wkl_split_bs_rshift`

[enhancement]

* Add `LAYOUT_tkl_ansi_wkl`

[enhancement]

* Add `LAYOUT_tkl_iso_wkl_split_bs_rshift`

[enhancement]

* Add `LAYOUT_tkl_iso_wkl`

[enhancement]

* Correct layout data

Correct key positioning on the function row.

[enhancement]

* Friendly-format `info.json`

[style]

* Move ISO Enter to Home Row

Corrects the implementation of the ISO Community Layouts.

[bugfix]
2023-09-13 19:43:31 -07:00
James Young
f4a702e49f
Kibou Suisei Layout Addition (#22001)
* Add layout/matrix diagram

[docs]

* Rename `LAYOUT` to `LAYOUT_65_ansi_blocker_tsangan_wkl_split_bs`

[refactor]

* Add `LAYOUT_65_ansi_blocker_tsangan_wkl`

[enhancement]
2023-09-13 18:06:19 -07:00
James Young
32f060366f
Keebio NyquistPad Layout Updates (#22000)
* Rename `LAYOUT` to `LAYOUT_ortho_5x6`

[refactor]

* Add `LAYOUT_ortho_5x6_1x2u`

[enhancement]
2023-09-13 17:47:25 -07:00
James Young
c6841a51de
Jaykeeb Sebelas: Standardize Layout Names (#21999)
* Rename `LAYOUT_65_ansi_blocker` to `LAYOUT_ansi_blocker`

[refactor]

* Rename `LAYOUT_65_ansi_blocker_split_bs` to `LAYOUT_ansi_blocker_split_bs`

[refactor]

* Rename `LAYOUT_65_ansi_blocker_tsangan` to `LAYOUT_ansi_blocker_tsangan`

[refactor]

* Rename `LAYOUT_65_ansi_blocker_tsangan_split_bs` to `LAYOUT_ansi_blocker_tsangan_split_bs`

[refactor]
2023-09-13 14:54:46 -07:00
James Young
33d7fa1180
Inland MK47 Community Layout Support (#21998)
* Rename `LAYOUT` to `LAYOUT_planck_mit`

[refactor]

* Enable Community Layout support

[enhancement]

* Touch-up keymaps

- grid-align keycodes

[style]
2023-09-13 13:44:05 -07:00
James Young
e6ce481179
Handwired ScottoKeebs Configurator Updates (#21990)
* ScottoKeebs ScottoAlp: Correct layout data

[enhancement]

* ScottoKeebs ScottoCMD: Correct layout data

[enhancement]

* ScottoKeebs ScottoErgo: Correct layout data

Add hand separation and vertical stagger to the layout data.

[enhancement]

* ScottoKeebs ScottoFrog: Correct layout data

[enhancement]

* ScottoKeebs ScottoGame: Correct layout data

[enhancement]

* ScottoKeebs ScottoInvader: Correct layout data

[enhancement]

* ScottoKeebs ScottoNum: Correct layout data

[enhancement]

* ScottoKeebs ScottoSplit: Correct layout data

[enhancement]

* ScottoKeebs ScottoStarter: Correct layout data

[enhancement]
2023-09-12 23:05:10 -07:00
James Young
4468662d64
Gray Studio Think65 v3 Layout Additions (#21930)
* Add layout/matrix diagram

[docs]

* Format `info.json` as strict JSON

[style]

* Add `LAYOUT_all`

[enhancement]

* Refactor keymaps to use `LAYOUT_all`

Refactor the `default` and `via` keymaps to use the `LAYOUT_all` macro.

- change second Left Shift key to `KC_NUBS`
- insert `KC_NUHS` keycode
- update keycode grid alignment
- remove trailing whitespace

[refactor]

* Rename `LAYOUT_65_blocker` to `LAYOUT_ansi_blocker`

[refactor]

* Rename `LAYOUT_65_iso_blocker` to `LAYOUT_iso_blocker`

[refactor]

* Correct `LAYOUT_iso_blocker` matrix data

The Quote key was mapped as [1, 14] instead of [2, 12].

[bugfix]

* Add `LAYOUT_ansi_blocker_split_bs`

[enhancement]

* Add `LAYOUT_ansi_blocker_tsangan_split_bs`

[enhancement]

* Add `LAYOUT_ansi_blocker_tsangan`

[enhancement]

* Add `LAYOUT_iso_blocker_split_bs`

[enhancement]

* Add `LAYOUT_iso_blocker_tsangan_split_bs`

[enhancement]

* Add `LAYOUT_iso_blocker_tsangan`

[enhancement]
2023-09-12 13:57:25 -07:00
James Young
91e0e46e4a
Drewkeys Mercury65 Layout Additions (#21924)
* Rename `LAYOUT` to `LAYOUT_all`

[refactor]

* Add layout/matrix diagram

[docs]

* Correct `LAYOUT_all` data

Correct the order of the Up arrow and End keys.

[enhancement]

* Tidy-up `info.json` formatting

- add line breaks between physical rows
- remove trailing spaces

[style]

* Add `LAYOUT_iso_blocker_split_bs`

[enhancement]

* Add `LAYOUT_iso_blocker_tsangan_split_bs`

[enhancement]

* Add `LAYOUT_ansi_blocker_split_bs`

[enhancement]

* Add `LAYOUT_ansi_blocker_tsangan_split_bs`

[enhancement]
2023-09-12 12:57:45 -07:00
Dasky
62105b5c07
Remove oversize binaries (#21976)
This stops a situation where a user could end up flashing oversize firmware soft bricking hardware.
2023-09-12 02:55:05 +01:00
Falco Gerritsjans
3561c3a1f9
Repair malformed links in keyboard README files (#21969) 2023-09-11 21:43:16 +01:00
James Young
9a29ddf6af
dnworks FRLTKL Community Layout support (#21922)
* Add layout/matrix diagram

[docs]

* Rename `LAYOUT` to `LAYOUT_all`

[refactor]

* Add `LAYOUT_tkl_nofrow_iso_split_bs_rshift`

[enhancement]

* Add `LAYOUT_tkl_nofrow_iso`

[enhancement]

* Add `LAYOUT_tkl_nofrow_iso_tsangan_split_bs_rshift`

[enhancement]

* Add `LAYOUT_tkl_nofrow_iso_tsangan`

[enhancement]

* Add `LAYOUT_tkl_nofrow_iso_wkl_split_bs_rshift`

[enhancement]

* Add `LAYOUT_tkl_nofrow_iso_wkl`

[enhancement]

* Add `LAYOUT_tkl_nofrow_ansi_split_bs_rshift`

[enhancement]

* Add `LAYOUT_tkl_nofrow_ansi`

[enhancement]

* Add `LAYOUT_tkl_nofrow_ansi_tsangan_split_bs_rshift`

[enhancement]

* Add `LAYOUT_tkl_nofrow_ansi_tsangan`

[enhancement]

* Add `LAYOUT_tkl_nofrow_ansi_wkl_split_bs_rshift`

[enhancement]

* Add `LAYOUT_tkl_nofrow_ansi_wkl`

[enhancement]

* Enable Community Layout support

[enhancement]
2023-09-09 12:15:57 -07:00
Vino Rodrigues
ec09c03b64
[Keyboard] Add Binepad Pixie (#21524)
* Add Binepad Pixie

* Post waffle87 and drashna review recommendations applied

* Post-drashna code review suggestions applied

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

* post zvecr review

---------

Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-09-09 11:17:09 +01:00
James Young
4875bcecc2
customMK EVO70 R2 Layout Additions (#21916)
* Rename `LAYOUT` to `LAYOUT_all`

[refactor]

* Add layout/matrix diagram

[docs]

* Correct layout data

Reduce the gap between the encoder/macro section and the alphanumeric
section by 0.25u.

[enhancement]

* Add `LAYOUT_ansi_blocker`

[enhancement]

* Add `LAYOUT_iso_blocker`

[enhancement]

* Fix redundant `layout_aliases` keys

per dunk2k

[bugfix]
2023-09-08 19:11:07 -07:00
James Young
3e3320e8d9
Cipulot EC Theca Community Layout Support (#21913)
* Alias `LAYOUT_all` as `LAYOUT_tkl_ansi`

The data for `LAYOUT_all` and `LAYOUT_tkl_ansi` is identical, so alias
the former to the latter to reduce redundancy.

[refactor]

* Rename `LAYOUT_tkl_ansi_tsangan_wkl` to `LAYOUT_tkl_ansi_wkl`

[refactor]

* Enable Community Layout support

[enhancement]
2023-09-07 13:53:16 -07:00
James Young
c783325e16
GMMK2 96% ANSI: Correct layout data (#21937)
[enhancement]
2023-09-06 19:57:24 +01:00
3geek14
e3c6467ab9
[Docs] Improve contrast for warnings in dark mode (#21928) 2023-09-05 19:00:14 -07:00
James Young
7fb60519ee
GMMK2 65% ISO: Correct layout data (#21925)
Correct key sizes/positioning on the right side of the board.
2023-09-06 00:46:29 +01:00
dependabot[bot]
549708edfa
Bump actions/checkout from 3 to 4 (#21907)
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-09-05 18:50:04 +01:00
James Young
6aa3814f6e
CannonKeys BastionTKL Layout Additions (#21901)
* [docs] add layout/matrix diagram

* [enhancement] add LAYOUT_tkl_ansi_split_bs_rshift

* [enhancement] add LAYOUT_tkl_ansi_tsangan_split_bs_rshift

* [enhancement] add LAYOUT_tkl_ansi_tsangan

* [enhancement] add LAYOUT_tkl_f13_ansi_tsangan

* [enhancement] add LAYOUT_tkl_f13_ansi_split_bs_rshift

* [enhancement] add LAYOUT_tkl_f13_ansi

* [enhancement] correct LAYOUT_tkl_iso key order

* [enhancement] add LAYOUT_tkl_iso_split_bs_rshift

* [enhancement] add LAYOUT_tkl_iso_tsangan_split_bs_rshift

* [enhancement] add LAYOUT_tkl_iso_tsangan

* [enhancement] add LAYOUT_tkl_f13_iso_split_bs_rshift

* [enhancement] add LAYOUT_tkl_f13_iso

* [enhancement] add LAYOUT_tkl_f13_iso_tsangan_split_bs_rshift

* [enhancement] add LAYOUT_tkl_f13_iso_tsangan

* [enhancement] extend Community Layout support
2023-09-05 00:48:35 -07:00
James Young
809865e9ee
CannonKeys Bastion65 Layout Additions (#21888)
* [docs] add layout/matrix diagram

* [refactor] rename LAYOUT to LAYOUT_all

* [enhancement] add LAYOUT_65_ansi_blocker_split_bs

* [enhancement] add LAYOUT_65_ansi_blocker

* [enhancement] add LAYOUT_65_ansi_blocker_tsangan_split_bs

* [enhancement] add LAYOUT_65_ansi_blocker_tsangan

* [enhancement] add LAYOUT_65_iso_blocker_split_bs

* [enhancement] add LAYOUT_65_iso_blocker

* [enhancement] add LAYOUT_65_iso_blocker_tsangan_split_bs

* [enhancement] add LAYOUT_65_iso_blocker_tsangan

* [enhancement] enable Community Layout support
2023-09-05 00:21:15 -07:00
James Young
2f243e2817
CannonKeys Bastion60 Layout Additions (#21887)
* [bugfix] correct LAYOUT_60_iso_tsangan key order

* [docs] add layout/matrix diagram

* [enhancement] add LAYOUT_60_tsangan_hhkb

* [enhancement] add LAYOUT_60_ansi_tsangan

* [enhancement] add LAYOUT_60_iso

* [enhancement] add LAYOUT_60_iso_split_bs_rshift

* [enhancement] add LAYOUT_60_iso_tsangan_split_bs_rshift

* [enhancement] add LAYOUT_60_hhkb

* [enhancement] extend Community Layout support
2023-09-04 23:55:24 -07:00
James Young
2f517041c7
CannonKeys Bastion75 Layout Additions (#21899)
* [docs] add layout/matrix diagram

* [refactor] rename LAYOUT to LAYOUT_all

* [enhancement] add LAYOUT_ansi_blocker_split_bs

* [enhancement] add LAYOUT_ansi_blocker

* [enhancement] add LAYOUT_ansi_blocker_tsangan_split_bs

* [enhancement] add LAYOUT_ansi_blocker_tsangan

* [enhancement] add LAYOUT_iso_blocker_split_bs

* [enhancement] add LAYOUT_iso_blocker

* [enhancement] add LAYOUT_iso_blocker_tsangan_split_bs

* [enhancement] add LAYOUT_iso_blocker_tsangan
2023-09-04 23:34:23 -07:00
Joel Challis
b2ded61796
Auto-label data-driven efforts (#21900) 2023-09-04 09:09:53 +01:00
James Young
fd095bbfae
Chosfox CF81: correct layout data (#21902) 2023-09-04 07:56:43 +01:00
James Young
9eaa8a24ed
ANAVI Macro Pad 12: rename LAYOUT to LAYOUT_ortho_4x3 (#21886)
[refactor]
2023-09-03 23:17:53 -07:00
James Young
dd17b6be29
AH Haven80 Community Layout support (#21885)
* [enhancement] correct layout data

* [refactor] rename LAYOUT to LAYOUT_tkl_f13_ansi_tsangan

* [enhancement] enable Community Layout support

* Haven80 Solder: add LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift

[enhancement]

* Haven80 Solder: add LAYOUT_tkl_f13_iso_tsangan_split_bs_rshift

[enhancement]

* Haven80 Solder: add LAYOUT_tkl_f13_iso_tsangan

[enhancement]

* Haven80 Solder: extend Community Layout support

[enhancement]
2023-09-03 22:39:35 -07:00
Joel Challis
e26442fc2a
redragon/k667: Remove 2 layer VIA restriction (#21889) 2023-09-03 16:57:10 +01:00
NCKiser
8ad43a965f
Added kiserdesigns keyboard folder and Madeline keyboard (#21857)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-09-02 21:34:09 -07:00