1
0
Fork 0
Commit graph

11908 commits

Author SHA1 Message Date
Salicylic-acid3
c23b73530f [Keyboard] Add keyboard Getta25 (#7497)
* [Keyboard] Add keyboard Getta25

Add Getta25 keyboard.

A 25 keys Tenkey.
Salicylic-acid3

* Update keyboards/getta25/info.json

* Update keyboards/getta25/readme.md

* Update keyboards/getta25/readme.md

* Update keyboards/getta25/readme.md

* Update keyboards/getta25/info.json

* Update keyboards/getta25/info.json

* Update keyboards/getta25/info.json

* Update keyboards/getta25/info.json

* Update keyboards/getta25/keymaps/oled/glcdfont.c

* Update keyboards/getta25/keymaps/oled/glcdfont.c

* Keymap Update

Remove unnecessary code blocks

* Update keyboards/getta25/keymaps/oled/keymap.c

* Update keyboards/getta25/keymaps/oled/keymap.c

* Update keyboards/getta25/keymaps/oled/keymap.c
2020-01-20 14:40:33 -08:00
clovervidia
61dbb92679 Invert Num Lock LED state (#7945) 2020-01-20 10:49:15 -08:00
QMK Bot
e3d59a72f9 format code according to conventions [skip ci] 2020-01-20 18:48:28 +00:00
Wilba
484a9b12bc Add VIA support for QMK backlight, QMK RGBLight (#7911)
* Add VIA support for QMK backlight, QMK RGBLight

* clang-format changes
2020-01-20 10:18:25 -08:00
Akaash Suresh
ce81c4f89b curry layout (#7943) 2020-01-20 11:59:55 -05:00
fauxpark
ef8a4e5aaf Remove all references to "CUSTOM_MATRIX" as a diode direction (#7937) 2020-01-19 23:05:51 -08:00
Erovia
1f86e8ae9a Fix attribute heritance for long commands.
This is needed for inheritance to work with commands that have dashes in
their names.
2020-01-19 21:29:36 -08:00
Erovia
e7f6e90a22 Fix commandline arg merging, small improvements
Commandline args should be merged with the submodule's config.
Compare config values to None instead of False, so empty lines and False
can be used as values.
2020-01-19 21:29:36 -08:00
Erovia
20290a1cff MILC: Fix/complete attribute heritance
If an undefined attribute of a submodule is accessed, fall back to
same attribute of the submodule's parent.
2020-01-19 21:29:36 -08:00
Spaceman
80d329bb55 [Keyboard] Addition Eagle II keyboard (#7927)
* add EagleII Keyboard

* Update eagleii.c

* Update eagleii.h

* Update keymap.c

* Update eagleii.h

* Update keymap.c

* Update keyboards/handwired/eagleii/config.h

* Update keyboards/handwired/eagleii/config.h

* Update keyboards/handwired/eagleii/rules.mk

* Update config.h

* Update rules.mk

* Update eagleii.h

* Update eagleii.h

* Update keymap.c

* Update info.json

* Update keyboards/handwired/eagleii/rules.mk

* Update keyboards/handwired/eagleii/rules.mk

* Create readme.md

* Update keyboards/handwired/eagleii/readme.md

* Update keyboards/handwired/eagleii/config.h

* Update keyboards/handwired/eagleii/readme.md

* Update keyboards/handwired/eagleii/readme.md
2020-01-19 18:07:30 -08:00
Maarten Dekkers
251a69ea3d [Keyboard] Add mx5160 keyboard (#7142)
* Add mx5160 keyboard

* Make necessary changes for merging

rules.mk cleanup, QMK's built in alias for KC_TRNS and change readme blurb

* Add info.json as well

* Update readme, info.json

* Change layout name, update led function

* Fix info.json

* Update rules.mk
2020-01-19 16:23:03 -08:00
fauxpark
31c0fe69f6 [Docs] Misc cleanups for OLED documentation (#7864) 2020-01-19 14:05:54 -08:00
Joel Challis
65f7bfcc8d Fix unknown key 'IndentPPDirectives' on CI (#7933) 2020-01-19 13:59:57 -08:00
Rossman360
4da241968c [Keyboard] Rebound keyboard add (#7886)
* create Rebound keyboard

* proofread

* update decade

* layer enums

* revert enum layer changes

* line spacing and such

* product ID and punctuation

* terminating terminating slashes

* layer enums

* remove slashes

* rules change, rgb and spacing

* plural layouts rgb rulez
2020-01-19 13:08:09 -08:00
Rossman360
dd2b793c0c [Keyboard] Rebound keyboard add (#7886)
* create Rebound keyboard

* proofread

* update decade

* layer enums

* revert enum layer changes

* line spacing and such

* product ID and punctuation

* terminating terminating slashes

* layer enums

* remove slashes

* rules change, rgb and spacing

* plural layouts rgb rulez
2020-01-19 13:07:34 -08:00
Takuya Urakawa
ef33befa06 [Keyboard] Add Tartan keyboard (#7917)
* first commit

* update keymap and key layout

* Update for release

* Update keyboards/tartan/config.h

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

* Update keyboards/tartan/info.json

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

* Update keyboards/tartan/info.json

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

* Update keyboards/tartan/info.json

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

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

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

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

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

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

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

* Update keyboards/tartan/keymaps/test/keymap.c

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

* Update keyboards/tartan/keymaps/test/keymap.c

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

* Delete tartan/keymaps/test

* Update keyboards/tartan/readme.md

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

* Update keyboards/tartan/readme.md

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

* Delete tartan/keymaps/default/config.h

* Update keyboards/tartan/readme.md

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

* Update keyboards/tartan/rules.mk

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

* Update keyboards/tartan/rules.mk

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

* Delete unneccesary settings

* Fix tartan/rules.mk

* Delete unnecessary code from tartan.c

* Rearrange layout order in tartan.h

* Update keyboards/tartan/usbconfig.h

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/tartan/usbconfig.h

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update usb config

* Update keyboards/tartan/usbconfig.h

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Delete unused defines

* Update keyboards/tartan/usbconfig.h

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/tartan/usbconfig.h

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/tartan/usbconfig.h

Co-Authored-By: fauxpark <fauxpark@gmail.com>

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: fauxpark <fauxpark@gmail.com>
2020-01-19 10:54:04 -08:00
fauxpark
2bddfb986d Remove tmk_core gitignore and gitmodules 2020-01-19 10:52:29 -08:00
Joel Challis
667045b492
Run clang-format manually to fix recently changed files (#7934)
* Run clang-format manually to fix recently changed files

* Run clang-format manually to fix recently changed files - revert template files

* Run clang-format manually to fix recently changed files - format off for ascii_to_keycode_lut
2020-01-19 16:30:34 +00:00
fauxpark
f5209aa4e9 Remove custom backlight code for PS2AVRGB boards (#7775)
* Remove custom backlight code for PS2AVRGB boards

* Remove custom driver setting

* BACKLIGHT_BREATHING goes in config.h, not here

* Don't need to include backlight.c again here either

* Turn on backlight for Canoe

* Disable console on a few boards due to oversize
2020-01-18 23:00:32 -08:00
fauxpark
eb5d267e63
Enforce definition of DIODE_DIRECTION for non-custom matrix boards (#7915)
* Enforce definition of `DIODE_DIRECTION` for non-custom matrix boards

* Define diode direction for failing boards

* Matching parentheses

* Put onekey diode directions in top level config
2020-01-19 14:11:57 +11:00
James Young
eaed517c0b
Added keymap for Space65 (#7562)
* Initial commit

* Modified keymap and updated readme.

* fixed numbering in readme

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Made requested changes in PR.

* Rename README.md to readme.md

* swapped media control keys

* updated right alt key to apply shift key for emacs

* updated R_Alt to remove shift

* Updated readme

* add layout 2 and rename existing folder to layout 4

- renamed existing folder with directional layout to layout 4
- udpated existing readme
- Added layout_60_2

* update flash script per pull request review

* Added keymap profile to space65

- This keymap profile is for MacOS with VIM key bindings
- See readme for more information

* Update keyboards/gray_studio/space65/keymaps/billiams/readme.md

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

* Update keyboards/gray_studio/space65/keymaps/billiams/readme.md

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

* Update keyboards/gray_studio/space65/keymaps/billiams/readme.md

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

* Update keyboards/gray_studio/space65/keymaps/billiams/readme.md

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

* Update keyboards/gray_studio/space65/keymaps/billiams/keymap.c

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

* remove unnecessary code from keymap

* updated keys and cleaned up readme

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2020-01-18 17:00:09 -08:00
Joel Challis
ba628a28bc
Move rgblight and backlight task to common location (#7733) 2020-01-19 00:59:09 +00:00
Rob Haswell
a1452db98a Configuration values for starting HSV and speed (#7740)
* Define default HSV and speed for RGB matrix.

* Documentation for configuration values RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT and RGB_MATRIX_STARTUP_VAL.

* Document RGB_MATRIX_STARTUP_SPD.

* Preserve the ordering.
2020-01-18 20:11:33 +00:00
M. de Verteuil
9b9a0f0bcb [Keymap] Added mverteuil keymaps and userspace common code (#7876)
* Added mverteuil content

- Userspace
- Knops keymap
- Preonic keymaps

* Simplified and replaced some magic numbers

* Convert tabs to spaces

* Clean up LED handling, better animation, better layer init

* Use get_highest_layer per @drashna suggestion

* Reorder prototypes/reformat

* Simplified/more expessive and fixed initial layer LED

* Remove changes to git ignored files
2020-01-18 11:24:56 -08:00
Nathan Gray
6b17067b15 [Keyboard] Fix the order of underglow LEDs on ergodash/rev1 (#7791)
On the v1.2 PCB the slave half leds go in reverse order compared to the master half.
With this change, the leds are all in order from left to right, so animations like
Knight Rider look like you'd expect.
2020-01-17 20:26:30 -08:00
fauxpark
055e940f06 [Keyboard] Wasdat matrix cleanup (#7909)
* Wasdat matrix cleanup

* Use _custom functions

* More deduping, and signature fix
2020-01-17 20:01:17 -08:00
Hybrid65
3dd43d9cab [Keyboard] Support for a Southpaw Keyboard KVT (#7892)
* Support for KVT

This branch adds support for the southpaw keyboard KVT

* Updated readme.md and keymap.c

* Update readme.md

* Update keyboards/kv/revT/readme.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kv/revT/readme.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kv/revT/readme.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kv/revT/readme.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kv/revT/rules.mk

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kv/revT/rules.mk

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kv/revT/readme.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kv/revT/readme.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Updated from suggestions from pull request

* Update readme.md

* Update rules.mk

* Update rules.mk

* Update rules.mk

* Update rules.mk

* Update rules.mk

* Update revT.c

* Update readme.md

* changing T to lowercase

* Change revT to revt

* edit

* Update keyboards/kv/revt/rules.mk

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

* Update readme.md

Co-authored-by: fauxpark <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2020-01-17 19:56:13 -08:00
Joel Challis
6e710426a4 Add docs for 'CUSTOM_MATRIX = lite' (#7906)
* Add some docs to cover 'CUSTOM_MATRIX = lite'

* Apply suggestions from code review

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Add 'SRC += matrix.c' docs

* Update docs/custom_matrix.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

Co-authored-by: fauxpark <fauxpark@gmail.com>
2020-01-18 12:56:33 +11:00
Jeremy Bernhardt
d11238f748 switching to you know whats up mode (#7921) 2020-01-17 16:15:58 -05:00
ridingqwerty
95c24bbaf8
Implement and document TAPPING_FORCE_HOLD_PER_KEY (#7859)
* Implement and document TAPPING_FORCE_HOLD_PER_KEY

* Added "record" parameter to "get_tapping_force_hold"

* Correct typo -- remove 'IGNORE_' from 'IGNORE_TAPPING_FORCE_HOLD_PER_KEY'

Co-authored-by: GeorgeKoenig <35542036+GeorgeKoenig@users.noreply.github.com>
2020-01-17 15:49:23 -05:00
Drashna Jaelre
1b0854fdca Cleanup check for PERMISSIVE_HOLD (#7861)
* Fix bug in PERMISSIVE_HOLD check

caused by #5009 (aka, me)

* Remove check for per key
2020-01-17 15:33:08 -05:00
zvecr
75d4ff7d51 Prevent fallthrough for DIODE_DIRECTION 2020-01-17 18:55:24 +00:00
zvecr
952e805edb Initial refactor of ergo42 to split common 2020-01-17 18:50:58 +00:00
Callum Oakley
1fcd0b2578 move caps because it can be triggered accidentally by sequences such as '("' (#7923)
Thanks!
2020-01-17 10:59:07 -05:00
Ben
619ee543b8 [Keyboard] Add Plaid-Pad 4x4 numpad (#7900)
* Add Plaid-Pad code

* Move ENCODER_ENABLE under Build Options

* Update keyboards/keycapsss/plaid_pad/info.json

* Update keyboards/keycapsss/plaid_pad/keymaps/default/keymap.c

* Update keyboards/keycapsss/plaid_pad/plaid_pad.h

* Update keyboards/keycapsss/plaid_pad/rules.mk

* Update keyboards/keycapsss/plaid_pad/rules.mk

* Update keyboards/keycapsss/plaid_pad/rules.mk

* Update keyboards/keycapsss/plaid_pad/rules.mk

* Update keyboards/keycapsss/plaid_pad/rules.mk

* Update keyboards/keycapsss/plaid_pad/rules.mk

* Update keyboards/keycapsss/plaid_pad/rules.mk

* Update keyboards/keycapsss/plaid_pad/readme.md

* Update keyboards/keycapsss/plaid_pad/readme.md

* Update keyboards/keycapsss/plaid_pad/readme.md

* Update keyboards/keycapsss/plaid_pad/usbconfig.h

* Update keyboards/keycapsss/plaid_pad/usbconfig.h

* Update keyboards/keycapsss/plaid_pad/usbconfig.h

* Update keyboards/keycapsss/plaid_pad/usbconfig.h

* Update keyboards/keycapsss/plaid_pad/config.h

* Update keyboards/keycapsss/plaid_pad/usbconfig.h

* Update keyboards/keycapsss/plaid_pad/usbconfig.h

* Update keyboards/keycapsss/plaid_pad/usbconfig.h

* Update keyboards/keycapsss/plaid_pad/rules.mk

* Update keyboards/keycapsss/plaid_pad/config.h

* Update keyboards/keycapsss/plaid_pad/config.h

* Update keyboards/keycapsss/plaid_pad/usbconfig.h

* Update keyboards/keycapsss/plaid_pad/usbconfig.h

* Update keyboards/keycapsss/plaid_pad/config.h
2020-01-17 00:30:32 -08:00
Josh Hinnebusch
b6d8840915 [Keyboard] add VIA support for hiney PCBs (#7910)
* add VIA support for hiney PCBs

* update LED per request

* update LED text per request

* remove extra stuff
2020-01-16 23:15:08 -08:00
Xyverz
d6e6feb377 Further changes to HHKB keymap (#7918)
* Changes to HHKB Keymap for useability

* Changes to HHKB Keymap for useability

* Added KC_GRV to _FL.
2020-01-17 09:34:25 +11:00
Rys Sommefeldt
919d69266e [Keyboard] Graystudio Space65 ISO UK layout and keymap (#7912)
* ISO UK layout for Graystudio Space65

* Quick line on how to build it in the readme

* Update ASCII art layout guide to match reality

* Whoops, space is actually K47, not K46

* Rename to 65_iso_blocker and remove uk designation
2020-01-16 10:06:42 -08:00
fauxpark
1e670f5e67
Remove KEYMAP_SECTION_ENABLE (#7882) 2020-01-17 00:32:09 +11:00
Maarten Dekkers
bf397fdd9f [Keyboard] Add Eon40 keyboard (#7885)
* Add Eon40 files

* Make required changes

* Add missing comma

* Update rules.mk
2020-01-15 15:53:09 -08:00
James Young
5153580698
[Keyboard] Xbows Knight: Configurator layout polishing (#7903) 2020-01-15 09:38:17 -08:00
Ahmed Elshafey
3a69232213 [Keymap] Massdrop ctrl keymap (#7639)
* RGB config overhaul

Changing RGB config from setrgb to sethsv, trying out different color values.

* Merged changes

* Various changes and a couple additions

Added Git Layer with git macros for most operations and LED config to show the macro keys on layer. Activated with FN+3.
Added VIM Layer, this is a normal keycode layer with no macros for now but it has LED config that highlights the navigation and edit keys in VIM.
Added a sticky CTRL and sticky SHIFT layers. I have no idea why I did this actually, it's mildly useful but oneshot and tapdance would be better, will be removed in later commit.
Changed the LED config from setrgb to sethsv and the key by key LED config to array.
Some code improvements in process_record_user.
Better way to manage string macros using char array. Inspired by drashna's secret macros.

* Various keymap changes and added documentation

Updated massdrop/ctrl endgame keymap:
    Added layers for git and vim.
    Better LED config method, using ledmap, similar to what's used in many other keymaps.
    Improved process_record_user() mainly with reduced conditionals.
    Cleaned things up in the header and config.
    Added pretty much all qmk feature headers to rules and config, commented out to be enabled if desired. Firmware size should be considered.
    Not many features added in this commit. Shifting for a while to work on implementing raw hid for the keyboard and expanding qmk terminal.

Added documentation.md for massdrop/ctrl at keyboard level to house all related information for future use.
Added documentation for raw hid in docs, added the doc to feature index. Need some review for this documentation and suggested additions/changes.

* Some fixes

Fixed keymap documentation to include changes.
Removed useless double tap keys and simplified layer maps.

* Fixed error in keymap

* Removed documentation changes. Will present in another PR

* Update keyboards/massdrop/ctrl/DOCUMENTATION.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update DOCUMENTATION.md

* Update keymap.c

fixed mouse layout incomplete arrow cluster

* Update keyboards/massdrop/ctrl/keymaps/endgame/keymap.c

Fixed Git layer led config

Co-Authored-By: totolouis <totolouis@users.noreply.github.com>

* Update DOCUMENTATION.md

Remove raw hid details

* Update rules.mk

Remove useless stuff

* fixed malformed led map causing compile fail, indentation fixes

* Update keyboards/massdrop/ctrl/keymaps/endgame/config.h

switch from TG_NKRO to NK_TOGG

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keymap.c

Switching from TG_NKRO to NK_TOGG

* Added yakuake layout

* Update keyboards/massdrop/ctrl/keymaps/endgame/keymap.c

Change biton32(layer_state) to get_highest_layer()

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keymap.c

Change from biton32 to get_highest_layer

* Fixed custom LED not toggling off

Co-authored-by: fauxpark <fauxpark@gmail.com>
Co-authored-by: totolouis <totolouis@users.noreply.github.com>
2020-01-14 21:34:41 -08:00
Xyverz
2a6cb426ef Hhkb keymap (#7907)
* Initial commit of HHKB layout.

* Moved keymap to the correct location.

This keymap is for a hasu alt controller-equipped HHKB, so the keymap was in the wrong place.
Added comments to the keymap.
2020-01-15 16:01:58 +11:00
Joel Challis
2081c5e40e Fix CUSTOM_MATRIX lite matrix_scan return code (#7908) 2020-01-15 15:51:43 +11:00
Joel Challis
48cac9e3c8
Migrate more custom matrix 'lite' code to core (#7863)
* Migrate more custom matrix lite code to core

* Align function names

* fix up MATRIX_MASKED
2020-01-15 01:58:32 +00:00
James Young
537b8713e5 XD68 Configurator Layout Support and Minor Refactor (#7904)
* XD68: QMK Configurator layout support

* elevate backlight breathing settings to keyboard level

* remove empty keymap config.h files

* rules.mk templating

* keymap polishing

- four-space indent
- keycode alignment
2020-01-15 01:31:17 +00:00
Joel Challis
61cd180163 Add ws2812 driver type define (#7888) 2020-01-15 09:03:48 +11:00
yiancar
b69b1ad4fc Fix NK65 indicator code after refactoring (#7902) 2020-01-15 09:03:01 +11:00
Sascha Grunert
bb652314be Update personal keymap (#7898)
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2020-01-15 08:45:55 +11:00
Adi M
9b4052e5a3 Adi's KBD67 layout (#7896)
* Add files via upload

* Rename keyboards/kbdfans/kbd67/rev2/keymaps/keymap.c to keyboards/kbdfans/kbd67/rev2/keymaps/adi/keymap.c

* Rename keyboards/kbdfans/kbd67/rev2/keymaps/readme.md to keyboards/kbdfans/kbd67/rev2/keymaps/adi/readme.md

* Update readme.md

* Update readme.md

* Update keyboards/kbdfans/kbd67/rev2/keymaps/adi/keymap.c

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

* Update keyboards/kbdfans/kbd67/rev2/keymaps/adi/keymap.c

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

* Update keyboards/kbdfans/kbd67/rev2/keymaps/adi/readme.md

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

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2020-01-15 08:44:59 +11:00