6a90e13224
Merge remote-tracking branch 'origin/master' into develop
2022-02-21 06:05:20 +00:00
2d1d44edb7
[Keyboard] Fix Hineybush/h08_ocelot and Hineybush/h65(_hotswap) ( #16405 )
2022-02-20 22:04:43 -08:00
b21a803ec6
Merge remote-tracking branch 'origin/master' into develop
2022-02-21 06:02:11 +00:00
f7b5d67a7b
[Keyboard] Add MW75R2 PCB ( #15042 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2022-02-20 22:01:31 -08:00
21a4f42957
Merge remote-tracking branch 'origin/master' into develop
2022-02-21 05:57:49 +00:00
65af7272f3
[Keyboard] Fix mwstudio/mw65_rgb errors ( #16410 )
2022-02-20 21:57:11 -08:00
31ee13a5d7
Merge remote-tracking branch 'origin/master' into develop
2022-02-21 01:19:42 +00:00
3bc8afbb81
Update fix for MW65_rgb and added personal keymap ( #15279 )
...
* Update fix for MW65 and added personal keymap
* Resolve fix
* Resolved fix, again
* Added missing GPLv2 license headers
* Resolved issue
2022-02-20 17:18:35 -08:00
f6d8dd972e
Merge remote-tracking branch 'origin/master' into develop
2022-02-20 18:37:05 +00:00
d175ee1d9b
rart67m: move OLED and WPM code to default keymap ( #16403 )
...
* rart67m: move OLED and WPM code to default keymap
* Apply suggestions from code review
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2022-02-20 18:36:15 +00:00
4d3ce3cdf8
Merge remote-tracking branch 'origin/master' into develop
2022-02-20 13:57:38 +00:00
60f22831cb
clueboard/card: disable Command to reduce size ( #16404 )
2022-02-20 13:57:03 +00:00
f787114fe9
Merge remote-tracking branch 'origin/master' into develop
2022-02-20 08:21:51 +00:00
38e3be4c74
Add h08_ocelot and h65 PCBs ( #14054 )
...
* add h65 start
* add h65 base files
* add ocelot base files
* add via keymap
* Update keyboards/hineybush/h08_ocelot/config.h
* Update keyboards/hineybush/h65/config.h
* add base files for h65 hotswap
* changes made per PR
* finally made updates per PR
* update readmes
* Update keyboards/hineybush/h65_hotswap/config.h
* Update keyboards/hineybush/h65_hotswap/rules.mk
* Update keyboards/hineybush/h65_hotswap/rules.mk
* Update keyboards/hineybush/h65_hotswap/readme.md
* Update keyboards/hineybush/h65_hotswap/info.json
* Update keyboards/hineybush/h65/rules.mk
* Update keyboards/hineybush/h65_hotswap/keymaps/default/keymap.c
* Update keyboards/hineybush/h65_hotswap/keymaps/default/keymap.c
* Update keyboards/hineybush/h65_hotswap/h65_hotswap.h
* Update keyboards/hineybush/h65_hotswap/keymaps/default/keymap.c
* Update keyboards/hineybush/h65_hotswap/keymaps/default/keymap.c
* Update keyboards/hineybush/h65/rules.mk
* Update keyboards/hineybush/h65/readme.md
* Update keyboards/hineybush/h08_ocelot/h08_ocelot.h
* Update keyboards/hineybush/h08_ocelot/keymaps/default/keymap.c
* Update keyboards/hineybush/h08_ocelot/keymaps/default/keymap.c
* Update keyboards/hineybush/h08_ocelot/keymaps/via/keymap.c
* Update keyboards/hineybush/h08_ocelot/keymaps/via/keymap.c
* Update keyboards/hineybush/h08_ocelot/readme.md
* Update keyboards/hineybush/h08_ocelot/rules.mk
* Update keyboards/hineybush/h08_ocelot/rules.mk
* Update keyboards/hineybush/h65/h65.h
* Update keyboards/hineybush/h08_ocelot/info.json
* Update keyboards/hineybush/h65/info.json
* Update keyboards/hineybush/h65/keymaps/default/keymap.c
* Apply suggestions from code review
* update jsons for default qmk config layout
* Update keyboards/hineybush/h08_ocelot/rules.mk
* Update keyboards/hineybush/h65/h65.h
* Update keyboards/hineybush/h65/info.json
* Update keyboards/hineybush/h65/keymaps/default/keymap.c
* Update keyboards/hineybush/h65_hotswap/keymaps/default/keymap.c
* Update keyboards/hineybush/h65_hotswap/keymaps/via/keymap.c
* Update keyboards/hineybush/h65_hotswap/keymaps/via/keymap.c
* Update keyboards/hineybush/h65_hotswap/keymaps/via/keymap.c
* Update keyboards/hineybush/h65_hotswap/rules.mk
* Update keyboards/hineybush/h65/config.h
2022-02-20 00:21:18 -08:00
1d9808606a
Merge remote-tracking branch 'origin/master' into develop
2022-02-20 07:10:44 +00:00
60e28544b2
Bliss Hotdox keymaps ( #13160 )
...
* Bliss Hotdox keymaps
* Update keyboards/hotdox/keymaps/bliss/keymap.c
* Update keyboards/hotdox/keymaps/bliss/keymap.c
* Add GPL License to keymap.c file
Changes to be committed:
modified: keymap.c
* make changes requested by fauxpark
* Update keyboards/hotdox/keymaps/bliss/readme.md
* Update keyboards/hotdox/keymaps/bliss/keymap.c
* Update keyboards/hotdox/keymaps/bliss/readme.md
2022-02-19 23:10:15 -08:00
e2691c22c1
Merge remote-tracking branch 'origin/master' into develop
2022-02-20 05:52:47 +00:00
73657a7d58
Add kikkou keyboard ( #15291 )
...
* Add kikkou keyboard
* Apply suggestions from code review
* Update keyboards/kikkou/rules.mk
* Apply suggestions from code review1
2022-02-19 21:52:11 -08:00
5b688a09ec
Merge remote-tracking branch 'upstream/master' into develop
2022-02-19 04:27:09 +11:00
4666d26008
Fix a couple of boards being wrongly identified as AVR ( #16377 )
2022-02-19 02:53:36 +11:00
2d12eacb4b
[Keyboard] Renamed Frooastboard to Frooastboard Nano ( #16373 )
2022-02-17 08:59:12 -08:00
7dd993fb06
Fix build error for LED Matrix effect solid_reactive_wide. ( #16383 )
2022-02-17 08:53:06 -08:00
da280739ef
Merge remote-tracking branch 'origin/master' into develop
2022-02-17 08:44:30 -08:00
548a463fe9
`mokey/xox70`: clean up layouts ( #16375 )
2022-02-17 08:43:03 -08:00
7f63bcf38b
[Bug] Re-add call to `suspend_power_down_kb()` ( #16382 )
2022-02-17 08:33:07 -08:00
7e00fcd7bc
[Keyboard] Remove Helix/rev1 ( #16389 )
2022-02-17 08:18:16 -08:00
0d9a0d5d97
Align new-keyboard with recent schema updates ( #16378 )
2022-02-16 20:58:40 +00:00
5ff823d35f
Bodge for helix build failures ( #16376 )
2022-02-16 17:46:48 +00:00
08ebf1523b
Merge remote-tracking branch 'origin/master' into develop
2022-02-15 17:48:14 +00:00
da68083fdf
Update USB VID and PID for Aya ( #16363 )
2022-02-15 18:47:35 +01:00
6a8df58887
Merge remote-tracking branch 'origin/master' into develop
2022-02-15 07:02:33 +00:00
92eb067a63
Add extra braces for trackball keymaps ( #16361 )
2022-02-15 18:01:54 +11:00
16767312db
Align docs to new-keyboard behaviour ( #16357 )
2022-02-15 15:45:32 +11:00
fede569bbe
Allow NO_PIN within info.json ( #16359 )
2022-02-15 15:41:16 +11:00
b0621223bc
Various fixes for new-keyboard ( #16358 )
2022-02-15 01:42:58 +00:00
c9f192bae8
Merge remote-tracking branch 'origin/master' into develop
2022-02-15 01:16:27 +00:00
ac8bee7091
Fix multiple definition errors for trackball "boards" with no keys ( #16350 )
2022-02-15 01:15:53 +00:00
23c238a180
CLI: Minor additions #12795 ( #16276 )
2022-02-14 12:02:35 +01:00
1980e48e0d
Merge remote-tracking branch 'origin/master' into develop
2022-02-14 06:25:23 +00:00
485cf920b4
Xenon: correct QMK Configurator key sequence ( #16332 )
2022-02-13 22:24:52 -08:00
61ed2e2b3c
Merge remote-tracking branch 'origin/master' into develop
2022-02-14 06:24:45 +00:00
6b01657a86
Mode M75S Layout Additions, Configurator Data and Code Touch-Up ( #16327 )
...
* m75s.h: correct matrix position identifier
`K5C` is actually on row 4, so it should be `K4C`.
* m75s.h: add matrix diagram
* add QMK Configurator data
* polish whitespace
- convert tabs to spaces
- update indent to four spaces
- remove trailing whitespace
* update readme
Didn't seem to be fully updated after being copied from the M65S codebase.
* add LAYOUT_ansi with keymap
ANSI layout with 2u Backspace.
* add LAYOUT_iso with keymap
ISO layout with 2u Backspace.
* add LAYOUT_ansi_tsangan with keymap
ANSI layout with 2u Backspace and 7u Spacebar.
* add LAYOUT_iso_tsangan with keymap
ISO layout with 2u Backspace and 7u Spacebar.
* add LAYOUT_ansi_split_bs with keymap
ANSI layout with Split Backspace.
* add LAYOUT_iso_split_bs with keymap
ISO layout with Split Backspace.
* add LAYOUT_ansi_tsangan_split_bs with keymap
ANSI layout with Split Backspace and 7u Spacebar.
* add LAYOUT_iso_tsangan_split_bs with keymap
ISO layout with Split Backspace and 7u Spacebar.
2022-02-13 22:24:11 -08:00
f77e569e9f
Merge remote-tracking branch 'origin/master' into develop
2022-02-14 02:02:16 +00:00
b6b7e12029
Digicarp65: fix layouts ( #16328 )
2022-02-14 13:01:39 +11:00
4fd04b2371
Fix compilation of ChibiOS UART driver ( #16348 )
...
Cherry picked fix from 15724
2022-02-13 20:44:44 +00:00
63646e8906
Format code according to conventions ( #16322 )
2022-02-12 18:29:31 +00:00
afcdd7079c
Update keyboard mapping for all moved boards this cycle ( #16312 )
2022-02-12 09:16:35 -08:00
9f506e64ba
Merge remote-tracking branch 'origin/master' into develop
2022-02-12 07:01:58 +00:00
773205cd1f
[Keyboard] Convert Maxr1998/Phoebe to use info.json where possible ( #16309 )
2022-02-11 23:01:25 -08:00
aefe6ee9f5
Merge remote-tracking branch 'origin/master' into develop
2022-02-12 04:03:02 +00:00
QMK Bot
jack
TW59420
HorrorTroll
Ryan
Josh Hinnebusch
Benjamin Chausse
Matthew Dias
Simon
Joakim Tufvegren
Drashna Jael're
Takeshi ISHII
Joel Challis
Dan Nixon
Erovia
James Young
Max Rumpf