Joel Challis
1bd9b9204d
Migrate RGB Matrix config to info.json - EF ( #22808 )
2024-01-04 06:04:57 +00:00
Joel Challis
a5f1438f58
Migrate RGB Matrix config to info.json - C ( #22807 )
2024-01-04 06:00:47 +00:00
Joel Challis
c412b7fc42
Migrate RGB Matrix config to info.json - B ( #22806 )
2024-01-04 06:00:28 +00:00
Ryan
f583d2fef0
Remove IS31FLCOMMON code ( #22800 )
2024-01-02 16:26:01 +11:00
Joel Challis
8a6b7003f7
Migrate RGB Matrix config to info.json - [0-9] ( #22797 )
2024-01-02 03:07:28 +00:00
Thomas Mørch
d59d768fea
Keychron Q11 - Enable SPLIT_WATCHDOG ( #22799 )
2024-01-02 03:06:47 +00:00
Joel Challis
60f0132bd5
Migrate RGB Matrix config to info.json - A ( #22798 )
2024-01-02 03:05:08 +00:00
Ryan
ae2d5e2e5a
LED drivers: extract IS31FL3743A from IS31COMMON ( #22635 )
2024-01-01 17:04:51 +11:00
Joel Challis
0ea3203205
Temporary fix for mechlovin/olly/octagon ( #22796 )
2024-01-01 02:40:10 +00:00
Joel Challis
709d07aebc
Migrate LED Matrix config to info.json ( #22792 )
2024-01-01 01:33:20 +00:00
QMK Bot
ef356ddee6
Merge remote-tracking branch 'origin/master' into develop
2023-12-31 18:26:28 +00:00
Antoine Bertin
90811118b7
docs(skeletyl): fix readme instructions ( #22791 )
2023-12-31 18:25:58 +00:00
QMK Bot
a081fc7301
Merge remote-tracking branch 'origin/master' into develop
2023-12-29 16:17:49 +00:00
4pplet
fc20e0b014
Waffling60 iso rev e ( #22733 )
...
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-12-29 08:17:20 -08:00
Joel Challis
9e50faedae
Remove incorrect use of WS2812_PIO_USE_PIO1 ( #22771 )
2023-12-28 17:07:40 +00:00
QMK Bot
73f962766e
Merge remote-tracking branch 'origin/master' into develop
2023-12-28 04:37:34 +00:00
yuezp
420b13468b
[Keyboard] Add meetlab kafkasplit ( #22756 )
...
Co-authored-by: “yuezp” <“yuezpchn@126.com”>
2023-12-27 20:37:01 -08:00
QMK Bot
a011b5ed5c
Merge remote-tracking branch 'origin/master' into develop
2023-12-27 22:11:36 +00:00
Tom Barnes
2505d7edd0
vendor keymaps-mechboards via updates ( #22767 )
...
* update mb_via keymaps to new naming for vendor keymaps
* missed a reference to old name, tidy crkbd readme, add lily58 readme
* fix typo
* fix typo
* delete shopify image
2023-12-27 15:11:06 -07:00
フィルターペーパー
594d03f4aa
Refactor: group hub keyboards ( #22762 )
2023-12-26 20:28:06 -08:00
フィルターペーパー
2a048fbb65
Refactor: group kira keyboards ( #22760 )
2023-12-26 20:27:29 -08:00
フィルターペーパー
489151d7a0
Refactor: move macro3 into handwired folder ( #22759 )
2023-12-26 20:26:48 -08:00
QMK Bot
da6a05bfea
Merge remote-tracking branch 'origin/master' into develop
2023-12-27 01:13:09 +00:00
Ryan
cc08f230ff
bm40hsrgb/rev2: disable some RGB Matrix effects to reduce filesize ( #22761 )
2023-12-27 01:12:42 +00:00
フィルターペーパー
592a2d26ce
Default folder correction for rookiebwoy ( #22753 )
...
Add prefix for the default folder directive
2023-12-25 23:58:21 +00:00
フィルターペーパー
df87a75c82
Default folder correction for kumaokobo ( #22750 )
...
Add prefix for the default folder directive
2023-12-25 17:12:23 +00:00
フィルターペーパー
e5a92fa80f
Refactor: group rookiebwoy keyboards ( #22745 )
...
Move @rookiebwoy's keyboards into rookiebwoy folder
2023-12-25 07:40:30 -07:00
QMK Bot
2166eaf9a7
Merge remote-tracking branch 'origin/master' into develop
2023-12-24 18:17:01 +00:00
Jesse Leventhal
83b84187ea
[Keyboard] Add Noodlepad_Micro ( #22703 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
2023-12-24 10:16:34 -08:00
Vlad K
830ca0c415
[Keyboard] Add Orthograph ( #21770 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Vlad Kvitnevskiy <vladkvit@outlook.com>
Co-authored-by: Your Name <you@example.com>
2023-12-24 10:16:05 -08:00
QMK Bot
03848bb3aa
Merge remote-tracking branch 'origin/master' into develop
2023-12-24 06:31:22 +00:00
Sắn
15ed59cacc
[Keyboard] Add Nuxros RE65 ( #22078 )
...
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-12-23 22:30:54 -08:00
QMK Bot
5cf0888197
Merge remote-tracking branch 'origin/master' into develop
2023-12-24 03:35:08 +00:00
khchen2004
fae6b85640
[Keyboard] add scorpio pcb ( #22732 )
2023-12-23 19:34:17 -08:00
フィルターペーパー
b37d23bfa5
Refactor: group shandoncodes keyboards ( #22743 )
2023-12-23 19:02:29 -08:00
QMK Bot
5050b91068
Merge remote-tracking branch 'origin/master' into develop
2023-12-24 03:02:09 +00:00
Joy Lee
2d5cfd3ecf
[Keyboard] Add darmoshark k3 ( #21980 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Proceee <proceee@gmail.com>
2023-12-23 19:01:42 -08:00
QMK Bot
f70edea123
Merge remote-tracking branch 'origin/master' into develop
2023-12-23 23:57:39 +00:00
フィルターペーパー
456291d04e
Refactor: move miniaxe into kagizaraya ( #22708 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-12-23 15:49:47 -08:00
peepeetee
a1d29982dc
Add Momokai Aurora Image ( #22728 )
...
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-12-23 15:49:37 -08:00
フィルターペーパー
6510188138
Refactor: move keyboards into kbdmania folder ( #22714 )
2023-12-23 15:49:18 -08:00
フィルターペーパー
6f16349e93
Refactor: move keyboards into monokei folder ( #22715 )
2023-12-23 15:48:40 -08:00
フィルターペーパー
9642cd9046
Refactor: move keyboards into kumaokobo ( #22719 )
2023-12-23 15:48:32 -08:00
フィルターペーパー
77688ac706
Refactor: move keyboards into kezewa ( #22712 )
2023-12-23 15:48:18 -08:00
フィルターペーパー
0b410ffd77
Refactor: move keyboards into zigotica folder ( #22709 )
2023-12-23 15:46:46 -08:00
Drashna Jaelre
70a7ed26e1
[Keyboard] Move Moonlander to ZSA folder ( #22740 )
2023-12-23 15:46:07 -08:00
フィルターペーパー
300af1e5bf
Refactor: move keyboards into laneware folder ( #22710 )
2023-12-23 15:45:53 -08:00
QMK Bot
84ba999f2a
Merge remote-tracking branch 'origin/master' into develop
2023-12-23 23:45:41 +00:00
Jesse Leventhal
7e47446695
[Keyboard] Noodlepad Additions and Updates ( #22701 )
...
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-12-23 15:45:33 -08:00
yuezp
08711e1cf7
[Keyboard] Add kafka68 ( #22684 )
...
Co-authored-by: “yuezp” <“yuezpchn@126.com”>
2023-12-23 15:45:12 -08:00
QMK Bot
6e356c7860
Merge remote-tracking branch 'origin/master' into develop
2023-12-23 22:06:04 +00:00
Joe Scotto
0e9e2963ca
[Keyboard] Fix Scotto61 Configurator Layout ( #22718 )
2023-12-23 14:05:36 -08:00
QMK Bot
1fbbb1fa9b
Merge remote-tracking branch 'origin/master' into develop
2023-12-23 21:52:08 +00:00
Joe Scotto
1e304433e5
[Keyboard] Add Scotto108 handwired keyboard ( #22720 )
...
Co-authored-by: jack <0x6a73@protonmail.com>
2023-12-23 13:51:38 -08:00
QMK Bot
0c48e69ced
Merge remote-tracking branch 'origin/master' into develop
2023-12-23 21:12:15 +00:00
Abhijithabhi
b5b886e36f
[Keyboard] Add redragon k617 port ( #22410 )
...
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-12-23 13:11:39 -08:00
user176176
92d7b8cb54
[Keyboard] null ST110R2.1 (SaikouType) ( #21623 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: user176176 <you@example.com>
2023-12-22 23:48:27 -08:00
Jesse Leventhal
088853dd22
[Keyboard] Updating NCC1701KB ( #22721 )
2023-12-20 16:24:54 -08:00
QMK Bot
e80f5de78c
Merge remote-tracking branch 'origin/master' into develop
2023-12-20 22:02:55 +00:00
Nick Brassel
3afa2a9439
[Keymap Removal] Restore mechboards mb_via keymaps. ( #22723 )
2023-12-21 09:02:22 +11:00
fauxpark
2c191e21c2
Merge remote-tracking branch 'upstream/master' into develop
2023-12-20 16:03:14 +11:00
Ryan
8812a09581
Rename RGB_DISABLE_WHEN_USB_SUSPENDED
-> RGB_MATRIX_SLEEP
( #22682 )
2023-12-20 13:31:50 +11:00
Ryan
73758d3d3a
Rename LED_DISABLE_WHEN_USB_SUSPENDED
-> LED_MATRIX_SLEEP
( #22681 )
2023-12-20 13:31:39 +11:00
フィルターペーパー
c8728880de
takashicompany: readme link correction ( #22711 )
...
Updated Github link
2023-12-19 13:54:32 -07:00
Pham Duc Minh
2ce2fa6d06
[Keyboard] Add Deemen17 DE60FS ( #22667 )
...
* Add de60fs
* Update
* Add image
* Add line break for rules.mk
* Update keyboards/deemen17/de60fs/keymaps/default/keymap.c
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
* Update keyboards/deemen17/de60fs/info.json
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
* Remove readme of keymap folder
* Change to KC_RSFT
* Add Community Layout support
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/deemen17/de60fs/info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/deemen17/de60fs/keymaps/default/keymap.c
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/deemen17/de60fs/keymaps/via/keymap.c
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Add description in readme
---------
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-12-18 17:02:47 -07:00
Joel Challis
c9d90db95c
[Keymap Removal] xiudi/xd75 and related keymaps. ( #22698 )
2023-12-19 09:02:03 +11:00
Joel Challis
1b75a84a39
[Keymap Removal] tada68 and related keymaps. ( #22699 )
2023-12-19 08:56:52 +11:00
Joel Challis
fc4e6c61a4
[Keymap Removal] Restore splitkb 'debug' keymaps ( #22700 )
2023-12-19 08:55:36 +11:00
Ryan
b9e81c0691
Update keyboard LED driver configs ( #22638 )
2023-12-18 20:13:08 +00:00
Nick Brassel
a1c8b1ebf7
Remove obvious user keymaps, keyboards/{d,e,f}*
edition. ( #22695 )
2023-12-18 21:45:52 +11:00
Nick Brassel
d235352504
Remove obvious user keymaps, keyboards/{b,c}*
edition. ( #22693 )
2023-12-18 16:05:50 +11:00
Nick Brassel
f25226453f
Remove obvious user keymaps, keyboards/a*
edition. ( #22692 )
2023-12-18 14:06:47 +11:00
Nick Brassel
9539f135d8
Remove obvious user keymaps, keyboards/[0-9]*
edition. ( #22691 )
2023-12-18 13:53:02 +11:00
Joel Challis
27a710861e
[Keymap Removal] Preonic and related keymaps. ( #22689 )
2023-12-18 12:51:24 +11:00
DOIO2022
1556a2ed0e
[Keyboard] Add doio KB19 ( #22393 )
...
* Add files via upload
* Update keyboards/doio/kb3x/config.h
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/doio/kb3x/info.json
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/doio/kb3x/keymaps/via/keymap.c
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/doio/kb3x/config.h
Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com>
* Update keyboards/doio/kb3x/keymaps/default/keymap.c
Co-authored-by: Joel Challis <git@zvecr.com>
* Update rules.mk
* Update info.json
* Update keyboards/doio/kb3x/info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/doio/kb3x/rules.mk
Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com>
* Add files via upload
* Update keyboards/doio/kb3x/info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/doio/kb3x/config.h
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Delete keyboards/doio/kb3x/rules.mk
* Update keyboards/doio/kb3x/keymaps/default/keymap.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/doio/kb3x/keymaps/via/keymap.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Add KB19
* Delete keyboards/doio/kb3x directory
* format info.json
* format info.json
* Create rules.mk
* Update rules.mk
* Update keyboards/doio/kb19/config.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update info.json
* Update keymap.c
* Update keymap.c
* Delete keyboards/doio/kb19/config.h
* Update keyboards/doio/kb19/keymaps/via/keymap.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/doio/kb19/keymaps/default/keymap.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
---------
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-12-17 18:51:14 -07:00
QMK Bot
62db54dc32
Merge remote-tracking branch 'origin/master' into develop
2023-12-18 01:49:49 +00:00
Joel Challis
990895f03f
[Keymap Removal] keebio/iris and related keymaps. ( #22690 )
2023-12-18 12:49:19 +11:00
QMK Bot
e27034f800
Merge remote-tracking branch 'origin/master' into develop
2023-12-17 18:51:13 +00:00
Ivan Gromov
54200b7b82
[Keyboard] Add Diablo ( #22414 )
...
* Create keymap.c
* Create keymap.c
* Create rules.mk
* Add files via upload
* Create keymap.c
* Create keymap.c
* Create rules.mk
* Add files via upload
* Update keymap.c
* Update keymap.c
* Update keyboards/keyten/diablo/keymaps/default/keymap.c
Co-authored-by: jack <0x6a73@protonmail.com>
* Delete keyboards/keyten/kt60hs_t directory
* Update keyboards/keyten/diablo/readme.md
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/keyten/diablo/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update info.json
* Update info.json
* Update keymap.c
* Update keymap.c
* Update keyboards/keyten/diablo/info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/keyten/diablo/info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
---------
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-12-17 11:50:44 -07:00
Nick Brassel
ae90b1d1e5
Merge remote-tracking branch 'upstream/master' into develop
2023-12-17 22:27:35 +11:00
Nick Brassel
7ea022ba88
[Keymap Removal] Planck and related keymaps. ( #22683 )
2023-12-17 21:54:01 +11:00
QMK Bot
02f6ab264d
Merge remote-tracking branch 'origin/master' into develop
2023-12-17 08:40:06 +00:00
MakotoKurauchi
f0e4bc937a
Add keyboard Ergo68 ( #22677 )
...
* Ergo68の追加
* 写真の追加
* fix build error
* Update keyboards/yushakobo/ergo68/readme.md
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/yushakobo/ergo68/keymaps/via/keymap.c
Co-authored-by: Joel Challis <git@zvecr.com>
* config.h migrated to info.json
* Update keyboards/yushakobo/ergo68/info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/yushakobo/ergo68/readme.md
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/yushakobo/ergo68/info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/yushakobo/ergo68/keymaps/via/rules.mk
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/yushakobo/ergo68/keymaps/default/keymap.c
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/yushakobo/ergo68/keymaps/via/keymap.c
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/yushakobo/ergo68/info.json
Co-authored-by: jack <0x6a73@protonmail.com>
* Update keyboards/yushakobo/ergo68/info.json
Co-authored-by: jack <0x6a73@protonmail.com>
* Update keyboards/yushakobo/ergo68/info.json
Co-authored-by: Joel Challis <git@zvecr.com>
---------
Co-authored-by: Salicylic-acid3 <46864619+Salicylic-acid3@users.noreply.github.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-12-17 01:39:35 -07:00
QMK Bot
94c64fef51
Merge remote-tracking branch 'origin/master' into develop
2023-12-17 05:01:26 +00:00
yuezp
849ddc27ee
[Keyboard] Add kafka60 ( #22659 )
...
Co-authored-by: “yuezp” <“yuezpchn@126.com”>
2023-12-16 22:00:58 -07:00
QMK Bot
9ec0f3cd59
Merge remote-tracking branch 'origin/master' into develop
2023-12-17 02:18:48 +00:00
adophoxia
bd932f1cce
[Keyboard] Add Odin75 ( #22650 )
...
* Add Odin75
* Update keyboards/kbdfans/odin75/lib/bongocat.h
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/kbdfans/odin75/keymaps/via/keymap.c
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/kbdfans/odin75/halconf.h
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/kbdfans/odin75/keymaps/default/keymap.c
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/kbdfans/odin75/keymaps/via/keymap.c
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/kbdfans/odin75/odin75.c
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/kbdfans/odin75/keymaps/default/keymap.c
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/kbdfans/odin75/mcuconf.h
Co-authored-by: Joel Challis <git@zvecr.com>
* Fix indentation
* Add back missing `return false;`
* Update keyboards/kbdfans/odin75/odin75.c
Co-authored-by: jack <0x6a73@protonmail.com>
* Update keyboards/kbdfans/odin75/keymaps/via/keymap.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/kbdfans/odin75/keymaps/default/keymap.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/kbdfans/odin75/odin75.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Apply suggestions from code review
Co-authored-by: jack <0x6a73@protonmail.com>
---------
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-12-16 19:18:11 -07:00
QMK Bot
7298551e19
Merge remote-tracking branch 'origin/master' into develop
2023-12-15 21:29:02 +00:00
Wolf Van Herreweghe
9874d78da3
[Keyboard] Add Mode Tempo PCB's ( #22550 )
...
* Add mode 60 PCB's
* Update Licenses
* Unify Vendor name cross other projects
* Move pin description from Config to Info.json
* Replace WS2812 driver with PWM
* Update keyboards/mode/m60h/config.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/mode/m60h_f/config.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/mode/m60h/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/mode/m60s/config.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/mode/m60s/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
* Format info.json files
* replace link with images
* Fix spacings in Config file
* remove non essential file
* Update readme.md spacings
* Update readme.md Spacings
* Update readme.md
---------
Co-authored-by: Wolf <contact@vwolf.be>
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-12-15 14:28:27 -07:00
QMK Bot
d2fcf78266
Merge remote-tracking branch 'origin/master' into develop
2023-12-15 21:26:06 +00:00
Joe Scotto
443971ab8e
Add Scotto61 handwired keyboard ( #22666 )
...
* Add Scotto61 handwired keyboard
* qmk format info.json
2023-12-15 14:25:37 -07:00
QMK Bot
9ea3f5575a
Merge remote-tracking branch 'origin/master' into develop
2023-12-15 21:23:19 +00:00
Panos Sakkos
b9bc470404
Enable Link Time Optimization for Lily58 Default Keymap ( #22476 )
...
* enable LTO for Lily58 Default keymap
* remove NKRO from lily58 default
2023-12-15 14:22:50 -07:00
QMK Bot
d32812850c
Merge remote-tracking branch 'origin/master' into develop
2023-12-15 14:31:04 +00:00
Dasky
4b3f9b8b3a
Add Reverb keyboard. ( #22387 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
2023-12-15 14:30:35 +00:00
QMK Bot
b09fae9eba
Merge remote-tracking branch 'origin/master' into develop
2023-12-14 17:44:31 +00:00
フィルターペーパー
26b6ba7607
Cradio: update default keymap ( #22657 )
...
* Reduce copyright blurb
* Change home row mod placing
2023-12-14 10:43:59 -07:00
adophoxia
f19fa9854e
[Keyboard] Update Keychron Q8 ( #22578 )
...
* Update Q8
* Run `qmk format-json` and remove `RGB_MATRIX_LED_COUNT`
* Update keyboards/keychron/q8/ansi_encoder/info.json
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/keychron/q8/iso/info.json
Co-authored-by: Ryan <fauxpark@gmail.com>
---------
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-12-14 00:44:44 -07:00
QMK Bot
79df864aa1
Merge remote-tracking branch 'origin/master' into develop
2023-12-14 07:44:04 +00:00
azhizhinov
afb821077b
[Keyboard] Add El Cantor HS ( #22531 )
...
* Initial upload.
Initial upload.
* Update readme.md
* Delete keyboards/elcantorhs/keymaps/zeromist directory
* Adding folder for VIA.
* Update readme.md
* Update readme.md
* Update readme.md
* Update readme.md
* Update readme.md
* Update keymap.c
* Update info.json
* Update info.json
* Update info.json
* Update info.json
* Update keymap.c
* Update keymap.c
* Update keymap.c
* Update config.h
* Update halconf.h
* Update mcuconf.h
* Create keymap.c
* Update info.json
* Update keyboards/elcantorhs/readme.md
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
* Update keyboards/elcantorhs/info.json
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
* Update keyboards/elcantorhs/info.json
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
* Update keyboards/elcantorhs/info.json
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
* Update keyboards/elcantorhs/rules.mk
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
* Update keyboards/elcantorhs/info.json
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
* Update keyboards/elcantorhs/config.h
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
* Update readme.md
* Update keyboards/elcantorhs/info.json
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
* Update config.h
* Update halconf.h
* Update keymap.c
* Update keymap.c
* Update mcuconf.h
* Update keyboards/elcantorhs/readme.md
Yep. Can't say better. :-)
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update readme.md
* Update keyboards/elcantorhs/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
---------
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-12-14 00:43:22 -07:00
QMK Bot
7fe03a73b8
Merge remote-tracking branch 'origin/master' into develop
2023-12-14 07:41:54 +00:00
Freather
4cdb19291f
[Keyboard] Add fuji75 ( #22158 )
...
* adding fuji75 pcb support
adding fuji75 pcb support
includes
solder
hotswap
* Update keymap.c
* Update keymap.c
* Update keyboards/sakura_workshop/fuji75/fuji75.c
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/sakura_workshop/fuji75/solder/readme.md
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/sakura_workshop/fuji75/hotswap/readme.md
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/sakura_workshop/fuji75/solder/readme.md
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/sakura_workshop/fuji75/info.json
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/sakura_workshop/fuji75/hotswap/readme.md
Co-authored-by: Joel Challis <git@zvecr.com>
* Delete keyboards/sakura_workshop/fuji75/config.h
* Update keyboards/sakura_workshop/fuji75/solder/readme.md
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/sakura_workshop/fuji75/hotswap/readme.md
Co-authored-by: Drashna Jaelre <drashna@live.com>
* update info.json
update info.json per requested by @fauxpark
reran qmk format-json
---------
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-12-14 00:41:13 -07:00
QMK Bot
aa7eef0a02
Merge remote-tracking branch 'origin/master' into develop
2023-12-14 01:07:43 +00:00
Joel Challis
c44a232c57
Remove invalid keymap from zos/65s ( #22655 )
...
Default community layout is nameddefault_65_ansi_blocker so should never also be used at the keyboard level.
2023-12-14 01:07:15 +00:00
Pedro Del Moral Lopez
d3da222728
kikoslab/kl90: Update firmware to support encoder map ( #22649 )
2023-12-14 00:02:34 +00:00
QMK Bot
1b1c6326c7
Merge remote-tracking branch 'origin/master' into develop
2023-12-13 23:43:06 +00:00
PixelSpaceStudio
357a10f6c8
Add keyboard shadow80 ( #22534 )
...
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-12-13 15:42:36 -08:00
QMK Bot
c46de05eb0
Merge remote-tracking branch 'origin/master' into develop
2023-12-13 23:41:33 +00:00
ZOSKB
85a0da9a55
[Keyboard] Add zos ( #22491 )
...
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-12-13 15:41:26 -08:00
peepeetee
71525fa1a2
[Keyboard] minor Momokai Aurora bugfixes and RGB updates ( #22486 )
2023-12-13 15:41:01 -08:00
QMK Bot
f870a04bb7
Merge remote-tracking branch 'origin/master' into develop
2023-12-13 19:41:05 +00:00
Tom Barnes
68afa1ef06
[keyboard] Add Keycapsss 3w6_2040 ( #22642 )
...
* initial commit
* tidy info.json, add readme.md
* correct license headers
* fix some minor typos
* additions to readme
* try and conform to standards
* remove duplicates from config.h
* remove unneccessary line from rules.mk
* further tidying
* some small misses
* some small misses
* repair via keymap
* actually fixed, d'oh
* Update keyboards/keycapsss/3w6_2040/info.json
Co-authored-by: jack <0x6a73@protonmail.com>
* Update keyboards/keycapsss/3w6_2040/info.json
Co-authored-by: jack <0x6a73@protonmail.com>
* Update keyboards/keycapsss/3w6_2040/keymaps/default/keymap.c
Co-authored-by: jack <0x6a73@protonmail.com>
* Update keyboards/keycapsss/3w6_2040/info.json
Co-authored-by: jack <0x6a73@protonmail.com>
* Update keyboards/keycapsss/3w6_2040/keymaps/via/keymap.c
Co-authored-by: jack <0x6a73@protonmail.com>
* Update keyboards/keycapsss/3w6_2040/readme.md
Co-authored-by: jack <0x6a73@protonmail.com>
* remove via config.h
---------
Co-authored-by: jack <0x6a73@protonmail.com>
2023-12-13 12:40:33 -07:00
Less/Rikki
49527afc6a
fix: improper usage of keyboard/user-level functions ( #22652 )
2023-12-13 18:33:15 +00:00
Zykrah
05d2b7e2ac
Rename Pumpkin Pad to Pumkinpad ( #22651 )
2023-12-13 18:28:17 +00:00
QMK Bot
ee90267734
Merge remote-tracking branch 'origin/master' into develop
2023-12-13 17:25:54 +00:00
Starry Knight
ea56863e32
[Keyboard] add dude09 ( #22648 )
...
* dude09 macropad files
added to keyboards/handwired/starrykeebs/dude09
* Update readme.md
fixed imgur link
* Update readme.md
* Update readme.md
* Update info.json
formatting using qmk
* Update config.h
header
* Update keymap.c
header
* Update keymap.c
header
* Update readme.md
* Delete keyboards/handwired/starrykeebs/dude09/via.json
not needed for QMK
* Delete keyboards/handwired/starrykeebs/dude09/config.h
empty file
* Update info.json
windows to unix le
* Update keymap.c
windows to unix le
* Update keymap.c
windows to unix le
* Update readme.md
windows to unix le
* fixed new line windows to unix
* Update info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update readme.md
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update readme.md
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/handwired/starrykeebs/dude09/keymaps/via/rules.mk
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/handwired/starrykeebs/dude09/rules.mk
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update readme.md
Co-authored-by: jack <0x6a73@protonmail.com>
---------
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-12-13 10:25:20 -07:00
Duncan Sutherland
02c5afc7d5
Karn: correct layout data ( #22201 )
2023-12-12 09:48:13 -07:00
QMK Bot
c2c78996d9
Merge remote-tracking branch 'origin/master' into develop
2023-12-12 09:32:06 +00:00
yuezp
9c857728c6
[Keyboard] Add meetlab/kalice ( #22207 )
...
Co-authored-by: “yuezp” <“yuezpchn@126.com”>
2023-12-12 01:31:36 -08:00
casuanoob
06b9925156
Bastard Keyboards: Add support for Dilemma v2 (3x5+3) ( #22185 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Charly Delay <charly@delay.gg>
2023-12-12 01:22:59 -08:00
QMK Bot
faf9c38c26
Merge remote-tracking branch 'origin/master' into develop
2023-12-12 08:50:20 +00:00
Marek128b
1c68cd09b8
[Keyboard] add ergosplit44 v1 ( #22344 )
...
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-12-12 00:48:59 -08:00
QMK Bot
967a6138ac
Merge remote-tracking branch 'origin/master' into develop
2023-12-12 08:48:57 +00:00
jpe230
e2d6187339
[Keyboard] Add Big Knob board ( #22292 )
...
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-12-12 00:48:24 -08:00
Coom
fb3c91375c
[Keyboard] zk3mod : added OLED ( #22303 )
...
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-12-12 00:44:14 -08:00
Álvaro A. Volpato
1f9b653f58
[Keyboard] Add Iron180 V2 PCB support ( #22314 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-12-12 00:41:41 -08:00
Ryan
e648155113
Rename RGBLED_NUM
-> RGBLIGHT_LED_COUNT
( #22570 )
2023-12-12 15:30:08 +11:00
QMK Bot
3c7e9a6827
Merge remote-tracking branch 'origin/master' into develop
2023-12-12 03:21:42 +00:00
TW59420
c4a2bea0e6
[Keyboard] add mmk_3 ( #22569 )
...
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2023-12-11 19:21:09 -08:00
QMK Bot
d6f207dcd6
Merge remote-tracking branch 'origin/master' into develop
2023-12-12 03:07:10 +00:00
rhmokey
ae6f6c3365
[Keyboard] add luckycat70 ( #22622 )
...
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: zvecr <git@zvecr.com>
2023-12-11 19:06:42 -08:00
QMK Bot
8352f589c7
Merge remote-tracking branch 'origin/master' into develop
2023-12-12 03:02:58 +00:00
Marc Nause
7ae0f7caf1
Fix compile error in VLC keymap for Anavi Macropad8 ( #22644 )
2023-12-11 19:02:28 -08:00
QMK Bot
dc6cf643f3
Merge remote-tracking branch 'origin/master' into develop
2023-12-12 03:00:55 +00:00
yuezp
e6b53af38e
[Keyboard] Add ENTER80 ( #22632 )
...
Co-authored-by: “yuezp” <“yuezpchn@126.com”>
2023-12-11 19:00:26 -08:00
QMK Bot
e2472ee8f1
Merge remote-tracking branch 'origin/master' into develop
2023-12-12 02:12:41 +00:00
kopibeng
432789dc22
[Keyboard] Add KLC x TGR Lena ( #22629 )
...
Co-authored-by: jack <0x6a73@protonmail.com>
2023-12-11 18:12:03 -08:00
Joel Challis
4682226e20
Keymap introspection for Dip Switches ( #22543 )
2023-12-11 23:06:18 +00:00
QMK Bot
d85f954d30
Merge remote-tracking branch 'origin/master' into develop
2023-12-11 09:07:58 +00:00
kopibeng
ae18481f50
Add MNK60_STM32 ( #22429 )
...
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-12-11 01:07:26 -08:00
SmollChungus
2d3f2e92d8
consolidate firmware folder in smoll parent folder ( #22401 )
...
* consolidate firmware folder in smoll parent folder
* add moved keyboards to mapping
* typo fix
* typo..
* Update rules.mk
fix default folder lefty
* Update data/mappings/keyboard_aliases.hjson
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
---------
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-12-08 04:36:38 +00:00
QMK Bot
e394c06d14
Merge remote-tracking branch 'origin/master' into develop
2023-12-08 03:44:02 +00:00
spacehangover
a09fdd4190
WWA Keyboards ( #22612 )
2023-12-07 19:43:16 -08:00
QMK Bot
fc61fd9ce3
Merge remote-tracking branch 'origin/master' into develop
2023-12-08 00:15:11 +00:00
Joel Challis
897e33599e
Drop LED fixes ( #22624 )
2023-12-08 00:14:42 +00:00
QMK Bot
6f78b0daf0
Merge remote-tracking branch 'origin/master' into develop
2023-12-07 20:26:19 +00:00
jack
a4f990a431
Fixup helix/rev3_5rows ( #22623 )
2023-12-07 13:25:46 -07:00
QMK Bot
b4dba3cfb1
Merge remote-tracking branch 'origin/master' into develop
2023-12-06 17:40:28 +00:00
yiancar
834fb0b1fe
[Keyboard] Add Argyle ( #22607 )
...
* Argyle initial commit
* Update config.h
* Update config.h
* fixed
* Use json
* Update keyboards/argyle/info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/argyle/info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/argyle/info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/argyle/readme.md
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/argyle/info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/argyle/keymaps/via/rules.mk
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/argyle/keymaps/iso/keymap.c
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/argyle/info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update info.json
* format json
* Update keyboards/argyle/rules.mk
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/argyle/info.json
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/argyle/readme.md
Co-authored-by: Tom Barnes <barnestom@me.com>
---------
Co-authored-by: yiancar <yiancar@gmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Tom Barnes <barnestom@me.com>
2023-12-06 10:39:59 -07:00
QMK Bot
53c262de1b
Merge remote-tracking branch 'origin/master' into develop
2023-12-06 16:28:29 +00:00
leah-splitkb
5ddbf60f38
Fix RGB Matrix max brightness for several splitkb.com keyboards ( #22621 )
2023-12-06 16:27:52 +00:00
QMK Bot
51ce4ae8ad
Merge remote-tracking branch 'origin/master' into develop
2023-12-06 03:52:28 +00:00
Ryan
b6fbed3dc3
LED drivers: change "TWI" to "I2C" ( #22617 )
2023-12-05 19:52:18 -08:00
Less/Rikki
c7eb952198
[Keyboard] fruitykeeb/fruitbar/r1 ( #22616 )
...
Co-authored-by: Brandon Lewis <bslewis00@gmail.com>
2023-12-05 19:51:59 -08:00
QMK Bot
8b022cefc5
Merge remote-tracking branch 'origin/master' into develop
2023-12-06 03:35:11 +00:00
Ramon Imbao
6c2c211d8a
[Keyboard] Add Relapse-KB OR87 ( #22458 )
...
* Add relapsekb h87nu
* Change name
* Add missing license headers
* Apply suggestions from code review
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Remove config.h
* Update keyboards/relapsekb/or87/readme.md
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
---------
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-12-05 20:34:36 -07:00
era
11aa512c85
[Keyboard] Remove era/klein ( #22384 )
...
* Remove era/klein
era/klein is replaced by sirind/era/klein_sd
* Add an entry to data/mappings/keyboard_aliases.hjson
Add an entry to data/mappings/keyboard_aliases.hjson
2023-12-05 15:57:07 -07:00
QMK Bot
1b56428e52
Merge remote-tracking branch 'origin/master' into develop
2023-12-05 22:52:50 +00:00
Ivan Gromov
aa8e2065f1
[Keyboard] Add kt60HS-T ( #22413 )
...
* Create keymap.c
* Create keymap.c
* Create rules.mk
* Add files via upload
* Update keyboards/keyten/kt60hs_t/keymaps/default/keymap.c
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/keyten/kt60hs_t/readme.md
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/keyten/kt60hs_t/info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/keyten/kt60hs_t/keymaps/via/keymap.c
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/keyten/kt60hs_t/readme.md
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/keyten/kt60hs_t/info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update info.json after qmk format-json
* Update keymap.c
* Update keymap.c
* Update keymap.c
* Update keymap.c
* Update keyboards/keyten/kt60hs_t/info.json
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/keyten/kt60hs_t/readme.md
Co-authored-by: Drashna Jaelre <drashna@live.com>
---------
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-12-05 15:52:19 -07:00
QMK Bot
c286ab90f9
Merge remote-tracking branch 'origin/master' into develop
2023-12-05 15:41:35 +00:00
leah-splitkb
0d36977f3e
Fix Helix encoder direction ( #22614 )
2023-12-06 02:41:02 +11:00
Ryan
17f36a21bf
Rework RGBLight driver system ( #22529 )
2023-12-05 22:49:14 +11:00
Joel Challis
2acb426b8e
Remove "empty" files ( #22603 )
2023-12-05 08:37:00 +00:00
QMK Bot
92cf493d7f
Merge remote-tracking branch 'origin/master' into develop
2023-12-05 08:30:41 +00:00
Less/Rikki
229633395b
[Keyboard] eyeohdesigns/humble40 ( #22421 )
...
Co-authored-by: joedinkle <eodkeyboards@gmail.com>
2023-12-05 00:30:28 -08:00
Markus Knutsson
8236f59fa3
[Keyboard] Add Chameleon keyboard ( #22427 )
...
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-12-05 00:30:07 -08:00
QMK Bot
7317680904
Merge remote-tracking branch 'origin/master' into develop
2023-12-05 08:29:41 +00:00
Dam Vu Duy
eb0ce41e78
[Keyboard] Add Coban Pad 9A ( #22456 )
2023-12-05 00:29:12 -08:00
QMK Bot
3208f5fd1a
Merge remote-tracking branch 'origin/master' into develop
2023-12-05 08:19:55 +00:00
MakotoKurauchi
65fb7224d5
[Keyboard][Helix] enable encoder map ( #22488 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-12-05 00:19:24 -08:00
QMK Bot
9e60a81263
Merge remote-tracking branch 'origin/master' into develop
2023-12-05 07:43:42 +00:00
Leon Anavi
6fb9de6cbb
[Keyboard] Add ANAVI Arrows ( #22454 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-12-04 23:43:14 -08:00
QMK Bot
05787bc381
Merge remote-tracking branch 'origin/master' into develop
2023-12-05 07:15:25 +00:00
kopibeng
61708d60fb
Update MNK65_STM32 ( #22430 )
...
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2023-12-04 23:14:52 -08:00
QMK Bot
158d99b738
Merge remote-tracking branch 'origin/master' into develop
2023-12-05 05:56:48 +00:00
Wilhelm Schuster
6973d6d053
Fix AD5258 I2C address for Leopold keyboards ( #22554 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-12-04 21:56:19 -08:00
QMK Bot
18aa7d1244
Merge remote-tracking branch 'origin/master' into develop
2023-12-05 05:19:46 +00:00
Bram Inniger
b9a3bdb982
[Keyboard] Fix oled layer display order for Aurora boards ( #22521 )
2023-12-04 21:19:14 -08:00
QMK Bot
6537794989
Merge remote-tracking branch 'origin/master' into develop
2023-12-05 03:54:11 +00:00
Less/Rikki
88653c53ed
[Keyboard] fruitykeeb/fruitbar/r2 ( #22580 )
...
Co-authored-by: ojthetiny <ba6sti6@gmail.com>
2023-12-04 19:53:42 -08:00
QMK Bot
99ab4393de
Merge remote-tracking branch 'origin/master' into develop
2023-12-04 23:30:31 +00:00
Duncan Sutherland
74ae2286a6
Fix erroneous commas in info.json
files ( #21712 )
2023-12-04 23:30:02 +00:00
QMK Bot
c9d57e9014
Merge remote-tracking branch 'origin/master' into develop
2023-12-04 18:56:04 +00:00
yuezp
525fe9be96
[Keyboard] Add TG67 ( #22592 )
...
Co-authored-by: “yuezp” <“yuezpchn@126.com”>
2023-12-04 11:55:34 -07:00
zvecr
daa5afcf1d
Merge remote-tracking branch 'origin/master' into develop
2023-12-04 13:58:34 +00:00
yiancar
7f67256047
Add EE-AT and move W1-AT under geonworks ( #22526 )
...
* Add EE-AT and move W1-AT under geonworks
Co-authored-by: yiancar <yiancar@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-12-04 09:07:37 +00:00
yiancar
c3773587e9
Add Event Horizon Keyboard ( #22515 )
...
Co-authored-by: yiancar <yiancar@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-12-04 08:57:28 +00:00
Ryan
358bc8eac8
LED drivers: refactor page selection ( #22518 )
2023-12-04 17:52:40 +11:00
Joel Challis
131811b3d7
Initial support for CSTM65 ( #22513 )
2023-12-04 03:07:14 +00:00
QMK Bot
57db82445e
Merge remote-tracking branch 'origin/master' into develop
2023-12-03 01:27:23 +00:00
Tom Barnes
37c2dd7c65
Helix rev3_5rows rgbmatrix patch ( #22594 )
2023-12-02 17:26:53 -08:00
QMK Bot
07e2b645ab
Merge remote-tracking branch 'origin/master' into develop
2023-12-01 14:06:15 +00:00
Ryan
afa0eab374
Fix a bunch of CLI warnings ( #22589 )
2023-12-01 14:05:46 +00:00
QMK Bot
4be3abc39e
Merge remote-tracking branch 'origin/master' into develop
2023-12-01 12:08:20 +00:00
Álvaro A. Volpato
28dc7ba6a8
Fix animation range on M75H ( #22586 )
2023-12-01 12:07:48 +00:00
QMK Bot
e0e621ad6f
Merge remote-tracking branch 'origin/master' into develop
2023-12-01 10:07:56 +00:00
yuezp
5368ddbf3d
add keyboard bestway ( #22498 )
...
Co-authored-by: “yuezp” <“yuezpchn@126.com”>
2023-12-01 02:07:28 -08:00
QMK Bot
f2f99739b3
Merge remote-tracking branch 'origin/master' into develop
2023-12-01 09:04:25 +00:00
Duncan Sutherland
67559c7d06
revoke community_layouts from keebio/wtf60 ( #22502 )
2023-12-01 01:03:54 -08:00
QMK Bot
9b0fc99076
Merge remote-tracking branch 'origin/master' into develop
2023-11-30 22:45:50 +00:00
Jay Greco
80f91fee40
nullbitsco/snap: reduce size of bongo_reactive ( #22571 )
2023-11-30 15:45:21 -07:00
Ryan
2886c335a0
keycapsss/plaid_pad
: switch to encoder map (#22474 )
2023-11-30 10:19:17 +11:00
QMK Bot
cfbbb503a4
Merge remote-tracking branch 'origin/master' into develop
2023-11-29 07:47:35 +00:00
Álvaro A. Volpato
93127df5d4
Add Smith and Rune Magnus ( #22153 )
...
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-11-28 23:47:08 -08:00
QMK Bot
8d308d56e3
Merge remote-tracking branch 'origin/master' into develop
2023-11-29 07:46:44 +00:00
Álvaro A. Volpato
c8a28e8e9b
Add Magnum Ergo 1 by dark ( #22139 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-11-28 23:46:15 -08:00
QMK Bot
e923efcd56
Merge remote-tracking branch 'origin/master' into develop
2023-11-29 03:33:32 +00:00
Joe Scotto
4228f55551
Add ScottoWing handwired keyboard ( #22506 )
...
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-11-28 19:33:17 -08:00
Alabahuy
1e5151bf63
add tokki ( #22463 )
...
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-11-28 19:32:58 -08:00
QMK Bot
a886d7e3dd
Merge remote-tracking branch 'origin/master' into develop
2023-11-29 03:30:41 +00:00
Duncan Sutherland
3024b05cbb
cablecardesigns/phoenix: correct layout data ( #22517 )
2023-11-28 19:30:12 -08:00
Less/Rikki
81d601b725
refactor: projectcain/vault35 ( #22558 )
2023-11-28 18:24:02 -08:00
Drashna Jaelre
094357c403
Fix missed shutdown callbacks ( #22549 )
2023-11-27 15:39:17 +11:00
Joel Challis
1ed03f498f
Remove userspace keymaps ( #22544 )
2023-11-27 05:36:45 +11:00
Drashna Jaelre
3ef06aa732
Improve and Cleanup Shutdown callbacks ( #21060 )
...
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
2023-11-26 22:59:18 +11:00
QMK Bot
3a74fa5bf7
Merge remote-tracking branch 'origin/master' into develop
2023-11-23 05:08:37 +00:00
James Young
0379d1f59e
DC60: Fix 2u Backspace Support ( #22533 )
2023-11-23 05:08:07 +00:00
QMK Bot
bf0d1fde5d
Merge remote-tracking branch 'origin/master' into develop
2023-11-22 22:13:48 +00:00
gskygithub
98013e25c6
[Keyboard] darkproject/kd83a_bfg_edition ( #18416 )
...
* Add files via upload
* [keyboard]
* [Keyboard]
* Delete flash_spi.c
* Delete flash_spi.h
* Delete wb32_spi_master.c
* Delete wb32_spi_master.h
* [Keyboard]
* Resolved requested changes
* Resolved requested changes
* Changed rules.mk file accordingly.
* Resolved changes accordingly.
* Update config.h file and rules.mk file
* Removed eeprom_flash.c file
* Update default/keymap.c file
* Delete keyboards/darkproject/kd83a_bfg_edition directory
* Add keyboard
* Add keyboard
* Delete darkproject/kd83a_bfg_edition directory
* Resolved Changes
* Resolved requested changes
* keyboard
* Add keyboard
* Delete keyboard
* Add keyboard
* Delete keyboards/darkproject/kd87a_bfg_edition directory
* update keymap.c file
* update via/keymap.c, config.h and kd83a_bfg_edition.c files
* Delete keymap.c
* Update via/keymap.c, config.h and kd83a_bfg_edition.c files
* update config.h file
* update keymap.c file
* update keymap.c file
* update config.h
* update kd83a_bfg_edition.c
* Resolved requested changes.
* Delete folder which was added accidentally.
* Update keyboards/darkproject/kd83a_bfg_edition/config.h
* Update keyboards/darkproject/kd83a_bfg_edition/keymaps/via/keymap.c
* Update keyboards/darkproject/kd83a_bfg_edition/keymaps/via/keymap.c
* Update keyboards/darkproject/kd83a_bfg_edition/keymaps/via/keymap.c
* Update keyboards/darkproject/kd83a_bfg_edition/keymaps/via/keymap.c
* Update keyboards/darkproject/kd83a_bfg_edition/info.json
* Update keyboards/darkproject/kd83a_bfg_edition/rules.mk
* Update keyboards/darkproject/kd83a_bfg_edition/info.json
* update info.json file
* update config.h file
* Updated requested changes
* update readme.md
* Resolved requested changes
* Update info.json file
* Delete kd83a_bfg_edition.h
* Delete readme.md in default folder
* Update info.json file
* update info.json
* Updated changes
* Updated changes
* Resolved requested changes
* Resolved requested changes
2023-11-22 14:13:16 -08:00
Joel Challis
b35bac6afb
Remove unnecessary driver counts ( #22435 )
2023-11-22 21:37:32 +00:00
Joel Challis
a0a6820c1b
Migrate some dip switch config to info.json ( #22437 )
2023-11-23 08:33:59 +11:00
Ryan
dda6e7fb36
LED drivers: register naming cleanups ( #22436 )
2023-11-20 15:48:23 +00:00
Joel Challis
e279c78ba3
Enable linking of encoders to switch within layout macros ( #22264 )
2023-11-20 15:41:48 +00:00
QMK Bot
67a87f67a0
Merge remote-tracking branch 'origin/master' into develop
2023-11-16 16:54:46 +00:00
leyew
1e4f7aa029
[Keyboard] Add dnworks 997pt3 ( #22466 )
...
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-11-16 09:54:13 -07:00
QMK Bot
cc7542b917
Merge remote-tracking branch 'origin/master' into develop
2023-11-15 15:23:35 +00:00
Le Zhang
adcc4d376c
Add leonardo build target for leonardo + usb2.0 shield based projects ( #22243 )
2023-11-15 15:23:03 +00:00
QMK Bot
c4d3521ba6
Merge remote-tracking branch 'origin/master' into develop
2023-11-14 08:11:41 +00:00
leyew
d7b44239c2
[Keyboard] Add Eden ( #22467 )
...
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-11-14 01:11:12 -07:00
QMK Bot
79a6419dee
Merge remote-tracking branch 'origin/master' into develop
2023-11-14 01:49:49 +00:00
cole smith
44062b5056
Bs equals ( #21690 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: jack <0x6A73@pm.me>
2023-11-14 12:49:15 +11:00
Joel Challis
1efc79063c
Migrate some EEPROM config to info.json ( #22434 )
2023-11-14 09:30:19 +11:00
QMK Bot
67d2bc5b3a
Merge remote-tracking branch 'origin/master' into develop
2023-11-13 02:03:27 +00:00
Duncan Sutherland
56b6b28fe9
add 68_ansi
Community Layout to nebula68b ( #22433 )
2023-11-12 19:02:46 -07:00
Joel Challis
e884e42ce9
Generalise ADC driver source inclusion ( #22448 )
2023-11-12 22:30:27 +00:00
Ryan
786ebf8760
Remove requirement for keymap_steno.h
include in keymaps ( #22423 )
...
* Remove requirement for `keymap_steno.h` include in keymaps
* Add back keymap_steno.h with a note for the time being
2023-11-12 18:25:46 +11:00
QMK Bot
b7a1004b61
Merge remote-tracking branch 'origin/master' into develop
2023-11-12 05:31:01 +00:00
John Barbero
c2326c05c0
[Keyboard] Fixes to make snes_macropad play nicer with qmk configurator ( #22432 )
...
* [Keyboard] Change default implementation for get_layer_name_user
Will now show the layer number instead of "Unknown", since this is
what will be shown if QMK Configurator is used to compile the
firmware.
* [Keyboard] Update the layout info
This makes it look sort of like a macropad + gamepad rather than an 4x6
ortholinear keyboard.
* [Keyboard] Fix default implementation of get_layer_name_user
Based on feedback from code review the implementation was swapped in
favor of using get_u8_str. This implied a change to the argument type
from int to uint8_t, which cascaded into the existing keymaps. (This
made sense in general, since the return type of get_highest_layer is
also a uint8_t.)
2023-11-11 22:30:31 -07:00
QMK Bot
112a51db9c
Merge remote-tracking branch 'origin/master' into develop
2023-11-12 05:20:13 +00:00
Duncan Sutherland
0189c485b9
studiokestra/line_tkl: correct layout data ( #22455 )
...
* fix `layouts` data
* add EoF
2023-11-11 22:19:43 -07:00
QMK Bot
2f28c6df6d
Merge remote-tracking branch 'origin/master' into develop
2023-11-11 19:08:55 +00:00
jonylee@hfd
935c894f83
add 5087 keyboard ( #20557 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2023-11-11 11:08:26 -08:00
jack
1ddc2cbeb9
Fixup snes_macropad on develop ( #22444 )
2023-11-11 07:26:26 +00:00
QMK Bot
4a98466ef3
Merge remote-tracking branch 'origin/master' into develop
2023-11-10 21:39:30 +00:00
Maria
6876fbe51d
[Keyboard] Add MariOrion v2.5 ( #22273 )
...
* Pushed MariOrion v2.5 to the branch. Prod and proto version added.
* Pushed MariOrion v2.5 to the branch. Prod and proto version added.
* Proper addition of layout options
Addition of split bs rshift tsangan layout options.
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Merge branch 'toril940mariorion_v25' of github.com:toril940/qmk_firmware into toril940mariorion_v25
* Merge branch 'toril940mariorion_v25' of github.com:toril940/qmk_firmware into toril940mariorion_v25
* Update keyboards/mariorion_v25/proto/keymaps/via/keymap.c
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/mariorion_v25/proto/keymaps/default/keymap.c
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Updated readme.md with more information regarding make commands, and proto vs prod.
* Update keyboards/mariorion_v25/prod/keymaps/via/keymap.c
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/mariorion_v25/prod/keymaps/default/keymap.c
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/mariorion_v25/prod/info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Amended some changes to info.json - community layouts changed from scope to array.
* Update keyboards/mariorion_v25/readme.md
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Revert keyboards/gray_studio/think65/solder/solder.c
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Revert keyboards/gray_studio/think65/solder/solder.c
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Revert keyboards/gray_studio/think65/solder/solder.c
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Removed via.json from the via keymaps. Replaced with matrix_diagram.md. via.json file moved off to [public mariorion_v25 repo](https://github.com/toril940/orion-v25 )
* Revert keyboards/gray_studio/think65/solder/solder.c
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Removed via.json from the via keymaps. Replaced with matrix_diagram.md. via.json file moved off to [public mariorion_v25 repo](https://github.com/toril940/orion-v25 )
* Update keyboards/mariorion_v25/proto/info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/mariorion_v25/rules.mk
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/mariorion_v25/proto/info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/mariorion_v25/proto/info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/mariorion_v25/proto/info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/mariorion_v25/prod/info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/mariorion_v25/prod/info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/mariorion_v25/prod/info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/mariorion_v25/prod/info.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Revert keyboards/gray_studio/think65/solder/solder.c
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/mariorion_v25/matrix_diagram.md
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/mariorion_v25/readme.md
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/mariorion_v25/readme.md
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/mariorion_v25/readme.md
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/mariorion_v25/readme.md
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/mariorion_v25/readme.md
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/mariorion_v25/proto/mariorion_v25.c
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/mariorion_v25/prod/mariorion_v25.c
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Pushed new info.json and keymap.c files.
* Pushed new info.json and keymap.c files.
* Fixes to LED driver wrt PWM definitions with STM.
* Update keyboards/mariorion_v25/prod/keymaps/via/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/mariorion_v25/prod/keymaps/via/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/mariorion_v25/prod/info.json
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/mariorion_v25/prod/mariorion_v25.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/mariorion_v25/proto/info.json
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/mariorion_v25/proto/config.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/mariorion_v25/proto/mariorion_v25.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/mariorion_v25/proto/mariorion_v25.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/mariorion_v25/proto/keymaps/via/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/mariorion_v25/proto/keymaps/via/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Committing a details update to readme.md.
* Committing a details update to readme.md.
* Update keyboards/mariorion_v25/prod/config.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/mariorion_v25/prod/mariorion_v25.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Revert "Committing a details update to readme.md."
This reverts commit 068a82a1fcf1996d87f7f97a10e9f5fbbee79a29.
* Committing a details update to readme.md.
* Update keyboards/mariorion_v25/halconf.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/mariorion_v25/mcuconf.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/mariorion_v25/prod/config.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/mariorion_v25/proto/config.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/mariorion_v25/halconf.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Production pictures replacing the standard ones in the readme.md :)
* waffle87 requests bundled:
- Licence headers added
- Codeblocked matrix_diagram.md
- Consolidated files where possible
- Removed excess from config.h
---------
Co-authored-by: toril940 <anastasialucas940@hotmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-11-10 14:39:00 -07:00
QMK Bot
2d7746609f
Merge remote-tracking branch 'origin/master' into develop
2023-11-10 16:42:45 +00:00
ploopyco
38d6e9a75a
Add Ploopy Madromys mouse ( #21989 )
...
Added PloopyCo madromys/adept mouse
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-11-10 16:42:15 +00:00
Ryan
8136cf4bfb
LED drivers: clean up SWx
/CSy
pullup/down resistor config ( #22381 )
2023-11-10 08:39:15 +11:00
QMK Bot
6b19a99a4f
Merge remote-tracking branch 'origin/master' into develop
2023-11-09 19:57:44 +00:00
temp4gh
aee2a9d696
[Keyboard] Add alpaca/wfeclipse ( #22230 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-11-09 12:57:14 -07:00