Joel Challis
bbc3bc55f2
RESET -> QK_BOOT user keymaps ( #17940 )
2022-08-21 23:55:30 +01:00
Drashna Jael're
8f6b019dcc
Merge remote-tracking branch 'origin/master' into develop
2022-08-20 10:22:48 -07:00
Joel Challis
d2accb48e7
RESET -> QK_BOOT keyboard readme ( #18110 )
2022-08-20 11:34:17 +01:00
Nick Brassel
154d35ac14
Remove UNUSED_PINS
( #17931 )
2022-08-06 23:23:35 +10:00
QMK Bot
c2f68e3232
Merge remote-tracking branch 'origin/master' into develop
2022-07-28 13:13:39 +00:00
Ryan
920f983767
Move keyboard USB IDs and strings to data driven: H ( #17821 )
2022-07-28 14:12:40 +01:00
Drashna Jaelre
0da6562c4d
Make default layer size 16-bit ( #15286 )
...
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2022-06-19 07:37:51 +10:00
Joel Challis
ebd4027883
Refactor legacy quantum keycodes in default-ish keymaps ( #17150 )
2022-05-27 06:07:42 +10:00
QMK Bot
19e6e6d1de
Merge remote-tracking branch 'origin/master' into develop
2022-05-19 07:48:36 +00:00
James Young
89e0fba75d
Hineybush Ibis Layout Additions and Configurator Rendering Update ( #17132 )
...
* info.json: apply friendly formatting
* info.json: remove dead space from rendering
* info.json: insert line breaks between physical rows in layout data
* info.json: fix overlap in key rendering
Fixes an issue where the ANSI Enter key renders on top of the ISO Hash/Tilde key, visually hiding the latter.
* add LAYOUT_ansi_all macro with associated keymap
Duplicates `LAYOUT_all`, but with the ISO Hash/Tilde and ISO Backslash keys removed.
- ANSI Enter and 2.25u Left Shift
- Backspace, Right Shift, Numpad Plus and Numpad Enter all split
- 1.5 / 1 / 1.5 / 6.25 / 1.25 / 1.25 / 1.25 Bottom Row
* add LAYOUT_iso_all macro with associated keymap
Duplicates `LAYOUT_all`, but with the ANSI Backslash key removed.
- ISO Enter and 1.25u Left Shift
- Backspace, Right Shift, Numpad Plus and Numpad Enter all split
- 1.5 / 1 / 1.5 / 6.25 / 1.25 / 1.25 / 1.25 Bottom Row
2022-05-19 00:48:01 -07:00
Joel Challis
b7771ec25b
RESET -> QK_BOOT default keymaps ( #17037 )
2022-05-15 20:26:27 +01:00
Josh Hinnebusch
ffe16386f0
[Keyboard] H60 updates ( #16999 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-05-12 23:33:53 -07:00
Josh Hinnebusch
890dfebe8d
Add ibis PCB ( #17001 )
...
* initial ibis commit
* updates etc
* layout updates to fix mismatched keys
* Apply suggestions from code review
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/hineybush/ibis/info.json
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/hineybush/ibis/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-05-05 11:31:52 +01:00
James Young
6a156cb5cc
Hineybush H65 Hotswap Layout Additions and Configurator Update ( #16780 )
...
* info.json: apply friendly formatting
* h65_hotswap.h: use QMK 3-character notation
* h65_hotswap.h: add matrix diagram
* rename LAYOUT to LAYOUT_all
* add LAYOUT_65_ansi_blocker
* add LAYOUT_65_ansi_blocker_split_bs
* add LAYOUT_65_iso_blocker
* add LAYOUT_65_iso_blocker_split_bs
* grid align keycodes in keymaps
* rules.mk: align inline comments
2022-04-04 12:20:10 -07:00
James Young
d59d60ff69
Hineybush H65 Layout Additions and Configurator Update ( #16779 )
...
* info.json: apply friendly formatting
* h65.h: use QMK 3-character notation
* h65.h: add matrix diagram
* add LAYOUT_65_ansi_blocker
* add LAYOUT_65_ansi_blocker_split_bs
* add LAYOUT_65_ansi_blocker_tsangan
* add LAYOUT_65_ansi_blocker_tsangan_split_bs
* add LAYOUT_65_iso_blocker
* add LAYOUT_65_iso_blocker_split_bs
* add LAYOUT_65_iso_blocker_tsangan
* add LAYOUT_65_iso_blocker_tsangan_split_bs
* grid align keycodes in keymaps
* rules.mk: align inline comments
2022-04-04 11:56:20 -07:00
Ryan
764dc18a81
Remove NO_ACTION_MACRO
and NO_ACTION_FUNCTION
from keyboard config.h ( #16655 )
2022-03-15 13:56:58 +00:00
jack
2d1d44edb7
[Keyboard] Fix Hineybush/h08_ocelot and Hineybush/h65(_hotswap) ( #16405 )
2022-02-20 22:04:43 -08:00
Josh Hinnebusch
38e3be4c74
Add h08_ocelot and h65 PCBs ( #14054 )
...
* add h65 start
* add h65 base files
* add ocelot base files
* add via keymap
* Update keyboards/hineybush/h08_ocelot/config.h
* Update keyboards/hineybush/h65/config.h
* add base files for h65 hotswap
* changes made per PR
* finally made updates per PR
* update readmes
* Update keyboards/hineybush/h65_hotswap/config.h
* Update keyboards/hineybush/h65_hotswap/rules.mk
* Update keyboards/hineybush/h65_hotswap/rules.mk
* Update keyboards/hineybush/h65_hotswap/readme.md
* Update keyboards/hineybush/h65_hotswap/info.json
* Update keyboards/hineybush/h65/rules.mk
* Update keyboards/hineybush/h65_hotswap/keymaps/default/keymap.c
* Update keyboards/hineybush/h65_hotswap/keymaps/default/keymap.c
* Update keyboards/hineybush/h65_hotswap/h65_hotswap.h
* Update keyboards/hineybush/h65_hotswap/keymaps/default/keymap.c
* Update keyboards/hineybush/h65_hotswap/keymaps/default/keymap.c
* Update keyboards/hineybush/h65/rules.mk
* Update keyboards/hineybush/h65/readme.md
* Update keyboards/hineybush/h08_ocelot/h08_ocelot.h
* Update keyboards/hineybush/h08_ocelot/keymaps/default/keymap.c
* Update keyboards/hineybush/h08_ocelot/keymaps/default/keymap.c
* Update keyboards/hineybush/h08_ocelot/keymaps/via/keymap.c
* Update keyboards/hineybush/h08_ocelot/keymaps/via/keymap.c
* Update keyboards/hineybush/h08_ocelot/readme.md
* Update keyboards/hineybush/h08_ocelot/rules.mk
* Update keyboards/hineybush/h08_ocelot/rules.mk
* Update keyboards/hineybush/h65/h65.h
* Update keyboards/hineybush/h08_ocelot/info.json
* Update keyboards/hineybush/h65/info.json
* Update keyboards/hineybush/h65/keymaps/default/keymap.c
* Apply suggestions from code review
* update jsons for default qmk config layout
* Update keyboards/hineybush/h08_ocelot/rules.mk
* Update keyboards/hineybush/h65/h65.h
* Update keyboards/hineybush/h65/info.json
* Update keyboards/hineybush/h65/keymaps/default/keymap.c
* Update keyboards/hineybush/h65_hotswap/keymaps/default/keymap.c
* Update keyboards/hineybush/h65_hotswap/keymaps/via/keymap.c
* Update keyboards/hineybush/h65_hotswap/keymaps/via/keymap.c
* Update keyboards/hineybush/h65_hotswap/keymaps/via/keymap.c
* Update keyboards/hineybush/h65_hotswap/rules.mk
* Update keyboards/hineybush/h65/config.h
2022-02-20 00:21:18 -08:00
Ryan
99b35940bc
Remove unnecessary backslash-escapes in default keymaps ( #15472 )
...
* Remove unnecessary backslash-escapes in default keymaps
* Remove unnecessary backslash-escapes in via keymaps
* Remove unnecessary backslash-escapes in default-ish keymaps
2021-12-14 12:41:16 +00:00
Ryan
a8d440e4e0
Tidy up NKRO_ENABLE rules ( #15382 )
2021-12-09 16:05:44 +11:00
Ryan
315fb6e724
Remove empty config.h from default-ish keymaps ( #15429 )
2021-12-09 16:00:55 +11:00
Joel Challis
d2ccd62b57
Remove manual enable of LTO within keyboards ( #15377 )
2021-12-02 01:05:40 +00:00
Ryan
c12b997679
Tidy up SLEEP_LED_ENABLE
rules ( #15362 )
2021-12-01 21:13:00 +11:00
James Young
84ea77ead6
Remove BOOTMAGIC_ENABLE = lite
option ( #15002 )
...
* remove BOOTMAGIC_ENABLE=lite setting
* change keyboard BOOTMAGIC_ENABLE rules
Edits keyboard-level instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`.
* change keyboard BOOTMAGIC_ENABLE inline comments
Edits keyboard-level BOOTMAGIC_ENABLE inline comments to "Enable Bootmagic Lite".
* change keymap BOOTMAGIC_ENABLE rules
Edits keymap-level instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`.
* change keymap BOOTMAGIC_ENABLE inline comments
Edits/adds keymap-level BOOTMAGIC_ENABLE inline comments to read "Enable Bootmagic Lite".
* change layout/user BOOTMAGIC_ENABLE rules/comments
Edits instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`.
Edits/adds keymap-level BOOTMAGIC_ENABLE inline comments to read "Enable Bootmagic Lite".
* update non-rules.mk BOOTMAGIC_ENABLE references in keyboards/
* remove docs references to Full Bootmagic
* convert data-driven Bootmagic Lite instances
* remove Bootmagic Lite bodge from data-driven generation
* Merge remote-tracking branch 'upstream/develop' into rm/bootmagic-full_q4a
* update docs/ja/config_options.md per mtei
* update docs/faq_misc.md per mtei
Remove remaining Full Bootmagic reference.
2021-11-05 08:18:09 +11:00
Ryan
36bc3c867e
Remove redundant UNICODE_ENABLE = no
in keyboard-level rules.mk ( #14633 )
2021-09-30 08:14:21 +10:00
James Young
6f36eb469d
Remove unused IS_COMMAND()
instances and Magic Key definitions ( #14610 )
...
* Remove unused IS_COMMAND() instances from keyboard-level config.h, 0-9
* Remove unused IS_COMMAND() instances from keyboard-level config.h, A-B
* Remove unused IS_COMMAND() instances from keyboard-level config.h, C-D
* Remove unused IS_COMMAND() instances from keyboard-level config.h, E-G
* Remove unused IS_COMMAND() instances from keyboard-level config.h, handwired
* Remove unused IS_COMMAND() instances from keyboard-level config.h, H-M
* Remove unused IS_COMMAND() instances from keyboard-level config.h, N-R
* Remove unused IS_COMMAND() instances from keyboard-level config.h, S-Z
* Remove unused Magic Key definitions from keyboard-level config.h, 0-9
* Remove unused Magic Key definitions from keyboard-level config.h, A
* Remove unused Magic Key definitions from keyboard-level config.h, B
* Remove unused Magic Key definitions from keyboard-level config.h, C
* Remove unused Magic Key definitions from keyboard-level config.h, D-E
* Remove unused Magic Key definitions from keyboard-level config.h, F-H
* Remove unused Magic Key definitions from keyboard-level config.h, handwired
* Remove unused Magic Key definitions from keyboard-level config.h, I-K
* Remove unused Magic Key definitions from keyboard-level config.h, L-M
* Remove unused Magic Key definitions from keyboard-level config.h, N-R
* Remove unused Magic Key definitions from keyboard-level config.h, S-V
* Remove unused Magic Key definitions from keyboard-level config.h, W-Z
* Merge remote-tracking branch 'upstream/master' into clean/command_and_magic
* Remove remaining unused IS_COMMAND() instances from keyboard-level config.h
2021-09-26 02:57:20 -07:00
Ryan
6b74e48f81
Remove audio pin references in rules.mk ( #14532 )
2021-09-21 20:04:03 +10:00
Ryan
574b6734af
Remove backlight pin references in rules.mk ( #14513 )
2021-09-20 16:51:00 +10:00
Ryan
5af1799735
Remove BLUETOOTH_ENABLE from keyboard-level rules.mk ( #14379 )
2021-09-12 15:27:29 +10:00
Ryan
4791cfae1a
Remove width, height and key_count from info.json ( #14274 )
2021-09-12 14:04:56 +10:00
Ryan
7eea780a7d
Remove bootloader listings from rules.mk ( #14330 )
2021-09-10 13:35:46 +10:00
Ryan
fe6d6cf76d
Remove empty override functions ( #14312 )
...
* Remove empty override functions, 0-9
* Remove empty override functions, A-D
* Remove empty override functions, E-H
* Remove empty override functions, handwired
* Remove empty override functions, I-L
* Remove empty override functions, M-P
* Remove empty override functions, Q-T
* Remove empty override functions, U-Z
2021-09-05 21:36:31 +01:00
peott-fr
872414f454
[Keymap] Add peott-fr H87 keymap ( #14232 )
2021-09-01 20:44:12 -07:00
James Young
4b453dca92
Remove MIDI Configuration boilerplate ( #11151 )
...
* remove keyboard-level instances of `MIDI_ENABLE = no`
Command:
```
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e '/^[ #]*MIDI_ENABLE[ \t]*=[ \t]*no/d' {} +
```
Co-Authored-By: Nick Brassel <nick@tzarc.org>
* fix case-sensitivity issues on MIDI_ENABLE
Change instances of `MIDI_ENABLE = YES` to `MIDI_ENABLE = yes`.
Command:
```
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;MIDI_ENABLE[ \t]*=[ \t]*[Yy][Ee][Ss];MIDI_ENABLE = yes;g' {} +
```
* replace `# MIDI controls` with `# MIDI support`
Replace `# MIDI controls` with `# MIDI support` in keyboard-level `rules.mk` files.
Command:
```
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;#[ \t]*MIDI[ \t]*\(controls\|support\).*;# MIDI support;g' {} +
```
* align inline comments
Aligns the inline comments to the length used by the QMK AVR rules.mk template.
Command:
```
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;MIDI_ENABLE *= *yes.*;MIDI_ENABLE = yes # MIDI support;g' {} +
```
* remove commented instances of `MIDI_ENABLE` from keyboard `rules.mk` files
Commands:
```
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;#\([ \t]*MIDI_ENABLE\) = yes; \1 = no ;' {} +
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;^\([ \t]*\)\(MIDI_ENABLE = no\);\2\1;' {} +
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e '/^[ #]\+MIDI_ENABLE *= *no/d' {} +
```
* remove MIDI configuration boilerplate from keyboard config.h files
Co-authored-by: Nick Brassel <nick@tzarc.org>
2021-08-16 06:51:13 +10:00
James Young
a03aa301de
Remove Full Bootmagic ( #13846 )
...
* disambiguate Bootmagic rules in keymaps
The files edited by this commit were added at a point in time where `BOOTMAGIC_ENABLE = yes` enabled full Bootmagic.
This commit edits the files to specify that full Bootmagic is intended.
* remove BOOTMAGIC_ENABLE=full setting
* unify commented BOOTMAGIC_ENABLE rules in keyboards
Explicitly sets `BOOTMAGIC_ENABLE = no` in keyboards where the rule was commented out.
Command:
```
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;#[ \t]*\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-zA-Z]\+\).*;\1 = no # Virtual DIP switch configuration;g' {} +
```
* remove commented Bootmagic rules from keymap/user level
Command:
```
find keyboards/ layouts/ users/ -type f -name 'rules.mk' -exec sed -i -e '/#.*\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*/d' {} +
```
* update keyboard BOOTMAGIC_ENABLE rule formatting
Sets the formatting of BOOTMAGIC_ENABLE rules to `BOOTMAGIC_ENABLE = [value]`, without the inline comments (which will be replaced later).
Command:
```
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*;\1 = \2;g' '{}' +
```
* update keyboards' BOOTMAGIC_ENABLE settings
Updates keyboard `rules.mk` files to use `BOOTMAGIC_ENABLE = lite` where `BOOTMAGIC_ENABLE = full` was being used.
Command:
```
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = \)full;\1lite;g' '{}' +
```
* update keymap/user BOOTMAGIC_ENABLE settings
Updates keymap/user `rules.mk` files to use `BOOTMAGIC_ENABLE = lite` where `BOOTMAGIC_ENABLE = full` was being used.
Commands:
```
find keyboards/ -type f -name 'rules.mk' -and -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE[ \t=]\+\)full;\1lite;g' '{}' +
find layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE[ \t=]\+\)full;\1lite;g' '{}' +
```
* remove and replace inline comments in keyboards and keymap/user files
Removes and replaces the inline comments, which have been updated to read `Enable Bootmagic Lite`.
Commands:
```
find keyboards/ -type f -name 'rules.mk' -and -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*;\1 = \2;g' '{}' +
find layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*;\1 = \2;g' '{}' +
find keyboards/ layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = lite\);\1 # Enable Bootmagic Lite;g' '{}' +
find keyboards/ layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = yes\);\1 # Enable Bootmagic Lite;g' '{}' +
find keyboards/ layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = no\);\1 # Enable Bootmagic Lite;g' '{}' +
```
* rename improperly named makefiles
Some files intended to be used as makefiles had improper names causing them to not be used as intended when building.
This commit corrects the filenames of the affected files.
* update renamed file with new rule formatting
* update QMK's template files
Updates QMK's `rules.mk` templates to use the new inline comment.
* update QMK Docs
- remove documentation of full Bootmagic
- update links to Bootmagic Lite doc
- add doc for Magic Keycodes
* rules.mk patch for coarse/ixora and coarse/vinta
2021-08-06 23:59:56 -07:00
Xelus22
b73a29aaea
[Bug] Develop - Change uint32_t to layer_state_t ( #13596 )
...
* fix sat75
* update uint32_t to layer_state
2021-07-19 09:50:55 -07:00
Ryan
44260c3414
Remove API_SYSEX_ENABLE
s from rules.mk ( #13389 )
2021-06-30 23:30:42 -07:00
Drashna Jaelre
7161d65070
Remove FAUXCLICKY feature (deprecated) ( #11829 )
2021-02-09 09:49:05 -08:00
fauxpark
be897cbc2f
Merge remote-tracking branch 'upstream/master' into develop
2021-01-27 17:39:20 +11:00
Ryan
6937f1d70e
Remove MIDI_ENABLE_STRICT
from keyboards' config.h ( #11679 )
2021-01-27 17:26:26 +11:00
Nick Brassel
9e18f41fcf
Merge remote-tracking branch 'upstream/master' into develop
2021-01-20 10:00:28 +11:00
Ryan
62f304a225
Remove DESCRIPTION
, H-J ( #11616 )
2021-01-20 00:38:12 +11:00
Zach White
959f566118
comment out a non-standard DIODE_DIRECTION
2021-01-08 08:40:23 -08:00
Ryan
f440111b4b
Fix titan60 and h660 error_log complaints ( #11124 )
2020-12-09 19:03:51 +11:00
Joel Challis
f00402a2f3
Refactor to use led config - Part 3 ( #10966 )
...
* Refactor to use led config
* Refactor to use led config
* Refactor to use led config
* Refactor to use led config
2020-11-18 17:51:53 +00:00
Josh Hinnebusch
45e16fd543
[Keyboard] h660s by hineybush ( #10221 )
...
* add h660s
* add via support to h660s
* update readme
* Update keyboards/hineybush/h660s/keymaps/via/readme.md
* Update keyboards/hineybush/h660s/keymaps/via/keymap.c
* Update keyboards/hineybush/h660s/keymaps/via/keymap.c
* Update keyboards/hineybush/h660s/h660s.h
* Update keyboards/hineybush/h660s/h660s.h
* Update keyboards/hineybush/h660s/h660s.h
* Update keyboards/hineybush/h660s/h660s.h
* Update keyboards/hineybush/h660s/h660s.h
* Update keyboards/hineybush/h660s/keymaps/default/keymap.c
* Update keyboards/hineybush/h660s/keymaps/default/keymap.c
* Update keyboards/hineybush/h660s/keymaps/via/keymap.c
* Update keyboards/hineybush/h660s/keymaps/via/keymap.c
* Update keyboards/hineybush/h660s/readme.md
* Update keyboards/hineybush/h660s/readme.md
* Update keyboards/hineybush/h660s/keymaps/default/keymap.c
* Update keyboards/hineybush/h660s/keymaps/default/keymap.c
* Update keyboards/hineybush/h660s/info.json
* Update keyboards/hineybush/h660s/h660s.h
* Update keyboards/hineybush/h660s/h660s.h
* Update keyboards/hineybush/h660s/h660s.h
2020-11-14 19:23:58 -08:00
James Young
78d5224a1d
Remove HD44780 References, Part 3 ( #10238 )
...
* remove HD44780_ENABLE rules: G-H
* remove HD44780_ENABLE config: G-H
2020-09-07 22:28:18 -07:00
Josh Hinnebusch
744940bbd9
hineybush/h88: update h88 LED stuff ( #10101 )
...
* update h88.c
* Update keyboards/hineybush/h88/h88.c
2020-09-01 09:05:03 -07:00
Drashna Jaelre
92385b3fb6
Better handle LTO_ENABLE ( #9832 )
...
* Better handle LTO_ENABLE
Especially when calling from command line
* Replace LINK_TIME_OPTIMIZATION_ENABLE with LTO_ENABLE
* Remove long for LTO from show_options.mk
2020-08-29 14:30:02 -07:00
Josh Hinnebusch
297bda1c1f
add num lock indicator functionality to hineybush/h10 ( #10100 )
...
* add num lock indicator functionality to h10
* Update keyboards/hineybush/h10/h10.c
2020-08-24 14:55:49 -07:00