Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-07 | 8 | -526/+89 |
|\ | |||||
| * | 3w6 - Refactor use of AVR only I2C functions (#14339) | Joel Challis | 2021-09-07 | 2 | -105/+64 |
| | | | | | | | | | | | | | | * Refactor use of legacy i2c functions * Align rev2 * Review fixes | ||||
| * | Refactor use of legacy i2c implementation (#14341) | Joel Challis | 2021-09-07 | 6 | -421/+25 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-07 | 4 | -417/+15 |
|\| | |||||
| * | ergodone - Refactor use of legacy i2c implementation (#14340) | Joel Challis | 2021-09-07 | 4 | -417/+15 |
| | | | | | | | | | | * Refactor use of legacy i2c implementation * copy-paste error | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-06 | 10 | -2/+305 |
|\| | |||||
| * | [Keyboard] Redox media (#13084) | shiftux | 2021-09-06 | 10 | -2/+305 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * adding a new revision 'media' to the redox keyboard * readme update * encoder fix * video link * drashna change requests * removing SPLIT_USB_TIMEOUT * intermediate rename * lowercase * drashna comments * include if defined KEYBOARD_redox_media * lowercase readme, tmp step * lowercase readme * drashna changes * more drashna comments * readme update * readme update * fauxpark and drashna comments * fauxpark comments * Update keyboards/redox/media/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-06 | 4 | -144/+174 |
|\| | |||||
| * | [Keyboard] Zinc: fix RGBLED_NUM bug (#13287) | Monksoffunk | 2021-09-06 | 4 | -144/+174 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-05 | 5 | -2/+58 |
|\| | |||||
| * | [Bug] Fix compile issues for boards with custom matrix (#14323) | Drashna Jaelre | 2021-09-05 | 5 | -2/+58 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-05 | 480 | -8440/+67 |
|\| | |||||
| * | Tidy up defines within STM EEPROM emulation (#14275) | Joel Challis | 2021-09-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | * Tidy up defines within stm eeprom emulation * Fix tests * Resolve todo * Still use page notion in clear * Remove more f4 refs | ||||
| * | Remove empty override functions (#14312) | Ryan | 2021-09-05 | 479 | -8439/+66 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove empty override functions, 0-9 * Remove empty override functions, A-D * Remove empty override functions, E-H * Remove empty override functions, handwired * Remove empty override functions, I-L * Remove empty override functions, M-P * Remove empty override functions, Q-T * Remove empty override functions, U-Z | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-05 | 6 | -37/+62 |
|\| | |||||
| * | [Keyboard] Fix rotary encoder function for Voice65 (#14316) | kb-elmo | 2021-09-05 | 6 | -37/+62 |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-04 | 2 | -4/+4 |
|\| | |||||
| * | Enable extra keys for Technik ortho and stagger (#14282) | Albert Y | 2021-09-04 | 2 | -4/+4 |
| | | | | | | | | | | | | | | * Extra keys for technik ortho * Extra keys for technik staggered Co-authored-by: filterpaper <filterpaper@localhost> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-03 | 5 | -42/+44 |
|\| | |||||
| * | FJLabs Ready100 Configurator Fixes (#14291) | James Young | 2021-09-03 | 5 | -42/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * grid-align keycodes; use short-form keycodes No logic change. * info.json: correct layout macro reference * info.json: correct LAYOUT_64key data Removes an extra key from the layout data. * 64_ansi Community Layout support * rename LAYOUT_64key to LAYOUT_64_ansi (with alias for backwards compatibility) * add LAYOUTS = 64_ansi to rules.mk * remove width and height keys from info.json | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-03 | 6 | -12/+15 |
|\| | |||||
| * | Naiping NPhhkb: 60_tsangan_hhkb Community Layout support (#14292) | James Young | 2021-09-03 | 6 | -12/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | * 60_tsangan_hhkb Community Layout support * rename LAYOUT to LAYOUT_60_tsangan_hhkb * add LAYOUTS = 60_tsangan_hhkb to rules.mk * correct maintainer field in info.json * remove width and height keys from info.json * fix GitHub account link on readme | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-03 | 1 | -182/+47 |
|\| | |||||
| * | takashicompany/endzone34: correct QMK Configurator key sequence (#14290) | James Young | 2021-09-03 | 1 | -182/+47 |
| | | | | | | | | | | | | | | | | | | | | * update info.json formatting * convert tabs to spaces * apply human-friendly formatting * correct Configurator key sequence * remove width and height keys from info.json | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-03 | 5 | -10/+13 |
|\| | |||||
| * | OwLab Voice65 Hotswap: 65_ansi_blocker Community Layout support (#14293) | James Young | 2021-09-03 | 5 | -10/+13 |
| | | | | | | | | | | | | | | | | * 65_ansi_blocker Community Layout support * rename LAYOUT to LAYOUT_65_ansi_blocker (with alias for backwards compatibility) * add LAYOUTS = 65_ansi_blocker to rules.mk * remove width and height keys from info.json | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-03 | 17 | -108/+12 |
|\| | |||||
| * | Remove more cruft in keyboard files (#14288) | Ryan | 2021-09-03 | 17 | -108/+12 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-02 | 3 | -26/+51 |
|\| | |||||
| * | [Keymap] Update iris fluffactually keymap (#14265) | jhauh | 2021-09-02 | 3 | -26/+51 |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-02 | 8 | -112/+331 |
|\| | |||||
| * | [Keyboard] Work Louder board fixup (#14247) | Drashna Jaelre | 2021-09-02 | 8 | -112/+331 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [Keyboard] Add some last minute tweaks to Work board * Additional fixes * Fix rgb pin * Fix ws2812 hackery * additional led tweaks * Add indicator LEDs * fix bootmagic settings * Fix up RGB stuff * Limit power draw for entire board * fixup lights and such * change LED order on loop * Fix indicators if via is not enabled * Enable Sleep for rgb matrix * Even more LED tweaks * Final tweaks? * Tweak keycodes | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-02 | 1 | -91/+98 |
|\| | |||||
| * | PistachioPro: correct Configurator key sequence (#14277) | James Young | 2021-09-02 | 1 | -91/+98 |
| | | | | | | | | | | | | | | * info.json: apply human-friendly formatting * correct LAYOUT key sequence Moves the Enter key object to the correct place in sequence. | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-02 | 1 | -7/+140 |
|\| | |||||
| * | Matrix Falcon info.json fixes (#14273) | James Young | 2021-09-02 | 1 | -7/+140 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | * apply human-friendly formatting to info.json * update key labels; correct maintainer field * add LAYOUT_all data to info.json * remove width and height keys from info.json (per fauxpark) Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-02 | 1 | -55/+13 |
|\| | |||||
| * | Yoichiro Lunakey Macro: correct Configurator key sequence (#14276) | James Young | 2021-09-02 | 1 | -55/+13 |
| | | | | | | | | | | * apply human-friendly formatting to info.json * correct Configurator key sequence | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-02 | 6 | -7/+486 |
|\| | |||||
| * | [Keymap] new murphpad landscape keymap with encoder enhanced functions (#14103) | jonavin | 2021-09-01 | 5 | -0/+479 |
| | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Jonavin <=> | ||||
| * | [Keymap] Fine-tuning Nyquist keymap. (#14269) | peott-fr | 2021-09-01 | 1 | -7/+7 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-02 | 6 | -9/+19 |
|\| | |||||
| * | [Keymap] Fix Drashna Keymap issues missed before Develop merge (#14271) | Drashna Jaelre | 2021-09-01 | 6 | -9/+19 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-02 | 8 | -91/+110 |
|\| | |||||
| * | naiping/np64: 64_ansi Community Layout support and codebase touch-up (#14264) | James Young | 2021-09-01 | 8 | -91/+110 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-02 | 9 | -51/+151 |
|\| | |||||
| * | neson design/n6: Extended Community Layout Support and Layout Macro Fix (#14266) | James Young | 2021-09-01 | 5 | -34/+134 |
| | | |||||
| * | wuque/serneity65: Layout Macro rework and Configurator fix (#14267) | James Young | 2021-09-01 | 4 | -17/+17 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-09-02 | 7 | -29/+152 |
|\| | |||||
| * | [Keymap] hvp keymap for Cornelius, updated ut47.2 and userspace (#14187) | hvp | 2021-09-01 | 6 | -29/+125 |
| | |