Commit Graph

15583 Commits

Author SHA1 Message Date
Ryan
5542f5ede1
Get rid of USB_LED_KANA and USB_LED_COMPOSE (#21366) 2023-06-27 09:15:33 +10:00
Ryan
2f9f555add
Move TAP_CODE_DELAY to data driven (#21363) 2023-06-25 22:06:31 +10:00
フィルターペーパー
dd164a0566
GMMK/pro: Turn off RGB when suspended (#21370) 2023-06-24 19:55:40 +01:00
QMK Bot
79da3a550c Merge remote-tracking branch 'origin/master' into develop 2023-06-24 18:55:03 +00:00
James Young
3a42fbb0c9
Mechlovin Zed65 rev1 Touch-Up (#21373)
* [docs] add layout/matrix diagram

* [refactor] rename LAYOUT_65_ansi_tsangan to LAYOUT_65_ansi
2023-06-24 19:54:23 +01:00
QMK Bot
1e5f2f517b Merge remote-tracking branch 'origin/master' into develop 2023-06-24 18:53:18 +00:00
James Young
3bf2b966ec
Kibou Winter: rename LAYOUT to LAYOUT_tkl_ansi_wkl (#21372) 2023-06-24 19:52:44 +01:00
QMK Bot
d18fc1cb92 Merge remote-tracking branch 'origin/master' into develop 2023-06-24 09:31:41 +00:00
mechlovin
1cf20f4587
Update config.h (#21361) 2023-06-24 10:31:07 +01:00
QMK Bot
ef547e909a Merge remote-tracking branch 'origin/master' into develop 2023-06-24 08:33:51 +00:00
James Young
884a348e5d
Kibou Harbour Layout Addition and Touch-Up (#21358)
* [style] friendly-format info.json

* [chore] correct layout data

* [docs] add layout/matrix diagram

* [refactor] rename LAYOUT to LAYOUT_65_ansi_blocker_tsangan_split_bs

* [enhancement] add LAYOUT_65_ansi_blocker_wkl_split_bs

* [chore] correct listed maintainer

Reference the maintainer's GitHub username.
2023-06-24 01:33:18 -07:00
Ryan
1e05bad1ba
Move TAPPING_TERM to data driven (#21296)
Co-authored-by: Nick Brassel <nick@tzarc.org>
2023-06-24 17:44:21 +10:00
Ryan
4ae9bfd17a
Move RGBLIGHT_HUE/SAT/VAL_STEP to data driven (#21292)
Co-authored-by: Nick Brassel <nick@tzarc.org>
2023-06-24 17:37:54 +10:00
Ryan
6545eb64a0
Move RGB_MATRIX_HUE/SAT/VAL/SPD_STEP to data driven (#21354) 2023-06-24 17:13:18 +10:00
Ryan
8093b13365
Move TAPPING_TOGGLE to data driven (#21360) 2023-06-24 17:10:22 +10:00
Nick Brassel
416af0171c
Remove CORTEX_ENABLE_WFI_IDLE from keyboards. (#21353)
* Remove CORTEX_ENABLE_WFI_IDLE from the codebase.

* Turn on CORTEX_ENABLE_WFI_IDLE by default.
2023-06-23 20:31:25 +01:00
QMK Bot
173f54cf1f Merge remote-tracking branch 'origin/master' into develop 2023-06-23 16:49:07 +00:00
James Young
882f7838fd
Jaykeeb Skyline: correct layout data (#21350) 2023-06-23 09:48:32 -07:00
QMK Bot
c1c18855f8 Merge remote-tracking branch 'origin/master' into develop 2023-06-23 10:20:53 +00:00
James Young
75f5428d1d
Jaykeeb Orba Layout Addition and Touch-Up (#21349)
* [chore] correct layout data

* [chore] rename LAYOUT to LAYOUT_625u_space

* [style] friendly-format info.json

* [enhancement] add LAYOUT_7u_space
2023-06-23 03:20:18 -07:00
QMK Bot
985eac4ab0 Merge remote-tracking branch 'origin/master' into develop 2023-06-23 09:38:48 +00:00
James Young
ea21a09091
Akko Top40: correct layout data (#21348) 2023-06-23 02:38:04 -07:00
QMK Bot
e21b4d2519 Merge remote-tracking branch 'origin/master' into develop 2023-06-23 08:52:06 +00:00
James Young
e0a8a0ea2a
Y&R Transition80 Layout Additions and Touch-Up (#21347)
* [chore] correct layout data

* [chore] rename LAYOUT to LAYOUT_all

* [docs] add layout/matrix diagram

* [enhancement] add LAYOUT_tkl_ansi_split_bs

* [enhancement] add LAYOUT_tkl_ansi

* [enhancement] add LAYOUT_tkl_ansi_tsangan_split_bs

* [enhancement] add LAYOUT_tkl_ansi_tsangan

* [enhancement] enable Community Layout support

* [chore] add reference keymaps
2023-06-23 01:51:23 -07:00
QMK Bot
67c7d7bf20 Merge remote-tracking branch 'origin/master' into develop 2023-06-23 08:28:17 +00:00
James Young
09c89bc7e6
Wuque Creek70 Layout Additions and Touch-Up (#21346)
* [chore] correct layout data

* [docs] add layout/matrix diagram

* [refactor] rename LAYOUT to LAYOUT_all

* [enhancement] add LAYOUT_ansi_split_space_split_bs_rshift

* [enhancement] add LAYOUT_ansi_split_space

* [enhancement] add LAYOUT_ansi_split_bs_rshift

* [enhancement] add LAYOUT_ansi

* [enhancement] add LAYOUT_ansi_tsangan_split_bs_rshift

* [enhancement] add LAYOUT_ansi_tsangan

* [style] refactor keymaps

- use four-space indent
- convert tabs to spaces
- use QMK-native keycode aliases
2023-06-23 01:27:42 -07:00
QMK Bot
cc6202de20 Merge remote-tracking branch 'origin/master' into develop 2023-06-22 16:33:41 +00:00
James Young
67be956634
Teahouse Ayleen Community Layout Support and Touch-Up (#21341)
* [chore] correct layout data

* [refactor] rename LAYOUT to LAYOUT_tkl_f13_ansi_tsangan

* [enhancement] enable Community Layout support
2023-06-22 17:33:01 +01:00
QMK Bot
94b74b537a Merge remote-tracking branch 'origin/master' into develop 2023-06-22 16:32:06 +00:00
James Young
c01a3cfaca
Viktus OSAv2 Numpad Community Layout Support and Configurator Touch-Up (#21342)
* [style] sort JSON keys in layout objects

* [chore] correct layout data

* [refactor] rename LAYOUT_all_split to LAYOUT_ortho_5x4

* [refactor] rename LAYOUT_2u_plus_2u_enter_2u_zero to LAYOUT_numpad_5x4

* [enhancement] enable Community Layout support
2023-06-22 17:31:34 +01:00
Joel Challis
fb76c941ee
Fix rate/pistachio_pro:via (#21339) 2023-06-22 15:06:57 +01:00
QMK Bot
bfd6bb8d23 Merge remote-tracking branch 'origin/master' into develop 2023-06-22 13:46:17 +00:00
James Young
87ab13094e
Soda Pocket: correct layout data (#21333)
[chore]

Correct the layout data for the keyboard.

This commit fixes a misleading Configurator implementation.
2023-06-22 14:45:39 +01:00
QMK Bot
8ca7570cd2 Merge remote-tracking branch 'origin/master' into develop 2023-06-22 13:45:27 +00:00
James Young
2176c760df
Spleeb: correct layout data (#21334)
* [style] friendly-format info.json

* [chore] correct layout data

Fix a poor Configurator/CLI rendering.
2023-06-22 14:44:48 +01:00
QMK Bot
5a4fab0b9e Merge remote-tracking branch 'origin/master' into develop 2023-06-22 04:36:15 +00:00
James Young
cc4ac72f85
Igloo Configurator Touch-Up (#21303)
* [refactor] friendly-format info.json

* [enhancement] add matrix diagram

* [enhancement] remove key overlaps in layout data
2023-06-21 21:35:35 -07:00
QMK Bot
c601b1f623 Merge remote-tracking branch 'origin/master' into develop 2023-06-22 02:12:05 +00:00
James Young
33f76d79d4
Quarkeys Z40 Community Layout Support and Touch-Up (#21329)
* [refactor] rename LAYOUT to LAYOUT_planck_mit

* [style] friendly-format info.json

* [style] refactor keymaps

- grid-align keycodes
- use four-space indent
- remove trailing whitespace

* [chore] tidy-up keyboard data in info.json

- spell-check `manufacturer` value
- use valid `url`
- reference GitHub username for `maintainer`

* [chore] tidy-up readme

- link to maintainer's GitHub account
- add Hardware Availability link
- break-out Hardware Specs into its own section

* [enhancement] enable Community Layout support

* [chore] replace product image in readme

Source repository for previous URL seems to have been deleted.
2023-06-21 19:11:32 -07:00
QMK Bot
adc954fafd Merge remote-tracking branch 'origin/master' into develop 2023-06-22 00:43:08 +00:00
James Young
b8a12db1a1
Pteropus: correct layout data (#21326)
* [style] friendly-format info.json

* [chore] correct layout data

Fix keys overlapping when rendered in QMK Configurator or CLI.
2023-06-21 17:42:30 -07:00
James Young
87b371cea6
ProtoTypist PT-80 Refactor (#21325)
* [style] friendly-format info.json

* [docs] add layout/matrix diagram

* [style] refactor via keymap

- grid-align keycodes
- remove trailing whitespace

* [refactor] LAYOUT_all macro

Move the JSON object for the Enter key to the end of the home row.

* [style] refactor default keymap

- update keycode grid alignment
- remove trailing whitespace

* [refactor] LAYOUT_tkl_iso macro

Move the JSON object for the Enter key to the end of the home row.

This commit fixes a key sequence error with the `tkl_iso` Community
Layout support.

* [style] refactor default_ansi keymap

- update keycode grid alignment
- remove trailing whitespace

* [bugfix] fix function row matrix assignments for LAYOUT_tkl_iso

Fix incorrect matrix position assignments on the function row keys for
the `LAYOUT_tkl_iso` macro.

* [bugfix] fix function row matrix assignments for LAYOUT_tkl_ansi

Fix incorrect matrix position assignments on the function row keys for
the `LAYOUT_tkl_ansi` macro.
2023-06-21 14:20:02 -07:00
QMK Bot
810cd9bc53 Merge remote-tracking branch 'origin/master' into develop 2023-06-21 19:30:39 +00:00
James Young
6f39205f73
Laneware LW75: correct layout data (#21314)
[refactor]

Fixes misleading Configurator implementations of the available layouts.
2023-06-21 12:30:04 -07:00
QMK Bot
e3faa76e4c Merge remote-tracking branch 'origin/master' into develop 2023-06-21 18:42:56 +00:00
lindgrenj6
20c0043538
[Keymap] Add lindgrenj6 planck layout (#21155) 2023-06-21 12:42:23 -06:00
QMK Bot
fa1b53360b Merge remote-tracking branch 'origin/master' into develop 2023-06-21 18:30:50 +00:00
James Young
4cc427c13e
Lucid Velvet Solder Layout Additions and Touch-Up (#21313)
* [refactor] refactor via keymap

- grid-align keycodes
- remove trailing whitespace

* [refactor] refactor default keymap

- grid-align keycodes
- remove trailing whitespace

* [bugfix] fix key sequence error in default keymap

* [enhancement] fix key overlaps in Configurator

* [enhancement] add matrix diagram

* [refactor] rename LAYOUT to LAYOUT_all

* [enhancement] add LAYOUT_tkl_f13_ansi_split_space_split_bs_rshift

* [enhancement] add LAYOUT_tkl_f13_ansi_split_bs_rshift

* [enhancement] add LAYOUT_tkl_f13_ansi

* [enhancement] add LAYOUT_tkl_f13_iso_split_space_split_bs_rshift

* [enhancement] add LAYOUT_tkl_f13_iso_split_bs_rshift

* [enhancement] add LAYOUT_tkl_f13_iso
2023-06-21 11:30:15 -07:00
QMK Bot
b6c76cd143 Merge remote-tracking branch 'origin/master' into develop 2023-06-21 17:39:03 +00:00
James Young
b814ff5bca
Lucid Velvet Hotswap Layout Additions and Touch-Up (#21312)
* [refactor] refactor via keymap

- grid-align keycodes
- remove trailing whitespace

* [refactor] refactor default keymap

- grid-align keycodes
- remove trailing whitespace

* [bugfix] fix key sequence error in default keymap

* [enhancement] fix key overlap in Configurator

* [enhancement] add matrix diagram

* [refactor] rename LAYOUT to LAYOUT_tkl_f13_ansi_split_bs_rshift

* [enhancement] add LAYOUT_tkl_f13_ansi

* [enhancement] add LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift

* [enhancement] add LAYOUT_tkl_f13_ansi_tsangan

* [enhancenment] enable Community Layout support
2023-06-21 10:38:18 -07:00
QMK Bot
673b536d70 Merge remote-tracking branch 'origin/master' into develop 2023-06-21 16:00:31 +00:00
James Young
71b77df06f
Keebio Cepstrum Configurator Touch-Up (#21310)
* [enhancement] remove redundant layout data

Remove the redundant layout data from the keyboard-level `info.json`.

* [enhancement] correct JSON syntax in rev1/info.json

* [enhancement] friendly-format rev1/info.json

* [enhancement] correct layout data
2023-06-21 08:59:54 -07:00
QMK Bot
3274e0a4d5 Merge remote-tracking branch 'origin/master' into develop 2023-06-21 03:05:47 +00:00
lalalademaxiya1
ecca9c5459
Add Keychron C2 Pro (#20701)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-06-20 21:05:07 -06:00
QMK Bot
08ba8a0160 Merge remote-tracking branch 'origin/master' into develop 2023-06-21 03:02:34 +00:00
jonylee@hfd
595d393fd8
[Keyboard] Add Monsgeek M5 (#21182)
Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-06-20 21:01:43 -06:00
James Young
dad41bd2f6
ProtoTypist PT-60 Refactor (#21322) 2023-06-20 20:58:44 -06:00
QMK Bot
c69f82f282 Merge remote-tracking branch 'origin/master' into develop 2023-06-21 02:30:16 +00:00
James Young
7753249d3d
NovelKeys NK+: correct layout data (#21317)
* NovelKeys NK+: correct layout data

Add key sizes to the layout data.

* [refactor] rename LAYOUT to LAYOUT_65_xt_ansi_blocker_tsangan
2023-06-21 03:29:44 +01:00
QMK Bot
6ec91a75d5 Merge remote-tracking branch 'origin/master' into develop 2023-06-21 00:33:07 +00:00
Jack Humbert
42cd55e08d
Planck Matrix Fixes (#21196)
* fix non-default keymap compiling, initial matrix state, watchdog options

* fix: allow planck/rev7 to be used with ENCODER_ENABLE = no

* chore: update function name on all cases.

* remove old midi tone option

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

* fixes abhixec's planck keymap

* add audio enable condition to abhixec's planck keymap

* add audio enable condition to all muse includes

* Revert "add audio enable condition to all muse includes"

This reverts commit 9779e908970dbf7cf81b1a3f968ef2e85ae2b76f.

* Revert "add audio enable condition to abhixec's planck keymap"

This reverts commit 24c742a5e8ddd55c45ce9f1917b0cb237d4bf721.

* Revert "fixes abhixec's planck keymap"

This reverts commit 4bb085d1ff00febc92ff6211da4fb776c6379fad.

---------

Co-authored-by: Peter.Falken <luis@bitjester.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-06-20 20:32:32 -04:00
James Young
45dc1ccffe
EC Pro X JIS Layout Touch-Up (#21260)
* [refactor] update `info.json` for readability

- sort the JSON objects representing the keyboard's keys in the order:
  - label, matrix, x, y, w, h
- convert numeric JSON values to integers where appropriate

* [refactor] remove key labels from `info.json`

* [refactor] keymap refactor

- grid-align keycodes

* [bugfix] move Enter key to home row

Moves the JSON object representing the Enter key to the home row.

Fixes an issue that resulted in correct key assignment only if the
keymap being compiled/flashed was based upon the `via` keymap.
2023-06-20 15:40:31 -07:00
James Young
ac14fce06d
Kalakos Bahrnob65 Configurator Layout Touch-Up (#21309)
* [enhancement] add matrix diagram

* [refactor] friendly-format info.json

* [enhancement] remove key overlaps
2023-06-20 18:18:16 +01:00
QMK Bot
a9f49a0ce8 Merge remote-tracking branch 'origin/master' into develop 2023-06-20 17:17:10 +00:00
James Young
85b804496c
KJ-Modify RS40 Configurator Touch-Up (#21311)
* [refactor] friendly-format info.json

* [enhancement] remove key overlap

Fix a key overlap in the Configurator rendering between LCtrl and Fn2.

* [enhancement] replace store links with product links

Replace URLs that point to the vendor's shop with URLs to the vendor's
product listing.
2023-06-20 18:16:35 +01:00
QMK Bot
01cfc72b57 Merge remote-tracking branch 'origin/master' into develop 2023-06-20 15:42:27 +00:00
lalalademaxiya1
45c52c742e
[Keyboard] Add Keychron C1 Pro (#20700)
Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-06-20 09:41:45 -06:00
QMK Bot
965cfec3f9 Merge remote-tracking branch 'origin/master' into develop 2023-06-20 15:39:02 +00:00
Roberts Kursitis
958cae3e0a
[Keyboard] Add Alisaie (#21266) 2023-06-20 09:38:26 -06:00
QMK Bot
a2e2d92652 Merge remote-tracking branch 'origin/master' into develop 2023-06-20 15:36:05 +00:00
Derek
0abe3129f1
[Keyboard] Add bigsmoothknob (#21265)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-06-20 09:35:23 -06:00
jonylee@hfd
d98b60c8f6
Move kb83 keyboard (#20761)
* move hfdkb/keyboard_sw/k83 --> inland/kb83

* move hfdkb/keyboard_sw/k83 --> inland/kb83

* Update data/mappings/keyboard_aliases.hjson

* Update keyboard_aliases.hjson

* fixed  the Configurator layout data

* fixed the Configurator layout data

* Revert "Update keyboard_aliases.hjson"

This reverts commit c085c547656d09a14b9b0fad6a00f9551106719f.

* Revert "fixed  the Configurator layout data"

* Update keyboard_aliases.hjson

* Update info.json
2023-06-19 19:31:46 -07:00
QMK Bot
be6f92c612 Merge remote-tracking branch 'origin/master' into develop 2023-06-20 01:46:21 +00:00
James Young
31e39a9ff4
dnworks SBL Community Layout Support and Touch-Up (#21267) 2023-06-19 18:45:47 -07:00
jack
b749a5f720
Fixup nightly_boards/n40_o (#21307) 2023-06-19 13:59:35 -06:00
jack
c4a67d3f33
Remove encoder in-matrix workaround code (#20389) 2023-06-19 09:46:27 -06:00
jack
74fbd5a031
Fixup dekunukem/duckypad (#21298) 2023-06-19 13:10:25 +01:00
QMK Bot
a68e9f0116 Merge remote-tracking branch 'origin/master' into develop 2023-06-19 06:05:27 +00:00
James Young
abd0632b9e
Tsubasa Handwired: correct layout data (#21295) 2023-06-19 00:04:50 -06:00
QMK Bot
55ed2bcc7e Merge remote-tracking branch 'origin/master' into develop 2023-06-19 05:53:34 +00:00
James Young
a756ef6c88
HFDKB K83 Configurator Layout Fix (#21297) 2023-06-18 23:53:01 -06:00
QMK Bot
3c84f2b96d Merge remote-tracking branch 'origin/master' into develop 2023-06-19 05:23:45 +00:00
mechlovin
e646ec2024
[Keyboard] Add support for Alveus MX PCB (#21238)
Co-authored-by: jack <0x6a73@protonmail.com>
2023-06-18 23:23:11 -06:00
QMK Bot
2ea02c3995 Merge remote-tracking branch 'origin/master' into develop 2023-06-19 05:03:28 +00:00
Nick Brassel
0774381f81
Swap G431 to transient EEPROM. Add G431 and G474 onekeys. (#21282) 2023-06-19 15:02:57 +10:00
QMK Bot
1f6aa12184 Merge remote-tracking branch 'origin/master' into develop 2023-06-19 03:57:28 +00:00
James Young
de49bcd8e8
Geistmaschine Geist Layout Refactor and Touch-Up (#21288) 2023-06-18 20:56:55 -07:00
Ryan
1c9d0f0eec
Remove default TAPPING_TERM from keyboard config.h (#21284) 2023-06-18 23:33:45 +01:00
QMK Bot
7c7cec906a Merge remote-tracking branch 'origin/master' into develop 2023-06-18 22:09:05 +00:00
James Young
88640e47ef
[refactor] correct layout data (#21289) 2023-06-18 23:08:34 +01:00
QMK Bot
54d883befa Merge remote-tracking branch 'origin/master' into develop 2023-06-18 11:38:43 +00:00
Sergey Vlasov
b520b352f9
preonic/rev3{,_drop}: Fix layouts with 2u keys (#21114)
Apparently layouts with 2u keys were not correctly converted into the
`info.json` format (the old C layout macros used the arguments for such
keys multiple times to cover all possible 1u locations; this is not
supported in `info.json`, and the single matrix location for 2u keys was
chosen incorrectly in some cases).  Fix the layout definitions to match
the real PCB wiring.
2023-06-18 14:38:09 +03:00
Ryan
b1783db4ea
Move RGBLED_NUM to data driven (#21278) 2023-06-18 14:39:07 +10:00
QMK Bot
40a073b140 Merge remote-tracking branch 'origin/master' into develop 2023-06-17 19:39:03 +00:00
James Young
a2171ff4e8
Dymium65 Layout Touch-Up (#21269)
* [refactor] friendly-format info.json

* [refactor] correct layout data
2023-06-17 20:38:02 +01:00
James Young
d85600fcd4
Eason Aeroboard Refactor (#21271)
* [refactor] refactor keymaps

- grid-align keycodes
- use four-space indent
- remove trailing whitespace

* [refactor] physically arrange layout macro

Arrange the layout macro and keymaps in the QMK-desired order.

Breaks compatibility with out-of-tree keymaps.

Key sequence swaps in this commit:

- `KC_GRV` <-> `KC_1`
- `KC_TAB` <-> `KC_Q`

* [refactor] rename LAYOUT to LAYOUT_split_space

* [enhancement] add LAYOUT_7u_space

* [chore] correct maintainer value

Reference the keyboard maintainer's GitHub username.
2023-06-17 20:37:28 +01:00
QMK Bot
90a98fa689 Merge remote-tracking branch 'origin/master' into develop 2023-06-17 19:37:15 +00:00
James Young
d57acc7c5c
DOIO KB38 Refactor (#21268)
* [refactor] keymap refactor

- tidy-up box drawing
- update keycode alignment for readability
- use QMK-native keycode aliases

* [refactor] correct layout data

* [docs] add image to readme
2023-06-17 20:36:43 +01:00
Ryan
2367d8129c
Move RGBLIGHT_SLEEP to data driven (#21072) 2023-06-16 14:04:45 +10:00
QMK Bot
579db6131e Merge remote-tracking branch 'origin/master' into develop 2023-06-15 20:57:46 +00:00
James Young
94311e4dc2
Alas: ISO Layouts Fix and Matrix Diagram (#21255) 2023-06-15 14:57:13 -06:00
QMK Bot
dc435a0834 Merge remote-tracking branch 'origin/master' into develop 2023-06-15 20:56:50 +00:00
James Young
5263dfb88d
ButterKeebs PocketPad: correct layout data (#21256) 2023-06-15 14:56:07 -06:00
Ryan
e8ca83a353
Move RGBLIGHT_SPLIT to data driven (#21190)
* Move `RGBLIGHT_SPLIT` to data driven

* Remove where `split_count` is already set
2023-06-15 13:27:26 +01:00
QMK Bot
c011eb1ead Merge remote-tracking branch 'origin/master' into develop 2023-06-15 12:19:44 +00:00
James Young
9b36ec5351
DOIO KB30 Refactor (#21250)
* refactor keymaps

- remove extra blank lines
- convert tabs to spaces
- use four-space indent
- grid-align keycodes
- use QMK-native keycode aliases

* info.json: correct layout data

* add readme.md

* info.json: correct maintainer field

Updates the value to reference the maintainer's GitHub username.
2023-06-15 13:18:56 +01:00
QMK Bot
53d76042e0 Merge remote-tracking branch 'origin/master' into develop 2023-06-15 04:29:09 +00:00
Sleepdealr
66f06a175f
[Keyboard] Add Artemis Paragon (#20910)
Co-authored-by: jack <0x6a73@protonmail.com>
2023-06-14 22:28:06 -06:00
QMK Bot
dd69649fc9 Merge remote-tracking branch 'origin/master' into develop 2023-06-15 04:26:11 +00:00
jonylee@hfd
8f980ea69f
[Keyboard] add top40 keyboard. (#21199)
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
2023-06-14 22:25:23 -06:00
QMK Bot
5c03941405 Merge remote-tracking branch 'origin/master' into develop 2023-06-15 04:24:28 +00:00
jonylee@hfd
bbba1d07f9
[Keyboard] add acr87 keyboard. (#21200) 2023-06-14 22:23:46 -06:00
QMK Bot
03c4530e8c Merge remote-tracking branch 'origin/master' into develop 2023-06-15 04:22:24 +00:00
blindassassin111
3703d5a83b
[Keyboard] Adding OSAv2 Numpad Topre support (#21224) 2023-06-14 22:20:49 -06:00
QMK Bot
8ee0cb5744 Merge remote-tracking branch 'origin/master' into develop 2023-06-15 04:08:59 +00:00
Andrew Kannan
a2c17d5518
[Keyboard] Add CannonKeys Leviatan PCB (#21231) 2023-06-14 22:08:16 -06:00
Duncan Sutherland
2add1fb223
[Keyboard] dactyl_manuform/6x7 pin correction (#21240) 2023-06-14 22:06:18 -06:00
QMK Bot
f594b99f92 Merge remote-tracking branch 'origin/master' into develop 2023-06-15 04:00:51 +00:00
Gastón Jorquera
92203440cd
[Keymap] Left Control is now ESC when tapped (#21241) 2023-06-14 22:00:13 -06:00
QMK Bot
ee6320c7aa Merge remote-tracking branch 'origin/master' into develop 2023-06-15 03:59:31 +00:00
Álvaro A. Volpato
87858108b5
Modernize M75H and M75S firmwares (#21244) 2023-06-14 21:58:55 -06:00
QMK Bot
88d9b7ee31 Merge remote-tracking branch 'origin/master' into develop 2023-06-15 03:30:22 +00:00
dztech
baa9252db2
[Keyboard] add pluto keyboard (#21225) 2023-06-14 20:29:39 -07:00
QMK Bot
9103b63354 Merge remote-tracking branch 'origin/master' into develop 2023-06-15 01:46:17 +00:00
James Young
776e980ac1
4pplet Waffling60 Rev D ISO Layout Fix and Additions (#21236)
* correct layout data

* add matrix diagram

* rename LAYOUT to LAYOUT_all

* add LAYOUT_60_iso_tsangan_split_bs_rshift

* add LAYOUT_60_iso_tsangan_split_rshift

* add LAYOUT_60_iso_wkl_split_bs_rshift

* add LAYOUT_60_iso_wkl_split_rshift
2023-06-14 18:45:37 -07:00
QMK Bot
6fdf4baecd Merge remote-tracking branch 'origin/master' into develop 2023-06-14 16:27:44 +00:00
Danny
f5ee7b7ed8
Add Sinc Rev. 4 (#21130)
* Fork Rev. 3 to 4

* Update RGB LED positions

* Adjust RGB positions

* Enable more RGB modes

* Update copyrights

* Add license headers to keymaps

* Use same type of license header

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

* Fix I2C pins

---------

Co-authored-by: Joel Challis <git@zvecr.com>
2023-06-14 12:26:46 -04:00
James Young
7bafae64f9
FJLabs Swordfish Layout Macro Refactor (#21234)
* physically arrange layout macro

Arranges the layout macro to QMK standards (left to right, row by row).

This change breaks compatibility with out-of-tree keymaps, because the
order in which the keycode arguments must be passed is changed.

* rename `LAYOUT_alice_all` to `LAYOUT_split_bs`

* add `LAYOUT_2u_bs` macro
2023-06-14 07:31:51 -07:00
Ryan
9551a0a38a
Move RGBLIGHT_LED_MAP to data driven (#21095) 2023-06-14 22:01:13 +10:00
QMK Bot
6c4286152f Merge remote-tracking branch 'origin/master' into develop 2023-06-14 06:27:47 +00:00
jonylee@hfd
4055f2a937
[Keyboard]add 5108 Keyboard. (#21184)
Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-06-14 00:27:08 -06:00
QMK Bot
5fd55908c6 Merge remote-tracking branch 'origin/master' into develop 2023-06-13 15:18:40 +00:00
rhmokey
55987542e1
[Keyboard] Add mokey12x2 (#20702)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2023-06-13 09:17:55 -06:00
QMK Bot
aefdb39393 Merge remote-tracking branch 'origin/master' into develop 2023-06-13 15:09:23 +00:00
Alabahuy
1194a6f0dd
[Keyboard] jaykeeb skyline (#21219) 2023-06-13 09:08:37 -06:00
QMK Bot
d9bea011fa Merge remote-tracking branch 'origin/master' into develop 2023-06-13 15:05:55 +00:00
Alberto Pavano
e8b7244bb5
[Keyboard] rainkeebs trailmix (#20189)
Co-authored-by: jack <0x6a73@protonmail.com>
2023-06-13 09:05:03 -06:00
QMK Bot
fd2a516f03 Merge remote-tracking branch 'origin/master' into develop 2023-06-13 06:33:41 +00:00
David Hoelscher
dabbc93df4
[Keyboard] Add ErgoStrafer keyboard (#21195) 2023-06-12 23:32:54 -07:00
Duncan Sutherland
f4529eb42b
[Keymap] Fix scheikled keymap for dactyl_manuform/4x6 (#21206) 2023-06-13 00:19:38 -06:00
QMK Bot
af58f26028 Merge remote-tracking branch 'origin/master' into develop 2023-06-13 06:17:56 +00:00
Joe Scotto
ca6921b1ba
[Keyboard] Add ScottoNum macropad (#21208) 2023-06-13 00:17:18 -06:00
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
84c7aaae91 Merge remote-tracking branch 'origin/master' into develop 2023-06-12 01:12:57 +00:00
Alabahuy
53f20b197b
[Keyboard] Add orba keyboard (#21132) 2023-06-11 18:12:19 -07: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
flashquark
40c3b71569
[Keyboard] Add Flashquark Horizon Z (#21055)
Co-authored-by: jack <0x6a73@protonmail.com>
2023-06-11 01:55:06 -06:00
QMK Bot
1fcb9a0228 Merge remote-tracking branch 'origin/master' into develop 2023-06-11 07:53:05 +00:00
Joe Scotto
33c93d3a96
[Keyboard] Add Scotto34 (PCB Edition) (#21085)
Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>
2023-06-11 01:52:43 -06: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
QMK Bot
beaf6505ed Merge remote-tracking branch 'origin/master' into develop 2023-06-11 07:51:56 +00:00
FanXingStudio
bfdfeb6f3f
[Keyboard] Add kibou/winter (#21161) 2023-06-11 01:51:17 -06:00
Duncan Sutherland
cf6c92426d
[Keyboard] correct and modernise dactyl_manuform/6x7 variant (#21176) 2023-06-11 01:48:56 -06:00
QMK Bot
55f226159b Merge remote-tracking branch 'origin/master' into develop 2023-06-11 06:27:53 +00:00
blindassassin111
8cd9f07c30
[Keyboard] Adding OSAv2 Topre PCB (#21080) 2023-06-10 23:27:13 -07:00
QMK Bot
c4b116875f Merge remote-tracking branch 'origin/master' into develop 2023-06-10 23:34:17 +00:00
James Young
dd8b4dce55
Atreyu: correct layout data (#21197) 2023-06-10 16:33:33 -07:00
QMK Bot
38edc481d1 Merge remote-tracking branch 'origin/master' into develop 2023-06-10 20:35:55 +00:00
Allen Choi
57b23b8d96
[Keymap] thunderbird2086 layer status with RGB lighting/matrix (#21063) 2023-06-10 14:35:15 -06:00
QMK Bot
ea70b361ce Merge remote-tracking branch 'origin/master' into develop 2023-06-10 15:02:22 +00:00
Florent Linguenheld
eee9a53a80
Up keymap (#20769)
flinguenheld keymap aurora sweep
2023-06-10 16:01:44 +01:00
QMK Bot
0d574cd82e Merge remote-tracking branch 'origin/master' into develop 2023-06-10 14:59:13 +00:00
Cipulot
08289fc53a
EC Alveus (#20840)
Cipulot's EC Alveus PR
2023-06-10 15:58:36 +01:00
QMK Bot
a9a68ff4f1 Merge remote-tracking branch 'origin/master' into develop 2023-06-10 02:17:31 +00:00
Jared
e01e3fc866
Typo Correction in planck/rev7 readme.md (#21194)
Corrected typo explaining encoder requirements.
2023-06-09 22:16:46 -04: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
c8e47bea98 Merge remote-tracking branch 'origin/master' into develop 2023-06-09 18:35:05 +00:00
Ryan
e3b80b4151
Remove some keymap-level info.jsons (#21191) 2023-06-09 19:34:24 +01:00
QMK Bot
4c60ebdbe0 Merge remote-tracking branch 'origin/master' into develop 2023-06-09 01:46:47 +00:00
Jack Humbert
232281946d
Adds Planck Rev 7 & Updates rev6_drop to Matrix Lite Implementation (#21175)
* adds planck/rev7

* Remove config.h include

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

* convert planck matrices to lite implementation

---------

Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-06-08 21:46:09 -04: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
cc64247ebf Merge remote-tracking branch 'origin/master' into develop 2023-06-08 01:03:58 +00:00
biuboom-jun
f136171753
add kibou/wendy (#21150) 2023-06-08 02:03:17 +01:00
QMK Bot
a059d121fa Merge remote-tracking branch 'origin/master' into develop 2023-06-07 23:57:41 +00:00
James Young
dffbe1e655
monoflex60: fix LAYOUT_60_iso_tsangan implementation (#21158) 2023-06-08 00:57:05 +01:00
QMK Bot
3fa92a4e7e Merge remote-tracking branch 'origin/master' into develop 2023-06-07 23:56:53 +00:00
James Young
57c5f3e674
poker87d: correct layout data (#21159) 2023-06-08 00:55:49 +01:00
QMK Bot
a02230f6fc Merge remote-tracking branch 'origin/master' into develop 2023-06-06 21:55:10 +00:00
James Young
bb57aa28e5
peej/tripel: correct layout data (#21145)
Corrects the layout data for all three versions of the Peej Tripel.
2023-06-06 22:54:31 +01:00
QMK Bot
ff1d7d287c Merge remote-tracking branch 'origin/master' into develop 2023-06-06 21:46:52 +00:00
James Young
45d060805e
xelus/rs108: correct layout data (#21146) 2023-06-06 22:46:15 +01:00
QMK Bot
64eb9852d2 Merge remote-tracking branch 'origin/master' into develop 2023-06-06 07:04:38 +00:00
Travis Mick
dd9712c40e
[Keyboard] Add egg58 (#21021) 2023-06-06 00:03:57 -07: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
QMK Bot
4c928b0680 Merge remote-tracking branch 'origin/master' into develop 2023-06-06 05:14:31 +00:00
FanXingStudio
9167e66ca7
[Keyboard] add kibou/harbour (#21131) 2023-06-05 23:13:47 -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
QMK Bot
f91ca76c78 Merge remote-tracking branch 'origin/master' into develop 2023-06-05 20:43:42 +00:00
Jeayo Keh
04812e9443
[Keyboard] Add soda/mango (#21100)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2023-06-05 14:43:02 -06:00
QMK Bot
3617cbde7a Merge remote-tracking branch 'origin/master' into develop 2023-06-05 20:35:00 +00:00
Will Hedges
8f108d1bbc
[Keyboard] Upddate bioi/G60BLE to use bluetooth (#21120)
Co-authored-by: jack <0x6a73@protonmail.com>
2023-06-05 14:34:22 -06:00
QMK Bot
83a726c30e Merge remote-tracking branch 'origin/master' into develop 2023-06-05 05:59:35 +00:00
Moritz Plattner
7b57c4ecf6
fixed E80 1800 layout macros (#21125) 2023-06-05 06:58:59 +01:00
QMK Bot
2d09305445 Merge remote-tracking branch 'origin/master' into develop 2023-06-04 01:49:13 +00:00
Ramiro Bou
67b9f56f22
Fix USB PIDs on Churrosoft Deck-8 (#21126) 2023-06-04 02:48:29 +01:00
QMK Bot
220dad26d0 Merge remote-tracking branch 'origin/master' into develop 2023-06-04 01:11:30 +00:00
mechlovin
698e31a2b0
[Keyboard] Zed65 Rev.1 - Update info.json (#21122) 2023-06-04 02:10:53 +01:00
QMK Bot
ce94daf3d8 Merge remote-tracking branch 'origin/master' into develop 2023-06-03 20:39:49 +00:00
Guido Bartolucci
23a9d1ffc7
[Keyboard] Add Andean Condor (#21118)
Co-authored-by: Joel Challis <git@zvecr.com>
2023-06-03 14:39:13 -06:00
QMK Bot
a3c58ba567 Merge remote-tracking branch 'origin/master' into develop 2023-06-03 20:38:54 +00:00
Ramiro Bou
f6bbd4d2c5
[Keyboard] Add Churrosoft Deck-8 (#21119)
Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-06-03 14:38:09 -06:00
QMK Bot
7d676f1aa6 Merge remote-tracking branch 'origin/master' into develop 2023-06-03 07:04:21 +00:00
mechlovin
f4a608255a
[Keyboard] Add the Zed65 rev.1 PCB (#21043)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-06-03 01:03:45 -06:00
QMK Bot
ef788c68f4 Merge remote-tracking branch 'origin/master' into develop 2023-06-02 07:46:36 +00:00
yiancar
ae5bcaac0d
[keyboard] Phoenix (#21051)
* Update keyboards/cablecardesigns/phoenix/
2023-06-02 08:45:54 +01:00
Ryan
a4ed6ad0f5
Unicodemap keycodes rename (#21092) 2023-06-01 17:25:08 +01:00
QMK Bot
45c9bc4e55 Merge remote-tracking branch 'origin/master' into develop 2023-06-01 14:11:31 +00:00
DeskDaily
b110a09886
[Keyboard] Add lightweight65 keyboard (#21034)
Co-authored-by: Neil Brian Ramirez <nightlykeyboards@gmail.com>
Co-authored-by: Neil Brian Ramirez <nightlyboards@gmail.com>
2023-06-01 07:10:47 -07:00
QMK Bot
857e9b74d6 Merge remote-tracking branch 'origin/master' into develop 2023-06-01 09:26:41 +00:00
Sergi Meseguer
c805c10672
[Keymap] z12 zigotica keymap tweaks (#20990) 2023-06-01 02:25:49 -07:00
QMK Bot
6156972781 Merge remote-tracking branch 'origin/master' into develop 2023-05-31 19:03:39 +00:00
kkokdae
81bc0925e9
[Keymap] Modify kkokdae keymap for keyboardio/atreus (#21037) 2023-05-31 12:02:58 -07:00
3araht
5a26e5e790
[Keymap] transpose added to giabalanai keymaps (#21054) 2023-05-31 11:48:56 -07:00
CoffeeIsLife
c2ddd77e0d
[Keymap] Cleanup coffeeislife87 keymap and remove features (#21061)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Fae <faenkhauser@gmail.com>
2023-05-31 11:46:59 -07:00
Drashna Jaelre
3a3e5abac9
[Keymap] Drashna Keymap updates for 0.21.0 (#21073) 2023-05-31 11:44:06 -07:00
Nick Brassel
8c9f54d70b
Encoder map: NUM_DIRECTIONS (#21066) 2023-05-28 13:38:24 +10: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
Nick Brassel
e759230706
Fix up keebio/cepstrum (#21062) 2023-05-27 05:49:57 +01: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
Joel Challis
b2e5017e74
Move thekey to Drop vendor folder (#21032) 2023-05-25 23:08:12 +01:00
Drashna Jaelre
ed69d78f27
[Bug][Keyboard] Fix key display on Corne OLED (#21044) 2023-05-25 16:41:12 +01:00
QMK Bot
6d93d8b56a Merge remote-tracking branch 'origin/master' into develop 2023-05-24 18:48:31 +00:00
Danny
f9c32974ef
Add encoder map FoldKB in VIA (#21038) 2023-05-24 19:47:46 +01:00
QMK Bot
a12c1e0bcf Merge remote-tracking branch 'origin/master' into develop 2023-05-24 07:54:46 +00:00
Xyverz
618d0f05f4
Removed unneeded layers from xyverz keymaps (#21008) 2023-05-24 08:54:06 +01:00
Ryan
595f7db384
Remove HHKB RN42 code (#21007) 2023-05-22 04:40:34 +01:00
QMK Bot
5261ac9f0c Merge remote-tracking branch 'origin/master' into develop 2023-05-21 15:57:48 +00:00
Ananya Kirti
08a8d35bc3
[Keyboard] Added Support for trainpad (#20973)
* Added Support for trainpad

added support for trainpad

* corrected capitalisation

corrected capitalisation

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

* Update keyboards/trainpad/info.json

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

* Update readme.md

updated readme to remove handwire, and corrected number of keys

* removed config.h, trainpad.c and trainpad.h

removed config.h, trainpad.c and trainpad.h

* updated readme

upadted readme to correct capitalisation

* Update keyboards/trainpad/info.json

* Update keyboards/trainpad/info.json

* Update keyboards/trainpad/rules.mk

* updated Readme

updated Readme

* Update keyboards/trainpad/readme.md
2023-05-21 08:57:08 -07:00
Sergey Vlasov
6a7ba7a29d
rart/rart80:via: restore rules.mk after #20334 (#21002)
PR #20334 accidentally removed the `rules.mk` file from the `via` keymap
for `rart/rart80`; restore that file.
2023-05-20 19:51:26 +01:00
Drashna Jaelre
b93f05dc35
[Keyboard] Fixup Crkbd default keymap (#20962) 2023-05-20 22:13:39 +10:00
Ryan
ab8c5013c8
BIOI G60/Morgan65: use custom Bluetooth driver (#20897) 2023-05-20 22:12:59 +10:00
Less/Rikki
9dec31d056
[keyboard] update ymdk/id75/rules.mk for develop (#20592) 2023-05-20 22:10:44 +10:00
Alabahuy
0d844a5d4b
Add sriwedari70 and move kamigakushi to new folder (#20334)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: zacksupreme <zacksupreme@gmail.com>
2023-05-20 22:10:13 +10:00
Duncan Sutherland
d1395ca4d5
add additional layouts to dactyl_manuform variants (#20688) 2023-05-20 22:06:53 +10:00
QMK Bot
4dcb46e284 Merge remote-tracking branch 'origin/master' into develop 2023-05-20 00:22:52 +00:00
Jay Greco
449240f198
scramble: Add XOSC delay for startup (#20991) 2023-05-20 01:22:07 +01:00
QMK Bot
78afa1164d Merge remote-tracking branch 'origin/master' into develop 2023-05-18 16:21:45 +00:00
adophoxia
a4771e4fe4
[Keyboard] Add Fancytech Fancyalice66 (#20647)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-05-18 18:21:07 +02:00
QMK Bot
4b1a98cb82 Merge remote-tracking branch 'origin/master' into develop 2023-05-18 15:50:21 +00:00
Danny
b50abd370d
Define RGB_DI_PIN directly instead of using another define (#20983) 2023-05-18 16:49:35 +01:00
QMK Bot
757f5b0c68 Merge remote-tracking branch 'origin/master' into develop 2023-05-18 10:29:45 +00:00