megamanmalte/qmk_firmware
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
26044 commits 1 branch 0 tags 275 MiB
Commit graph

1574 commits

Author SHA1 Message Date
QMK Bot 94aaf38177 Merge remote-tracking branch 'origin/master' into develop 2023-06-12 19:08:59 +00:00
Joe Scotto 2d838d8ba9
[Keyboard] Add ScottoFrog macropad (#21209) 2023-06-12 13:08:13 -06:00
QMK Bot f830b53a7a Merge remote-tracking branch 'origin/master' into develop 2023-06-11 07:56:32 +00:00
Joe Scotto fdb2851187
[Keyboard] Add ScottoSplit Keyboard (#20945) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2023-06-11 01:56:20 -06:00
QMK Bot 1fcb9a0228 Merge remote-tracking branch 'origin/master' into develop 2023-06-11 07:53:05 +00:00
Joe Scotto 1914fbd951
[Keyboard] Add Scotto9 handwired macropad (#21105) 
Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2023-06-11 01:52:24 -06:00
Duncan Sutherland cf6c92426d
[Keyboard] correct and modernise dactyl_manuform/6x7 variant (#21176) 2023-06-11 01:48:56 -06:00
QMK Bot b9d78e4828 Merge remote-tracking branch 'origin/master' into develop 2023-06-09 23:49:38 +00:00
Joe Scotto a875f7f038
[Keyboard] Add ScottoGame Keyboard (#20940) 2023-06-09 17:48:55 -06:00
QMK Bot 9a6056d09c Merge remote-tracking branch 'origin/master' into develop 2023-06-08 01:47:47 +00:00
NortonTech d042b92e7a
Add NortonTech handwired keypad (NortonTechPad) (#21148) 2023-06-08 02:47:06 +01:00
QMK Bot 6c9c9489d2 Merge remote-tracking branch 'origin/master' into develop 2023-06-06 05:46:59 +00:00
Joe Scotto 97014f0722
[Keyboard] Add Scotto36 handwired keyboard (#21104) 
Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>
 2023-06-05 23:46:21 -06:00
QMK Bot f61abde116 Merge remote-tracking branch 'origin/master' into develop 2023-06-06 05:43:14 +00:00
Joe Scotto eaef139fc3
[Keyboard] Add Scotto40 handwired keyboard (#21103) 2023-06-05 23:42:27 -06:00
QMK Bot 5b3e41c1ca Merge remote-tracking branch 'origin/master' into develop 2023-06-06 05:35:05 +00:00
Joe Scotto e1c4b7ce30
[Keyboard] Add ScottoStarter handwired keyboard (#21101) 2023-06-05 23:34:28 -06:00
Ryan c9cf9712aa
Move RGBLED_SPLIT to data driven (#21113) 
Co-authored-by: Joel Challis <git@zvecr.com>
 2023-06-06 11:08:04 +10:00
Ryan a4ed6ad0f5
Unicodemap keycodes rename (#21092) 2023-06-01 17:25:08 +01:00
Drashna Jaelre 3a3e5abac9
[Keymap] Drashna Keymap updates for 0.21.0 (#21073) 2023-05-31 11:44:06 -07:00
nuess0r f98f8eedf0
Consolidate modelm v2 (#14996) 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
 2023-05-27 23:12:36 +10:00
Ryan 363bfdbfda
Move RGBLIGHT_LIMIT_VAL to data driven (#20974) 
Co-authored-by: Nick Brassel <nick@tzarc.org>
 2023-05-27 12:27:44 +10:00
Duncan Sutherland d1395ca4d5
add additional layouts to dactyl_manuform variants (#20688) 2023-05-20 22:06:53 +10:00
Nick Brassel 5faa23d54c
Keymap introspection for combos. (#19670) 2023-05-15 22:27:37 +10:00
Joel Challis 4ae45ca995
Tidy up encoder_map directions (#20847) 2023-05-10 22:55:49 +01:00
Ryan c3c51231cc
Clean up trailing commas from info.json (#20812) 2023-05-09 17:52:03 +10:00
Ryan 578102b400
Fix test_json2c_no_json() (#20756) 2023-05-06 14:00:27 +01:00
Ryan 108ad0929c
Escape Unicode characters in info.json (#20698) 2023-05-05 09:28:17 +10:00
Ryan ef6a712899
Even more info.json whitespace cleanups (#20703) 2023-05-04 19:09:59 +10:00
Ryan fb48db4c8f
Remove more junk files and scripts (#20682) 2023-05-03 12:24:37 +10:00
Ryan a5e46d8082
More info.json whitespace cleanups (#20665) 2023-05-03 12:19:34 +10:00
James Young 3ab3101b28
Wakizashi40 Handwired Touch-Up (#20671) 
* info.json: correct layout data

* info.json: apply friendly formatting

* rename LAYOUT_all to LAYOUT

Only one layout is supported. Alias is maintained for backward compatibility.
 2023-05-02 12:59:17 -07:00
Drashna Jaelre f973cb3ce4
[Keyboard] Fix ws2812 pin for phantagom boards (#20670) 2023-05-02 18:16:37 +10:00
QMK Bot ac6615786c Merge remote-tracking branch 'origin/master' into develop 2023-05-02 03:28:42 +00:00
Dennis Kruyt 9b41e8168d
[Keyboard] add phantagom/baragon marcopad (#20543) 
Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Tom Barnes <barnestom@me.com>
 2023-05-01 20:28:05 -07:00
QMK Bot e3a6dfcdd2 Merge remote-tracking branch 'origin/master' into develop 2023-05-02 03:20:41 +00:00
Dennis Kruyt e206a1684e
[Keyboard] add phantagom/varan rgb numpad (#20587) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2023-05-01 20:20:02 -07:00
James Young 9d4edcdfeb
Koalafications Handwired Layout Macro Additions (#20662) 
* add matrix_diagram.md

* info.json: apply friendly formatting

* rename LAYOUT_all to LAYOUT_ansi_split_bs

* add LAYOUT_ansi

* add LAYOUT_ansi_rwkl_split_bs

* add LAYOUT_ansi_rwkl
 2023-05-02 08:32:22 +10:00
Ryan 79aa319946
info.json whitespace cleanups (#20651) 2023-05-02 08:25:15 +10:00
James Young 1ab355802f
Bebol Handwired Layout Macro Additions (#20660) 2023-05-01 15:01:40 -07:00
James Young f839d25135
split_65 Handwired Layout Macro Addition and Touch-Up (#20659) 2023-05-01 15:01:21 -07:00
James Young 3e4f64147c
Glacier Handwired Layout Macro Addition and Touch-Up (#20661) 2023-05-01 14:56:43 -07:00
James Young 23423830a9
The Galleon Handwired Layout Macro Additions (#20663) 2023-05-01 14:56:23 -07:00
James Young bb85574630
Cyberstar Handwired Layout Macro Additions (#20658) 
* add matrix_diagram.md

* info.json: apply friendly formatting

* add LAYOUT_625u_space_split_bs

* add LAYOUT_625u_space

* rename LAYOUT_all to LAYOUT_split_space_split_bs

* add LAYOUT_split_space
 2023-05-01 14:53:02 -07:00
Ryan 2944e93870
Move USB_MAX_POWER_CONSUMPTION to data driven (#20648) 2023-05-01 17:37:12 +10:00
Ryan 12d42cedd2
Move FORCE_NKRO to data driven (#20604) 2023-05-01 13:33:10 +10:00
Ryan 998a4d744e
Remove FLIP_HALF layouts and move to data driven (#20588) 2023-04-30 01:51:45 +10:00
Ryan 4d8dd55bf9
Move 60% layouts to data driven (#20477) 2023-04-27 07:49:03 +10:00
Ryan 4871f651c5
Move remaining LAYOUT_alls to data driven (#20463) 2023-04-27 07:45:43 +10:00
Ryan f111bea3cd
Move miscellaneous layouts to data driven (#20516) 2023-04-25 02:38:35 +10:00
Ryan 798cbfe6a3
Fix info.json LTO and format encoder definitions (#20456) 2023-04-15 23:37:24 -06:00
Nick Brassel c9f619124d
Encodermap direction define. (#20454) 2023-04-15 16:18:44 +01:00
Ryan 0ddb7d7863
Move single 60_ansi, 60_hhkb and 60_iso layouts to data driven (#20438) 2023-04-15 21:09:08 +10:00
Ryan 172a40686b
Move single LAYOUT_alls to data driven (#20430) 2023-04-15 21:08:15 +10:00
Ryan a84528f853
Move remaining LAYOUTs to data driven (#20422) 2023-04-15 21:07:32 +10:00
Ryan 54634e9263
Fix some missing QMK_KEYBOARD_H includes in user keymaps (#20417) 2023-04-14 19:42:50 +10:00
Ryan 5bd68e3695
Move single LAYOUTs to data driven (#20365) 2023-04-12 13:42:51 +10:00
Ryan 441988ef38
Move default layouts to data driven (#20349) 2023-04-08 20:50:50 +10:00
Ryan fd6449e42c
Move split space/backspace layouts to data driven (#20356) 2023-04-08 19:27:11 +10:00
Ryan 522048725f
Move RGB_MATRIX_DRIVER to data driven (#20350) 2023-04-08 18:08:08 +10:00
Ryan 47966dc2a6
Migrate rgblight.pin and RGB_DI_PIN to ws2812.pin (#20303) 2023-04-06 18:00:54 +10:00
Stefan Kerkmann 73b376a881
[Chore] Remove stray mod tap interrupt defines and per key functions (#20347) 
* Remove stray defines and per key functions

* Remove defunct get_ignore_mod_tap_interrupt declaration
 2023-04-06 00:04:23 +01:00
Ryan 8bb4cba7b0
Move TKL layouts to data driven (#20337) 2023-04-05 15:53:45 +10:00
Ryan 09a2b70a66
Move Alice and Ergodox layouts to data driven (#20340) 2023-04-05 15:50:56 +10:00
Ryan 364c06d939
Move small macropad-ish layouts to data driven (#20341) 2023-04-05 15:46:59 +10:00
Ryan 7bfc2a367d
Move 65% layouts to data driven (#20308) 2023-04-04 15:20:10 +10:00
Ryan 976317df3c
Move fullsize layouts to data driven (#20317) 2023-04-04 14:39:20 +10:00
Ryan b463ceb9dc
Move TKL F13 and FRL layouts to data driven (#20310) 2023-04-04 14:29:50 +10:00
jack 36ab0c0aaa
Add core/fallback encoder behaviour (#20320) 2023-04-03 10:18:17 -06:00
Ryan 2d9140af53
Fix a handful of CLI errors (#20321) 2023-04-03 15:50:31 +10:00
precondition 1899793f27
Make IGNORE_MOD_TAP_INTERRUPT the default behaviour for mod-taps (#20211) 2023-04-03 15:32:47 +10:00
fauxpark bc77e79ed8 Merge remote-tracking branch 'upstream/master' into develop 2023-04-03 14:41:26 +10:00
Sergey Vlasov 2d7240f730
onekey: Fix console output on AVR (#19930) 2023-04-03 14:28:12 +10:00
Johannes H. Jensen 68efea70b2
Add direction to dynamic_macro_record_start_user (#19689) 2023-04-03 13:01:07 +10:00
QMK Bot 3ec37f4d55 Merge remote-tracking branch 'origin/master' into develop 2023-04-03 00:07:20 +00:00
andi4000 ac9f9f9efb
ISO-DE Keymap for Dactyl Manuform 6x7 (#19441) 2023-04-03 10:06:40 +10:00
Ryan 9359504255
Move 66% and 68% layouts to data driven (#20293) 2023-04-01 13:13:18 +11:00
Ryan e40b6ca3b0
Move split layouts to data driven (#20290) 2023-04-01 13:09:53 +11:00
Ryan 647c2835e6
WS2812 driver improvements (#20262) 2023-03-30 12:21:02 +11:00
Nick Brassel 836ffabc3d
Merge remote-tracking branch 'upstream/master' into develop 2023-03-30 08:37:24 +11:00
Maverick0197 d0c36a7683
[Keyboard] Add KeyDeck8 (#20107) 
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2023-03-29 13:13:05 -07:00
Ryan 4869b8061c
Move ortho & numpad layouts to data driven (#20183) 
Co-authored-by: Nick Brassel <nick@tzarc.org>
 2023-03-29 15:54:34 +11:00
Ryan 06664e8a94
Fix layouts containing keys with multiple matrix positions (#20191) 2023-03-29 15:47:59 +11:00
Joel Challis 79b0f9168e
Custom keycodes in JSON (#19925) 2023-03-27 20:01:07 +01:00
Ryan 36ce81df59
Move WS2812_DRIVER to data driven (#20248) 2023-03-26 18:22:12 +11:00
Ryan 1e07ff1fb1
Fix some more missing #pragma onces (#20241) 2023-03-23 17:21:37 +00:00
Ryan ad625e7c06
Remove RGB_DI_PIN ifdefs (#20218) 2023-03-23 21:38:01 +11:00
Drashna Jael're 73f4718f16
Merge remote-tracking branch 'origin/master' into develop 2023-03-23 01:41:42 -07:00
jotix 8cd78b392f
[Keyboard] Add via support for jotanck keyboard (#20146) 
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2023-03-22 21:38:35 -07:00
Ryan 65a80f411f
Clean up APA102 config and add DD mapping (#20159) 2023-03-20 08:12:19 +11:00
Nick Brassel 9d302f9b7f
Fixup CI build for F103C6 onekey. (#20188) 2023-03-19 20:33:21 +00:00
Ryan d8aec71e48
Remove trailing zeroes in info.json layouts (#20156) 2023-03-17 14:21:53 +00:00
Ryan 02ccc50e60
Remove more empty headers (#20155) 2023-03-17 14:02:04 +11:00
Ryan 9dbee3e23d
Remove useless "ifdef KEYBOARD_*" (#20078) 
Co-authored-by: Nick Brassel <nick@tzarc.org>
 2023-03-16 20:18:33 +11:00
Ryan cf5e9d172d
Fix layout macro keys with no matrix position (#20033) 2023-03-13 23:02:03 +11:00
Ryan 9e2ef5078a
Adjust offset for some layouts (#20075) 2023-03-13 22:22:20 +11:00
Ryan 20dca46924
Remove pointless USE_I2C blocks in keyboard headers (#20084) 2023-03-10 16:00:30 +00:00
Ryan 76cc7fe109
Move matrix config to info.json, part 6 (#20019) 2023-03-11 00:32:05 +11:00
QMK Bot 961f2d503f Merge remote-tracking branch 'origin/master' into develop 2023-03-10 09:21:48 +00:00
Kuribayashi Atsushi 24bf0dfb37
[Keyboard] Add tsubasa keyboard (#19352) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: jack <0x6a73@protonmail.com>
 2023-03-10 01:20:37 -08:00
QMK Bot 3b67310bef Merge remote-tracking branch 'origin/master' into develop 2023-03-10 07:53:16 +00:00
Paul Enrico N. Viola 3b89fb61e8
[Keyboard] update matrix pins for Polly40 (#20002) 2023-03-09 23:52:36 -08:00
Joel Challis 5edf41da60
Remove empty rules.mk from keymaps (#20056) 2023-03-08 03:34:41 +00:00
QMK Bot 725a9f66e3 Merge remote-tracking branch 'origin/master' into develop 2023-03-06 19:39:51 +00:00
Dmitry Nosachev c8237a7691
[Keyboard] Sejin EAT-1010R2 keyboard (#19809) 
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: jack <0x6a73@protonmail.com>
 2023-03-06 11:39:13 -08:00
Joel Challis 3be5d90b6d
Remove some use of keymap.h (#20006) 2023-03-03 17:50:40 +00:00
QMK Bot c9b49cd83b Merge remote-tracking branch 'origin/master' into develop 2023-03-01 17:06:15 +00:00
Paul Enrico N. Viola aeb3ed64c3
added Polly40 keyboard (#19936) 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: jack <0x6a73@protonmail.com>
 2023-03-01 10:05:36 -07:00
QMK Bot 184c1e5187 Merge remote-tracking branch 'origin/master' into develop 2023-02-28 19:15:33 +00:00
Drashna Jaelre 051401175d
[Keymap] Drashna updates for 0.20.0 (#19960) 2023-02-28 11:14:48 -08:00
Ryan 7a8265247b
Remove "w":1 and "h":1 from info.json (#19961) 2023-02-28 15:06:11 +00:00
Ryan 7e0299117b
Move encoder config to data driven (#19923) 
Co-authored-by: Nick Brassel <nick@tzarc.org>
 2023-02-26 09:45:12 +11:00
Ryan 314f6c1ddb
Move backlight config to data driven (#19910) 2023-02-26 08:37:57 +11:00
Joel Challis 961f0b7b2d
Reallocate SAFE_RANGE (#19909) 2023-02-23 09:49:07 +11:00
Ryan ea77246865
Migrate some more layouts to data driven (#19889) 2023-02-23 09:32:18 +11:00
Ryan 3bf01bb9ed
Move QMK LUFA bootloader config to data driven (#19879) 2023-02-23 09:20:23 +11:00
Nick Brassel 7f805cc779
VIA Protocol 12 + fixes (#19916) 
Co-authored-by: Wilba <wilba@wilba.tech>
Co-authored-by: zvecr <git@zvecr.com>
 2023-02-23 09:19:00 +11:00
Ryan 26854f5940
Remove default and unused BACKLIGHT_LEVELS (#19898) 2023-02-22 01:12:42 +00:00
Ryan 499fc3b85e
Add some missing #pragma onces (#19902) 2023-02-21 15:55:23 +00:00
Ryan 9c0ce80d7e
Move backlight config to data driven, part 1 (#19887) 2023-02-21 12:05:40 +11:00
Ryan e837a32b2b
Move layouts for direct_pins boards to data driven (#19872) 2023-02-19 18:55:12 +11:00
Ryan 86885ecbcc
Fix more build failures (#19869) 2023-02-18 02:21:00 +11:00
Ryan 8f6c228adb
Move SOFT_SERIAL_PIN to data driven (#19863) 2023-02-17 16:40:49 +11:00
Ryan 2da0827d4f
Remove matrix size defines (#19581) 2023-02-17 16:08:25 +11:00
Ryan f4ba17c4a0
Move LED indicator config to data driven (#19800) 2023-02-17 13:14:29 +11:00
Ryan d784f78bd0
Move Bootmagic config to data driven (#19860) 2023-02-17 08:49:49 +11:00
Ryan 7fad94ba2d
Remove unused RGBLight defines from config.h (#19859) 2023-02-17 08:13:41 +11:00
Ryan 2cdf99ae95
Migrate DIRECT_PINS to data driven (#19826) 2023-02-14 00:39:41 -07:00
Dasky 74770ac79b Merge branch 'master' into develop 2023-02-14 03:05:44 +00:00
jack ef881364d4
Fixup swiftrax/bumblebee (reduce firmware size) (#19834) 2023-02-13 17:11:43 +11:00
Ryan bbf7a20b33
Refactor Leader key feature (#19632) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2023-02-13 03:19:02 +11:00
Joel Challis 11d49d00e7
Remove matrix_init_quantum/matrix_scan_quantum (#19806) 2023-02-11 03:47:17 +00:00
QMK Bot 61009c506b Merge remote-tracking branch 'origin/master' into develop 2023-02-10 17:29:34 +00:00
kpagratis b444e82985
[Keyboard] Add Dactyl 6x5 68 keys (#18679) 2023-02-10 10:28:39 -07:00
Ryan ccb6c908dd
Remove SOFT_SERIAL_PIN for non-split boards (#19774) 
* Remove `SOFT_SERIAL_PIN` for non-split boards

* Delete more empty config.h
 2023-02-08 23:57:42 +00:00
Ryan f9aeea64c1
Migrate MCU and BOOTLOADER to data-driven (#19529) 2023-02-08 18:41:46 +11:00
Ryan 8d6bf19fc7
Remove unused SOFT_SERIAL_PIN from config.h (#19768) 2023-02-07 14:46:51 +00:00
Ryan 11b6bb8179
Remove unused Bootmagic row/col defines from config.h (#19761) 2023-02-07 00:05:37 +00:00
Ryan a988f8a169
Remove unused GRAVE_ESC_CTRL_OVERRIDE from config.h (#19752) 2023-02-06 02:40:23 +00:00
Ryan f0618a1d53
Remove IS_HOST_LED_ON and migrate usages (#19753) 2023-02-06 02:36:09 +00:00
Ryan 53b7dbe671
Remove unused LOCKING_SUPPORT_ENABLE from config.h (#19748) 2023-02-05 20:26:45 +00:00
Ryan ebb512db82
Debounce defines cleanup (#19742) 
* Clean up `DEBOUNCE` in config.h, 0-9

* Clean up `DEBOUNCE` in config.h, A

* Clean up `DEBOUNCE` in config.h, B

* Clean up `DEBOUNCE` in config.h, C

* Clean up `DEBOUNCE` in config.h, D

* Clean up `DEBOUNCE` in config.h, E

* Clean up `DEBOUNCE` in config.h, F

* Clean up `DEBOUNCE` in config.h, G

* Clean up `DEBOUNCE` in config.h, H

* Clean up `DEBOUNCE` in config.h, handwired

* Clean up `DEBOUNCE` in config.h, I

* Clean up `DEBOUNCE` in config.h, J

* Clean up `DEBOUNCE` in config.h, K

* Clean up `DEBOUNCE` in config.h, L

* Clean up `DEBOUNCE` in config.h, M

* Clean up `DEBOUNCE` in config.h, N

* Clean up `DEBOUNCE` in config.h, O

* Clean up `DEBOUNCE` in config.h, P

* Clean up `DEBOUNCE` in config.h, Q

* Clean up `DEBOUNCE` in config.h, R

* Clean up `DEBOUNCE` in config.h, S

* Clean up `DEBOUNCE` in config.h, T

* Clean up `DEBOUNCE` in config.h, U

* Clean up `DEBOUNCE` in config.h, V

* Clean up `DEBOUNCE` in config.h, W

* Clean up `DEBOUNCE` in config.h, X

* Clean up `DEBOUNCE` in config.h, Y

* Clean up `DEBOUNCE` in config.h, Z

* Remove default debounce from info.json

* Migrate non-default debounce to info.json
 2023-02-03 19:19:58 +00:00
Ryan f20a05440e
Remove unused MATRIX_HAS_GHOST from config.h (#19726) 2023-02-03 00:04:10 +00:00
QMK Bot 1c772eb618 Merge remote-tracking branch 'origin/master' into develop 2023-02-01 17:27:17 +00:00
a_marmot ca8b4b8e30
[Keyboard] Add modded Razer Orbweaver with RP2040 (#19711) 
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
 2023-02-01 10:26:37 -07:00
Ryan b867522f8c
Clean up Force NKRO in config.h (#19718) 2023-01-30 20:45:41 +00:00
Nick Brassel f6dd8dea2e
Remove usages of config_common.h from config.h files. (#19714) 2023-01-31 06:03:30 +11:00
fauxpark ef6505ad75 Merge remote-tracking branch 'upstream/master' into develop 2023-01-30 18:55:36 +11:00
Ryan 043d8e1140
Remove deprecated Quantum keycodes (#19712) 2023-01-29 16:44:16 +00:00
Ryan b727434391
Remove commented out backlight config & stray "backlight levels" (#19703) 2023-01-28 15:42:44 +00:00