Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-09-06 | 2 | -361/+436 |
|\ | |||||
| * | Mars 6.5 Layout Additions (#18282) | James Young | 2022-09-06 | 2 | -361/+436 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * info.json: apply friendly formatting * add LAYOUT_65_ansi_blocker * add LAYOUT_65_ansi_blocker_split_bs * add LAYOUT_65_iso_blocker * add LAYOUT_65_iso_blocker_split_bs * enable Community Layouts support * info.json: correct maintainer value | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-09-05 | 2 | -18/+27 |
|\| | |||||
| * | EU ISOlation: fix QMK Configurator key sequence (#18272) | James Young | 2022-09-05 | 2 | -18/+27 |
| | | | | | | | | | | | | | | | | | | | | | | * eu_isolation.h: physically arrange layout macros Whitespace only; no logic changes. * info.json: apply friendly formatting Add line breaks between physical rows. * info.json: correct key sequence | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-09-05 | 5 | -22/+59 |
|\| | |||||
| * | Fix compilation error for GH60 satan HHKB 7u layout (#18250) | AMing Lau | 2022-09-05 | 5 | -22/+59 |
| | | | | | | | | | | | | | | | | | | * Fix compilation error for GH60 satan HHKB 7u layout * Update keyboards/gh60/satan/info.json Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Joel Challis <git@zvecr.com> | ||||
* | | Rename keyboards with uppercase letters (#18268) | Ryan | 2022-09-04 | 28 | -7/+7 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-09-03 | 3 | -4/+444 |
|\| | |||||
| * | dyz60_hs Layout Additions (#18261) | James Young | 2022-09-03 | 3 | -4/+444 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dyz60_hs: add matrix diagram * add LAYOUT_60_ansi * add LAYOUT_60_ansi_split_bs_rshift * add LAYOUT_60_tsangan_hhkb * add LAYOUT_60_iso * add LAYOUT_60_iso_split_bs_rshift * enable Community Layouts support * readme.md: correct keyboard references Replace `dyz60` with `dyz60_hs` as needed. | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-09-03 | 3 | -3/+3 |
|\| | |||||
| * | Fix a couple of boards still using `usb.device_ver` (#18258) | Ryan | 2022-09-03 | 3 | -3/+3 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-09-03 | 17 | -28/+168 |
|\| | |||||
| * | [Keyboard] RS60 Rev2 change to eeprom emulation (#18201) | Xelus22 | 2022-09-03 | 17 | -28/+168 |
| | | | | | | by xelus | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-09-03 | 11 | -0/+568 |
|\| | |||||
| * | [Keyboard] Add IDOBAO Abacus ID42 Keyboard (#16923) | Vino Rodrigues | 2022-09-03 | 11 | -0/+568 |
| | | | | | | by vinorodrigues | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-09-03 | 1 | -35/+35 |
|\| | |||||
| * | Add absolute key positions to microdox info.json (#18238) | Tim Traversy | 2022-09-03 | 1 | -35/+35 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-09-03 | 58 | -72/+59 |
|\| | |||||
| * | Remove more RESET keycode references (#18252) | Joel Challis | 2022-09-03 | 58 | -72/+59 |
| | | |||||
* | | Simplify extrakeys sending at the host driver level (#18230) | Ryan | 2022-09-02 | 3 | -59/+47 |
| | | | | | | | | | | | | | | | | | | * Simplify extrakeys sending at the host driver level * There are two arguments here * Wrong syntax * Adjust keyboards which use a custom host driver | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-09-02 | 2 | -0/+0 |
|\| | |||||
| * | [Keymap] Fixing location of my Keymap for the Gentleman65 (#18246) | Brian | 2022-09-02 | 2 | -0/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-09-02 | 11 | -0/+354 |
|\| | |||||
| * | [Keyboard] Add Lunakey Pico (#18202) | Yoichiro Tanaka | 2022-09-01 | 11 | -0/+354 |
| | | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> 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 | 2022-09-02 | 8 | -0/+424 |
|\| | |||||
| * | [Keyboard] Add Shoc Keyboard (#18143) | Jannik Becker | 2022-09-01 | 8 | -0/+424 |
| | | | | | | | | 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 | 2022-09-01 | 11 | -0/+725 |
|\| | |||||
| * | [Keyboard] Add Ingrained Keyboard (#15928) | jpuerto96 | 2022-09-01 | 11 | -0/+725 |
| | | | | | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Juan Puerto <jpuerto@psc.edu> Co-authored-by: jpuerto-psc <68066250+jpuerto-psc@users.noreply.github.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-08-31 | 39 | -0/+5283 |
|\| | |||||
| * | Add giabalanai keyboard (#10125) | 3araht | 2022-08-31 | 39 | -0/+5283 |
| | | | | | | by 3araht | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-08-31 | 9 | -0/+622 |
|\| | |||||
| * | Added personal Iris Rev6a layout and Milk 2% layout (#17600) | Ryan Neff | 2022-08-31 | 9 | -0/+622 |
| | | | | | | by JellyTitan | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-08-31 | 2 | -0/+65 |
|\| | |||||
| * | Add bepo variant to massdrop/thekey keymaps (#18129) | Benjamin Collet | 2022-08-31 | 2 | -0/+65 |
| | | | | | | by mrBen | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-08-31 | 12 | -90/+76 |
|\| | |||||
| * | Bandominedoni encoder fix (#18229) | 3araht | 2022-08-31 | 12 | -90/+76 |
| | | | | | | by 3araht | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-08-31 | 21 | -156/+84 |
|\| | |||||
| * | [Keyboard] Updates to Work Louder keyboards (#18232) | Drashna Jaelre | 2022-08-31 | 21 | -156/+84 |
| | | | | | | | | by Drashna | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-08-31 | 12 | -0/+726 |
|\| | |||||
| * | [Keyboard] add tg67 (#18225) | JX | 2022-08-31 | 12 | -0/+726 |
| | | |||||
* | | Ensure all keyboards have a bootloader set (#18234) | Ryan | 2022-08-31 | 15 | -5/+16 |
| | | |||||
* | | Move bootloader.mk to platforms (#18228) | Ryan | 2022-08-31 | 5 | -6/+3 |
| | | |||||
* | | [Core] Rework PS/2 driver selection (#17892) | Marek Kraus | 2022-08-31 | 19 | -27/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [Core] Rework PS/2 driver selection Enabling and selecting PS/2 driver was using old approach, so it was reworked to current approach, inspired by Serial and WS2812 driver selections. * [Keyboard] Update keyboards using PS/2 to use new PS/2 driver selection * [Docs] Update PS/2 documentation to use new PS/2 driver selection * Fix indentation * [Core] Add PS2 to data driver * Fix oversight in property name Co-authored-by: Drashna Jaelre <drashna@live.com> * Add PS/2 pins to data driven mappings Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-08-30 | 12 | -0/+403 |
|\| | |||||
| * | [Keyboard] CannonKeys Malicious Ergo (#17076) | Andrew Kannan | 2022-08-30 | 12 | -0/+403 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add Malicious Ergo keyboard to QMK * Update layout * update info.json * update info.json again * Update info.json again * i h8 info.json * its default not all * Update keyboards/cannonkeys/malicious_ergo/config.h * Add bootloader instructions and license header * Update keyboards/cannonkeys/malicious_ergo/rules.mk * Update keyboards/cannonkeys/malicious_ergo/rules.mk * Update keyboards/cannonkeys/malicious_ergo/readme.md * Remove rotation from info.json * Remove labels * Update keyboards/cannonkeys/malicious_ergo/readme.md * Update keyboards/cannonkeys/malicious_ergo/malicious_ergo.h * Revise info.json again * whitespace fix * Apply suggestions from code review Move pid/vid into info json Fix rounding errors in info json Thanks to fauxpark and noroadsleft! | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-08-30 | 26 | -0/+893 |
|\| | |||||
| * | [Keyboard] Add NK65B (#18211) | yiancar | 2022-08-30 | 13 | -0/+441 |
| | | | | | | Co-authored-by: yiancar <yiancar@gmail.com> | ||||
| * | [Keyboard] Add NK87B (#18210) | yiancar | 2022-08-30 | 13 | -0/+452 |
| | | | | | | Co-authored-by: yiancar <yiancar@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2022-08-30 | 1 | -2/+2 |
|\| | |||||
| * | [Keyboard] Fix layout macro for Cannonkeys Atlas keyboard (#18216) | Drashna Jaelre | 2022-08-30 | 1 | -2/+2 |
| | |