Commit graph

795 commits

Author SHA1 Message Date
Brandon Claveria
c29ea78211 add equator (#12369)
Co-authored-by: Swiftrax <swiftrax@gmail.com>
2021-03-25 22:34:29 +11:00
James Young
d938ffe184 Roses Lite layout macro touch-up (#12357) 2021-03-25 18:05:59 +11:00
duoshock
01f0a66d10 Add UC-1 keypad (#11926)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: online <33636898+online@users.noreply.github.com>
2021-03-24 13:00:07 +11:00
kb-elmo
8d3e21660a Fix Kira80 license headers (#12303)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2021-03-21 13:43:04 +11:00
noclew
d74f41bd33 [Keyboard] Vanana, Vaguette Lite, and Waaffle (#11441)
* added Vanana / Vaguette Lite / Waaffle

* changed extra GPIO allocations of Waaffle and Vanana

* Apply suggestions from code review

changed layout name of vaguette Lite / requested by drashna

* Apply suggestions from code review

Requested keymap changes have been made.

* all changes requested by collaborators are made

* RGB config updated / keymap updated

* fixed vaguette lite info.json

* fixed vaguette lite info.json

* fixed vaguette lite info.json

* Apply suggestions from code review

request changes are made

* pre rename h

* vaguettelite reanmed to lowercases

* fixed vanana keymap

* Apply suggestions from code review

* changed Bootmagic key of VaguetteLite as suggested

* Updated via keymap of Vaguette Lite as suggested

* add vaguette lite 6.25 layout

* added vaguette lite noclew keymap

* updated vaguette lite 6.25u keymap description

* updated vanana default keymap

* updated keymap spacing

* reabased from the official repo

* Update keymap.c

fixed vaguette lite keymap

* Apply suggestions from code review

All the requested changes by a collaborator were made.

* updated info.json of Vanana and readme files of Vanana and waffle

* rename LAYOUT_waaffle to LAYOUT_ortho_5x16

Also adjusts the info.json data to put a visual gap between the extension and main PCBs.

* make rules.mk and info.json specific to rev3

Removes nckiibs/waaffle as a build target, as it redirects to the only extant revision in the repository.

* add controller board build targets

Adds build targets for Pro Micro and Elite-C builds, with appropriate defaults for each.

Running `make nckiibs/waaffle/rev3` defaults to a Pro Micro-based build.
2021-03-19 17:12:38 -07:00
Xelus22
c333675914 [Keyboard] Add Pachi (#12132)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-19 01:25:37 +11:00
Matthew Dias
1db044431f [Keyboard] Add barleycorn smd keyboard (#12200) 2021-03-16 23:31:58 -07:00
devriesp
58c31c208e [Keyboard] add via keymap to afternoonlabs breeze keyboard (#12247) 2021-03-16 23:22:43 -07:00
kaylanm
3c92ca8c4d [Keyboard] Add KMAC VIA keymap (#12224) 2021-03-16 23:17:40 -07:00
Ryan
fae79b1138 TKC M0lly refactor (#12227) 2021-03-17 15:56:45 +11:00
Gavin Austin
de2c040c30 [Keyboard] Added Roses Lite Support (#12173)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-16 19:23:35 -07:00
Matteo Montemarani
c169ba4de0 Pizza Keyboards Pizza65 addition (#11604)
* Added Pizza65 from Pizza Keyboards

Addition of Pizza65

* Update pizza65.h

* Update info.json

* Update mcuconf.h

* Update rules.mk

* Updated makefile

* Update keyboards/pizzakeyboards/pizza65/config.h

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

* Update keyboards/pizzakeyboards/pizza65/config.h

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

* Update keyboards/pizzakeyboards/pizza65/config.h

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

* Update keyboards/pizzakeyboards/pizza65/keymaps/ansi_blocker_doublebs/keymap.c

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

* Update keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker_doublebs/keymap.c

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

* Update keyboards/pizzakeyboards/pizza65/info.json

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

* Update keyboards/pizzakeyboards/pizza65/rules.mk

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

* Update keyboards/pizzakeyboards/pizza65/keymaps/default/keymap.c

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

* Update keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker/keymap.c

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

* Update keyboards/pizzakeyboards/pizza65/keymaps/via/keymap.c

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

* Update keyboards/pizzakeyboards/pizza65/readme.md

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

* Update keyboards/pizzakeyboards/pizza65/readme.md

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

* Update keyboards/pizzakeyboards/pizza65/info.json

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

* Update keyboards/pizzakeyboards/pizza65/info.json

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

* Update keyboards/pizzakeyboards/pizza65/info.json

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

* Chibios Config migration

* Update keyboards/pizzakeyboards/pizza65/readme.md

Co-authored-by: Jonas Gessner <JonasGessner@users.noreply.github.com>

* Update keyboards/pizzakeyboards/pizza65/readme.md

Co-authored-by: Jonas Gessner <JonasGessner@users.noreply.github.com>

* Update keyboards/pizzakeyboards/pizza65/pizza65.h

Co-authored-by: Jonas Gessner <JonasGessner@users.noreply.github.com>

* Update rules.mk

nk rollover activation

* conf updates

* Update keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker/keymap.c

Co-authored-by: Davide Riccardo Caliendo <drc0@users.noreply.github.com>

* Update keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker_doublebs/keymap.c

Co-authored-by: Davide Riccardo Caliendo <drc0@users.noreply.github.com>

* Update keymap.c

thanks to Acaban

* Update pizza65.h

update to the iso_blocker_doublebs layout macro

* Delete chconf.h

Deleting after the ChibiOS-conf migration.

* Delete config.h

Deleting after the ChibiOS-conf migration.

* Revert "Delete config.h"

This reverts commit 16d64619e68578382aca3b1475968563b662d07f.

* Delete mcuconf.h

Deleting after ChibiOS-conf migration.

* Delete halconf.h

Deleting after ChibiOS-conf migrations.

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Jonas Gessner <JonasGessner@users.noreply.github.com>
Co-authored-by: Davide Riccardo Caliendo <drc0@users.noreply.github.com>
2021-03-16 10:09:29 +11:00
kb-elmo
bccda5e83f add support for Noah AVR PCB (#11563)
* add support for Noah AVR PCB

* Update info.json

* Update readme.md

* Update keyboards/kb_elmo/noah_avr/rules.mk

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

* Update keymap.c

* Apply suggestions from code review

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

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-03-16 10:03:16 +11:00
James Young
9e86a54a18 M10-A refactor (#12242) 2021-03-15 19:25:00 +11:00
xyzz
15728b831e Fix keycode mappings for via and ensure they don't change within protocol (#12130)
* Fix keycode mappings for via and ensure they don't change within protocol

* Update keycodes

* Fix broken keyboards

* added the missing keycodes found in via

* Remove invalid keycodes

Co-authored-by: David Hoelscher <infinityis@users.noreply.github.com>
2021-03-15 12:19:01 +11:00
NightlyBoards
7d8571796b [Keyboard] Added Adellein Keyboard/PCB (#11547) 2021-03-14 14:51:21 -07:00
yiancar
380640e460 Hand 88 (#11963)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-13 09:37:41 +11:00
Xelus22
78b4887a2c [Bugs] Fix VIA Compiles (#12186) 2021-03-12 13:50:15 -08:00
Albert Y
ee0a609a72 Enable default features on VIA keymap for Lily58 (#12185)
Co-authored-by: filterpaper <filterpaper@localhost>
2021-03-12 18:43:31 +11:00
somepin
53707cfdf5 Add VIA support to doodboard/duckboard_r2 (#12028)
* Update R1 keymap and config

* Add duckboard R2

* Add VIA support for duckboard R2

* Set bootmagic lite row and column

* Update config.h

* Update keyboards/doodboard/duckboard/config.h

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

* Update config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-03-09 21:17:35 -08:00
maz0r
9515204925 [Keyboard] Capsunlocked CU80 - added variant's for RGB matrix support (#12019)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-07 12:20:02 -08:00
icesoup
8dceb9d9c7 [Keyboard] add Soup10 support (#11921)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-06 13:03:48 -08:00
Aleblazer
ebc8cb78fe Adding Zodiark Split keyboard (#11837)
* Adding Files for Zodiark

* zodiark.h and keymap.c layout corrections

* Apply suggestions from code review

Applied all suggestions from zvecr.

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

* Applied all suggestions from fauxpark

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

* Defined matrix driver

* Update keymap with GPL2

* Added GPL2+ to All keymap.c, cleaned up config.h, and removed the rgbmatrixwip keymap

* Apply suggestions from code review

Removed the two lines from the config.h and changed to the smaller resolution picture on the Readme.

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

* Added VIA keymap

* Corrected VIA Keymap oled.c

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-03-06 18:56:48 +00:00
Conor Burns
1d44b9a73b added 0xCB/1337 keyboard (#12089)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2021-03-05 23:22:42 +01:00
datafx
bb8c74bbea [Keyboard] Monstargear XO87 Solderable support (#11716)
* Support for XO87 solderable version

* cleanup

* Remove abandoned code

* replaced KEYMAP with LAYOUT and moved LAYOUT macro to solderable.h.  deleted unneeded files.

* Update keyboards/monstargear/xo87/solderable/keymaps/via/keymap.c

* update info.json with missing keys

* Apply suggestions from code review

* Apply suggestions from code review

correct layout macro
2021-03-05 10:04:14 -08:00
studiokestra
a72c44edca [Keyboard] Add Studio Kestra Nue PCB (#12094) 2021-03-03 17:02:27 -08:00
James Young
bec41122f7 cannonkeys/atlas_alps: rename via keymaps rules.mk.txt to rules.mk (#12103)
File doesn't work without the correct filename.
2021-03-03 22:33:14 +00:00
github-actions[bot]
e5f65a4d97 Format code according to conventions (#12102)
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-03-03 13:44:55 -08:00
labahuy
b9e1d15662 [Keyboard] Add Keyboard Rartlite (#11866) 2021-03-03 12:38:16 -08:00
Angel Rojas
d794595b30 [Keyboard] Added VIA folder under the keymaps folder (#12021)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-03 12:28:10 -08:00
jackytrabbit
8ee3306c36 Update lazydesigners/the40 (#11989)
* Update the40.h

Update the40.h to fix keymap

* Add VIA support for lazydesigners/the40

Add VIA support for lazydesigners/the40

* Update keymap.c
2021-02-28 17:11:06 +11:00
gazeddy
adb199b272 New Variants of Console Keyboard (#11973)
* initial push of console keyboard variants

* update readme

* fixed compilation issue

* update Readme

* added 18 and 27 key variants

* missed commas

* update info.json

* added readme

* correct info.json

* correct info.json

* info.json again

* fixed keymap.c
2021-02-28 17:09:41 +11:00
Aeonstrife
e80a50a639 Add Potato65 PCB (#11956)
* Make initial set of files

* Update readme.md
2021-02-28 17:03:49 +11:00
MechMerlin
7749099bfe Banana Split VIA Support (#11944)
* add VIA keymap for bananasplit

* refactor code to new standards
2021-02-28 17:02:34 +11:00
knaruo
73da7ac20d Added support for barracuda keyboard (#11888)
- Added default and via keymaps
2021-02-28 17:01:56 +11:00
MajorKoos
2453221394 OddForge VE.A (#11875)
* VEA Support

* Update LEDs to use QMK methods

* Enable Backlight

* Update Vendor ID

* Updates to enable split RGB

* Update readme

* Update to split RGB

* remove unnecessary reference

* Knight animation starts at the back

* remove hardcoded variable

Co-authored-by: Major Koos <MajorKoos@noreply.users.github.com>
2021-02-28 16:57:04 +11:00
NightlyBoards
babd79b78d Added n60_s folder (#11455)
* Create Alter folder

* Revert "Create Alter folder"

This reverts commit 361103b821dbb22957b66cdedb0d11f996def71c.

* Added n60_s folder

* Fixed the url of the image in the readme

* Updated readme

* Updated readme

* Updated readme
2021-02-28 16:43:58 +11:00
haierwangwei2005
7729865c2a 17 key Panasonic rotary encoder BLE pad (#11659)
* Create rules.mk

* Create glcdfonr.c

* Create keymap.c

* Create keymap.c

* Create rules.mk

* Add files via upload

* Update readme.md

* Update readme.md

* Update readme.md

* Update config.h

* Update 10bleoledhub.h

* Update 10bleoledhub.c

* Update info.json

* Update keymap.c

* Update keymap.c

* Rename glcdfonr.c to glcdfont.c

* Update config.h

* Update config.h

* Update config.h

* Update rules.mk

* Update 10bleoledhub.c

* Update 10bleoledhub.h

* Update info.json

* Update config.h

* Update rules.mk

* Update keymap.c

* Update keymap.c

* Update glcdfont.c

* Update keyboards/10bleoledhub/rules.mk

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

* Update keyboards/10bleoledhub/keymaps/via/keymap.c

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

* Update keyboards/10bleoledhub/keymaps/default/keymap.c

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

* Update keyboards/10bleoledhub/config.h

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

* Update keyboards/10bleoledhub/config.h

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

* Update keyboards/10bleoledhub/10bleoledhub.h

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

* Create readme.md

* Create rules.mk

* Create latin47ble.h

* Create latin47ble.c

* Create info.json

* Create config.h

* Create keymap.c

* Create rules.mk

* Create keymap.c

* Update keymap.c

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

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

* Update keymap.c

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

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

* Update keyboards/latin47ble/rules.mk

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

* Update keyboards/latin47ble/rules.mk

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

* Update keyboards/latin47ble/rules.mk

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

* Update latin47ble.h

* Update latin47ble.c

* Update latin47ble.h

* Update latin47ble.c

* Update keymap.c

* Update keymap.c

* Update config.h

* Update keyboards/latin47ble/config.h

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

* Update keyboards/latin47ble/config.h

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

* Update keyboards/latin47ble/config.h

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

* Update keyboards/latin47ble/config.h

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

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

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

* Update keyboards/latin47ble/rules.mk

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

* Delete info.json

* Update readme.md

* Update keymap.c

* Update keymap.c

* Update keyboards/latin47ble/config.h

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

* Update keyboards/latin47ble/config.h

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

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

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

* Update keyboards/latin47ble/latin47ble.c

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

* Update keyboards/latin47ble/latin47ble.h

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

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

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

* Update keymap.c

* Update keymap.c

* Update latin47ble.h

* Update keymap.c

* Update keymap.c

* Update keymap.c

* Update keymap.c

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

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

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

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

* Update keyboards/latin47ble/latin47ble.h

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

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

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

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

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

* Update keyboards/latin47ble/rules.mk

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

* Update config.h

* Create readme.md

* Add files via upload

* Create glcdfont.c

* Create keymap.c

* Create keymap.c

* Create rules.mk

* Update config.h

* Update config.h

* Update config.h

* Update config.h

* Update config.h

* Update latinpadble.c

* Update latinpadble.h

* Update config.h

* Update config.h

* Update keymap.c

* Update config.h

* Update rules.mk

* Update config.h

* Update rules.mk

* Update rules.mk

* Update config.h

* Update keyboards/latinpadble/config.h

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

* Update keyboards/latinpadble/config.h

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

* Update keymap.c

* Update keymap.c

* Update glcdfont.c

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2021-02-28 16:36:04 +11:00
Steven Nguyen
f9d8329774 Add keyboard: 7c8/Framework (#11593)
* Add 7c8/framework keyboard

* Update VIA framework.json definition

* Code cleanup and styling to conform to QMK style guide

* Code cleanup and moving some keymap definitions to a 'steven' keymap in order to create a cleaner default keymap for other users

* Update keyboards/7c8/framework/config.h

Remove #define DESCRIPTION

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

* Update keyboards/7c8/framework/config.h

remove #define UNUSED_PINS

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

* Update keyboards/7c8/framework/framework.h

Change layout name to existing layout name.

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

* Update keyboards/7c8/framework/framework.h

Change layout name to existing layout name.

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

* Update keyboards/7c8/framework/framework.h

Change layout name to existing layout name.

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

* Update keyboards/7c8/framework/keymaps/via/keymap.c

change biton32 to get_highest_layer

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

* change vendor ID from 0x07c8 to 0x77c8, which is unused

* delete VIA .json definition from via keymap folder

* Change framework_grid to LAYOUT_ortho_5x12 in default keymap.c

* remove framework.json from 'steven' keymap folder

* cleanup

* Update keyboards/7c8/framework/config.h

0x77c8 -> 0x77C8

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

Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-02-28 16:30:28 +11:00
Josh Johnson
4aa0951c0f Hub16 QMK configurator support + various bugfixes (#11496)
* qmk configurator support + various bugfixes

* Update keyboards/hub16/rules.mk

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

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
2021-02-28 16:03:49 +11:00
James Young
647b6fe274 Force update the version tag 2021-02-27 14:01:16 -08:00
Nick Brassel
69b58b80b4 2021 February 27 Breaking Changes Update (#12040) 2021-02-28 07:22:21 +11:00
QMK Bot
d1e6c63907 Merge remote-tracking branch 'origin/master' into develop 2021-02-27 01:29:58 +00:00
Danny
b144088bd1 [Keyboard] Add VIA support to SX60 and update default keymap (#11908) 2021-02-26 17:29:23 -08:00
QMK Bot
acaad4306b Merge remote-tracking branch 'origin/master' into develop 2021-02-25 10:57:31 +00:00
Drashna Jaelre
d858829ec7 [Keyboard] Fixup issues with Titan65 (#12002)
* [Keyboard] Titan64 - Fix RGB Matrix config

* Fix up keymaps
2021-02-25 10:56:59 +00:00
QMK Bot
6810704d80 Merge remote-tracking branch 'origin/master' into develop 2021-02-24 18:53:45 +00:00
npspears
fca4366b5e [Keyboard] Atlas alps/mx PCB addition (#11884)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-02-24 10:53:09 -08:00
QMK Bot
49ce84a210 Merge remote-tracking branch 'origin/master' into develop 2021-02-24 18:49:10 +00:00
Rys Sommefeldt
f6b40ace8b [Keyboard] CapsUnlocked CU80 v2 (#11736)
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Rys Sommefeldt <rys@pixeltards.com>
2021-02-24 10:48:35 -08:00