Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-10-02 | 14 | -0/+707 |
|\ | |||||
| * | [Keyboard] Add JP60 keyboard (#14219) | ai03 | 2021-10-02 | 14 | -0/+707 |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-10-02 | 18 | -25/+789 |
|\| | |||||
| * | [Keyboard] Add Olly BB PCB (#14545) | mechlovin | 2021-10-02 | 12 | -0/+754 |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
| * | [Keyboard] Modify mokey64 (#14612) | rhmokey | 2021-10-02 | 6 | -25/+35 |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-10-02 | 6 | -144/+851 |
|\| | |||||
| * | [Keymap] Updates to Personal Kyria Keymap (#14669) | john-ezra | 2021-10-02 | 6 | -144/+851 |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | [Keyboard] Enable Proton C defaults for SplitKB Kyria (#14490) | Drashna Jaelre | 2021-10-01 | 10 | -12/+162 |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-10-02 | 2 | -115/+28 |
|\| | |||||
| * | [Keyboard] Convert ZSA's Moonlander keyboard to matrix lite (#14667) | Drashna Jaelre | 2021-10-01 | 2 | -115/+28 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-10-01 | 2 | -0/+6 |
|\| | |||||
| * | Add FIRMWARE_FORMAT = hex for /keyboards/kinesis/kint36 and ↵ | negatv | 2021-10-02 | 2 | -0/+6 |
| | | | | | | | | | | | | | | | | | | /keyboards/kinesis/kint41 (#14665) * Specify hex as the default FIRMWARE_FORMAT which is copied to qmk_firmware root folder * Specify hex as the default FIRMWARE_FORMAT which is copied to qmk_firmware root folder Co-authored-by: sadkins <sadkins@iMac-Pro.local> | ||||
* | | Change `MK66F18` -> `MK66FX1M0` (#14659) | Ryan | 2021-09-30 | 1 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-30 | 1 | -2/+2 |
|\| | |||||
| * | Quark_LP- change MCU and RGB (#14650) | npspears | 2021-09-30 | 1 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-30 | 59 | -178/+178 |
|\| | |||||
| * | Remove firmware size impact notes from <keyboard>/rules.mk (#14652) | James Young | 2021-09-30 | 59 | -178/+178 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-30 | 54 | -57/+1 |
|\| | |||||
| * | Remove redundant `MIDI_ENABLE = no` in keyboard-level rules.mk (#14649) | Ryan | 2021-09-30 | 54 | -57/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-30 | 4 | -16/+359 |
|\| | |||||
| * | Mechlovin Hex4B: extend layout support (#14651) | James Young | 2021-09-30 | 4 | -16/+359 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * use XXX for KC_NO in hex4b.h * add matrix diagram to hex4b.h * rename LAYOUT to LAYOUT_all * remove reference to KBFirmware JSON Parser * info.json: add line breaks between rows * rename LAYOUT_all to LAYOUT_split_bs - LAYOUT alias for backward compatibility - LAYOUT_all alias to signify support for every matrix position * add LAYOUT_2u_bs * add LAYOUT_tsangan_split_bs * add LAYOUT_tsangan_2u_bs * info.json: remove meta key | ||||
* | | Merge remote-tracking branch 'upstream/master' into develop | James Young | 2021-09-29 | 540 | -552/+0 |
|\| | |||||
| * | Remove redundant `UNICODE_ENABLE = no` in keyboard-level rules.mk (#14633) | Ryan | 2021-09-30 | 541 | -553/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-29 | 5 | -30/+236 |
|\| | |||||
| * | Mechlovin Hannah60RGB touch-up (#14646) | James Young | 2021-09-29 | 5 | -30/+236 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * use XXX for KC_NO in rev1.h * add matrix diagram to rev1.h * remove reference to KBFirmware JSON Parser from rev1.h * use XXX for KC_NO in rev2.h * add matrix diagram to rev2.h * add LAYOUT_60_ansi and LAYOUT_60_iso * enable Community Layout support * update info.json metadata - specify keyboard revision in keyboard_name - use GitHub username in maintainer field * remove reference to KBFirmware JSON Parser from main rules.mk | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-29 | 5 | -13/+5 |
|\| | |||||
| * | [Core] Fix "6kro enable" and clarify naming (#14563) | Drashna Jaelre | 2021-09-29 | 5 | -13/+5 |
| | | | | | | | | | | | | | | | | | | | | | | * Fix USB_6KRO_ENABLE compilation errors * Add info to docs * Rename define to be more accurate * Remove unused rule * Refixe docs | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-29 | 21 | -9/+673 |
|\| | |||||
| * | [Keyboard] add support for Quark_LP (#14552) | npspears | 2021-09-29 | 15 | -0/+610 |
| | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
| * | [Keyboard] Update Grandiceps to Rev2 (#14618) | vattern | 2021-09-29 | 6 | -9/+63 |
| | | | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com> Co-authored-by: Thys de Wet <thys@vectorphoto.co.uk> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-29 | 3 | -33/+141 |
|\| | |||||
| * | [Keymap] Jonavin murphpad keymap update (#14637) | jonavin | 2021-09-29 | 3 | -33/+141 |
| | | | | | | Co-authored-by: Jonavin <=> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-29 | 12 | -10/+261 |
|\| | |||||
| * | [Keyboard] Updates for Tractyl Manuform config (#14641) | Drashna Jaelre | 2021-09-29 | 12 | -10/+261 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-29 | 1 | -26/+26 |
|\| | |||||
| * | [Keyboard] Fix end of file issue for Owlab suit80 (#14640) | Drashna Jaelre | 2021-09-29 | 1 | -26/+26 |
| | | |||||
* | | [Keyboard] Add support for PaladinPad, Arya pcb and move keyboards by ↵ | nachie | 2021-09-28 | 65 | -120/+1504 |
| | | | | | | | | | | | | | | KapCave into their own directory (#14194) Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Nachiket Kulkarni <nachiket_kulkarni@apple.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-29 | 4 | -0/+119 |
|\| | |||||
| * | [Keymap] Keychron Q1 user keymap (#14636) | Grayson Carr | 2021-09-28 | 4 | -0/+119 |
| | | |||||
* | | Fix for mechlovin/adelais/standard_led/arm/rev4 (#14639) | James Young | 2021-09-28 | 1 | -2/+2 |
| | | | | | | | | | | * Fix for #14622 Fix for a bad merge conflict resolution. | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-28 | 1 | -1/+1 |
|\| | |||||
| * | convert checkerboards/quark_squared:via rules.mk to Unix line endings (#14638) | James Young | 2021-09-28 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-28 | 3 | -4/+72 |
|\| | |||||
| * | Mechlovin Delphine: add LAYOUT_numpad_6x4 (#14635) | James Young | 2021-09-28 | 3 | -4/+72 |
| | | | | | | | | | | | | | | | | | | | | | | | | * add LAYOUT_numpad_6x4 * tidy-up info.json data * use GitHub account name for maintainer field * remove meta key * add matrix diagram to delphine.h * update Community Layout support | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-28 | 6 | -133/+126 |
|\| | |||||
| * | [Keymap] fix NKRO - switch to get_mods() and refactor encoder action code ↵ | jonavin | 2021-09-28 | 6 | -133/+126 |
| | | | | | | | | | | (#14278) Co-authored-by: Jonavin <=> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-28 | 5 | -12/+187 |
|\| | |||||
| * | [Keyboard] Yampad VIA support (#14397) | Greg Knapp | 2021-09-28 | 5 | -12/+187 |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-28 | 18 | -0/+789 |
|\| | |||||
| * | [Keyboard] Add OwLab Suit80 (#14362) | owlab-git | 2021-09-28 | 18 | -0/+789 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | * add suit80 files * first add suit80 files * modified suit80 files * layout change * modified again * changed png url |