summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-07
|\|
| * 3w6 - Refactor use of AVR only I2C functions (#14339)Joel Challis2021-09-07
| | | | | | | | | | | | | | * Refactor use of legacy i2c functions * Align rev2 * Review fixes
| * Refactor use of legacy i2c implementation (#14341)Joel Challis2021-09-07
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-07
|\|
| * ergodone - Refactor use of legacy i2c implementation (#14340)Joel Challis2021-09-07
| | | | | | | | | | * Refactor use of legacy i2c implementation * copy-paste error
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-06
|\|
| * [Keyboard] Redox media (#13084)shiftux2021-09-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 developQMK Bot2021-09-06
|\|
| * [Keyboard] Zinc: fix RGBLED_NUM bug (#13287)Monksoffunk2021-09-06
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-05
|\|
| * Fix eeprom for Durgod boards (#14324)Joel Challis2021-09-05
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-05
|\|
| * [Bug] Fix compile issues for boards with custom matrix (#14323)Drashna Jaelre2021-09-05
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-05
|\|
| * Tidy up defines within STM EEPROM emulation (#14275)Joel Challis2021-09-05
| | | | | | | | | | | | | | | | | | | | | | * 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)Ryan2021-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 developQMK Bot2021-09-05
|\|
| * Highlight keycode (#14317)Niko Wenselowski2021-09-05
| | | | | | This should make it consistent with other docs and hopefully will make less people miss this detail.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-05
|\|
| * [Core] Add `is_oled_scrolling` (#14305)JayceFayne2021-09-05
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-05
|\|
| * [Keyboard] Fix rotary encoder function for Voice65 (#14316)kb-elmo2021-09-05
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-04
|\|
| * Fix Space Cadet md link (#14300)JayceFayne2021-09-04
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-04
|\|
| * Enable extra keys for Technik ortho and stagger (#14282)Albert Y2021-09-04
| | | | | | | | | | | | | | * Extra keys for technik ortho * Extra keys for technik staggered Co-authored-by: filterpaper <filterpaper@localhost>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-03
|\|
| * FJLabs Ready100 Configurator Fixes (#14291)James Young2021-09-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 developQMK Bot2021-09-03
|\|
| * Naiping NPhhkb: 60_tsangan_hhkb Community Layout support (#14292)James Young2021-09-03
| | | | | | | | | | | | | | | | | | | | | | | | * 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 developQMK Bot2021-09-03
|\|
| * takashicompany/endzone34: correct QMK Configurator key sequence (#14290)James Young2021-09-03
| | | | | | | | | | | | | | | | | | | | * 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 developQMK Bot2021-09-03
|\|
| * OwLab Voice65 Hotswap: 65_ansi_blocker Community Layout support (#14293)James Young2021-09-03
| | | | | | | | | | | | | | | | * 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 developQMK Bot2021-09-03
|\|
| * Remove more cruft in keyboard files (#14288)Ryan2021-09-03
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-02
|\|
| * [Keymap] Update iris fluffactually keymap (#14265)jhauh2021-09-02
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-02
|\|
| * [Keyboard] Work Louder board fixup (#14247)Drashna Jaelre2021-09-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [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 developQMK Bot2021-09-02
|\|
| * PistachioPro: correct Configurator key sequence (#14277)James Young2021-09-02
| | | | | | | | | | | | | | * 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 developQMK Bot2021-09-02
|\|
| * Matrix Falcon info.json fixes (#14273)James Young2021-09-02
| | | | | | | | | | | | | | | | | | | | | | | | | | * 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 developQMK Bot2021-09-02
|\|
| * Yoichiro Lunakey Macro: correct Configurator key sequence (#14276)James Young2021-09-02
| | | | | | | | | | * apply human-friendly formatting to info.json * correct Configurator key sequence
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-02
|\|
| * [Keymap] new murphpad landscape keymap with encoder enhanced functions (#14103)jonavin2021-09-01
| | | | | | | | | | 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-fr2021-09-01
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-02
|\|
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-28 23:03:16 +0000