summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-2113-0/+579
|\
| * [Keyboard] Add Monoflex 60 keyboard (#16234)Ivan Gromov2022-02-2013-0/+579
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-2110-120/+90
|\|
| * [Keyboard] Fix Hineybush/h08_ocelot and Hineybush/h65(_hotswap) (#16405)jack2022-02-2010-120/+90
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-219-0/+494
|\|
| * [Keyboard] Add MW75R2 PCB (#15042)TW594202022-02-209-0/+494
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-212-24/+8
|\|
| * [Keyboard] Fix mwstudio/mw65_rgb errors (#16410)jack2022-02-202-24/+8
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-2123-47/+1145
|\|
| * Update fix for MW65_rgb and added personal keymap (#15279)HorrorTroll2022-02-2023-47/+1145
| | | | | | | | | | | | | | | | | | | | | | * Update fix for MW65 and added personal keymap * Resolve fix * Resolved fix, again * Added missing GPLv2 license headers * Resolved issue
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-203-152/+121
|\|
| * rart67m: move OLED and WPM code to default keymap (#16403)Ryan2022-02-203-152/+121
| | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-203-17/+7
|\|
| * clueboard/card: disable Command to reduce size (#16404)Ryan2022-02-203-17/+7
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-2036-0/+1107
|\|
| * Add h08_ocelot and h65 PCBs (#14054)Josh Hinnebusch2022-02-2036-0/+1107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-203-0/+186
|\|
| * Bliss Hotdox keymaps (#13160)Benjamin Chausse2022-02-193-0/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-208-0/+266
|\|
| * Add kikkou keyboard (#15291)Matthew Dias2022-02-198-0/+266
| | | | | | | | | | | | | | | | | | | | * Add kikkou keyboard * Apply suggestions from code review * Update keyboards/kikkou/rules.mk * Apply suggestions from code review1
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2022-02-1914-19/+25
|\|
| * Fix a couple of boards being wrongly identified as AVR (#16377)Ryan2022-02-192-1/+7
| |
| * [Keyboard] Renamed Frooastboard to Frooastboard Nano (#16373)Simon2022-02-1711-16/+16
| |
| * Fix build error for LED Matrix effect solid_reactive_wide. (#16383)Joakim Tufvegren2022-02-171-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2022-02-1723-1980/+532
|\|
| * `mokey/xox70`: clean up layouts (#16375)Ryan2022-02-175-310/+531
| |
| * [Bug] Re-add call to `suspend_power_down_kb()` (#16382)Joakim Tufvegren2022-02-171-0/+1
| |
| * [Keyboard] Remove Helix/rev1 (#16389)Takeshi ISHII2022-02-1717-1672/+0
| |
* | Align new-keyboard with recent schema updates (#16378)Joel Challis2022-02-162-3/+3
| |
* | Bodge for helix build failures (#16376)Joel Challis2022-02-163-0/+12
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-151-2/+2
|\|
| * Update USB VID and PID for Aya (#16363)Dan Nixon2022-02-151-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-153-3/+3
|\|
| * Add extra braces for trackball keymaps (#16361)Ryan2022-02-153-3/+3
| |
* | Align docs to new-keyboard behaviour (#16357)Joel Challis2022-02-154-188/+169
| |
* | Allow NO_PIN within info.json (#16359)Joel Challis2022-02-151-0/+4
| |
* | Various fixes for new-keyboard (#16358)Joel Challis2022-02-154-1/+31
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-157-15/+9
|\|
| * Fix multiple definition errors for trackball "boards" with no keys (#16350)Ryan2022-02-157-15/+9
| |
* | CLI: Minor additions #12795 (#16276)Erovia2022-02-142-52/+76
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-141-25/+25
|\|
| * Xenon: correct QMK Configurator key sequence (#16332)James Young2022-02-131-25/+25
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-1413-48/+1450
|\|
| * Mode M75S Layout Additions, Configurator Data and Code Touch-Up (#16327)James Young2022-02-1313-48/+1450
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-142-331/+331
|\|
| * Digicarp65: fix layouts (#16328)Ryan2022-02-142-331/+331
| |
* | Fix compilation of ChibiOS UART driver (#16348)Joel Challis2022-02-131-1/+1
| | | | | | Cherry picked fix from 15724
* | Format code according to conventions (#16322)QMK Bot2022-02-12345-3252/+4939
| |
* | Update keyboard mapping for all moved boards this cycle (#16312)Drashna Jaelre2022-02-121-0/+610
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-123-128/+348
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 11:50:04 +0000