summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-3016-103/+304
|\
| * Update Choco60 firmware to support new PCB (#11218)Naoto Takai2020-12-3016-103/+304
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update vendor and product info * Add rev2 for Choco60 * Add keymap for VIA * Add readme.md for rev1 and rev2 * Use list instead of new line * Remove DESCRIPTION Co-authored-by: Ryan <fauxpark@gmail.com> * Update rev1/readme.md to specify rev1 directly. Co-authored-by: Ryan <fauxpark@gmail.com> * Remove some definitions Co-authored-by: Ryan <fauxpark@gmail.com> * Remove comments Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-3016-0/+401
|\|
| * Add 6key to keyboards/handwired (#11226)Jacqueline Liang2020-12-307-0/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add 6key to keyboards/handwired * Add keyboards/handwired/6key folder * Add 6key.c * Add 6key.h * Add config.h * Add keymaps/default/keymap.c * Add readme.md * Add rules.mk * Add info.json * Apply suggestions from code review Co-authored-by: Drashna Jaelre <drashna@live.com> * Make changes based on pr comments * Apply formatting suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/handwired/6key/rules.mk Co-authored-by: jyliang2 <jyliang2@illinois.edu> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com>
| * add nodu keyboard (#11233)Brandon Claveria2020-12-309-0/+222
| | | | | | | | | | | | | | | | | | * add nodu keyboard * fix info.json * limit via to 3 layers Co-authored-by: Swiftrax <swiftrax@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-2912-0/+1704
|\|
| * Tsukuyomi Keyboard (#10898)Andrew Kannan2020-12-2912-0/+1704
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add Tsukuyomi PCB * Remove unncessary file * Fix * update config * Tsukuyomi info.json * Update readme * add license header and add dfu suffix args * Apply suggestions from code review Co-authored-by: Joel Challis <git@zvecr.com> * Update info.json * Apply suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-292-3/+10
|\|
| * Add convenience method for setting Nibble's big LED RGB (#11257)Nick Krichevsky2020-12-292-3/+10
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-291-1/+1
|\|
| * [Bug] Fix RGB Matrix Indicators (#11308)Drashna Jaelre2020-12-291-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-291-0/+1
|\|
| * Fix backlight for XD84 (#11309)Joe Hu2020-12-291-0/+1
| | | | | | Like XD87, XD8 should have `#define BACKLIGHT_ON_STATE 0` too.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-293-156/+0
|\|
| * Remove MATRIX_IS_ON macro (#11330)xyzz2020-12-293-156/+0
| | | | | | | | | | | | | | | | * Remove MATRIX_IS_ON macro this macro is both incorrect and excessive given that macro_is_on() exists * Remove massdrop matrix.h
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-2919-0/+878
|\|
| * Add ALETH42 keyboard (#10720)Monksoffunk2020-12-2919-0/+878
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add Aleth42 keyboard * Fix Rotary Encoder Section * Add VIA keymap * Fix VIA keymap remove RETRO_TAPPING define because of incompatiblity of rotary encoders with layer tapping. change KC_ESC to KC_GESC * Change TAPPING definitions Comment TAPPING_TERM Remove RETRO_TAPPING * Add rev1 Add new rev1 directory Move previous files to rev0 * Add define of ENCODER_RESOLUTION * Change number of RGBLED * Change USB descriptor param Change VID, PID and product name * Change default and via keymaps * Remove upper keymap * Add readme * Change USB descriptor param VID 0x04D8 PID 0xEAC8 Manufacturer 25KEYS rev0 -> 0x0000 rev1 -> 0x0001 Remove define DESCRIPTION * Fix info.json Remove info,json under /rev0 /rev1 Add correct info.json at keyboard/aleth42/ * Change keymaps * Remove unnecessary comments * Change BOOTMAGIC option * Change config options * Fix readme files * Change keymap readme files * Change to use get_highest_layer * Update keyboards/aleth42/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/aleth42/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/aleth42/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/aleth42/keymaps/default/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/aleth42/keymaps/default/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/aleth42/keymaps/default/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/aleth42/keymaps/via/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/aleth42/keymaps/via/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/aleth42/keymaps/via/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Use tap_code16 function * Remove empty config file * Update keyboards/aleth42/keymaps/default/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/aleth42/keymaps/default/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/aleth42/keymaps/default/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/aleth42/keymaps/default/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/aleth42/keymaps/default/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/aleth42/keymaps/via/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/aleth42/keymaps/via/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/aleth42/keymaps/via/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/aleth42/keymaps/via/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-292-82/+82
|\|
| * Update keycode docs (#11343)Ryan2020-12-302-82/+82
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-291-8/+37
|\|
| * Update Zadig docs with list of bootloader device names and IDs (#11337)Ryan2020-12-291-8/+37
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-291-70/+3
|\|
| * remove some old and unused code from Makefile (#11336)Zach White2020-12-291-70/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-294-35/+70
|\|
| * [CLI] Add stdin support for json2c command (#11289)LongerHV2020-12-294-35/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Implement stdin for json2c command * Refactor * Handle json decode error * Add stdin support for c2json cli command * Refactor to prevent code duplication * Change exit(1) to return False in c2json command * Remove unused import
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-291-1/+1
|\|
| * Typo fix: Useful function -> Useful Functions (#11342)Chas2020-12-301-1/+1
| | | | | | Thanks!
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-2920-82/+46
|\|
| * Fix compile issues from the error page (#11314)Zach White2020-12-2820-82/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fix abacus so it works with configurator * create the keymap path if it doesn't exist * bpiphany/unloved_bastard: remove the nested macros, move default keymap to json * readd the unloved_bastard default keymap * fix clueboard/card * fixup handwired/2x5keypad * fixup hub16 * matrix/noah: remove the broken matrix print code to fix compilation * reinstate matrix_print with the right include * Revert "create the keymap path if it doesn't exist" This reverts commit af732776a539e8c6e2edf2e54f4d7f5ffa65b3a2.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-2811-0/+238
|\|
| * 1x4p1 (#11186)David Doan2020-12-2811-0/+238
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Erovia <Erovia@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-2740-61/+40
|\|
| * Ensure single newline at EOF for core files (#11310)Ryan2020-12-2840-61/+40
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-274-14/+114
|\|
| * Simplify the visual flow of the getting started page (#11316)Joel Challis2020-12-274-14/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add tabs to getting started page * Review comments Co-authored-by: Ryan <fauxpark@gmail.com> * Align with current theme * Update docs/newbs_getting_started.md Co-authored-by: Ryan <fauxpark@gmail.com> * Apply suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-2660-258/+96
|\|
| * Change include guards in tmk_core/ and drivers/ to pragma once (#11240)Ryan2020-12-2660-258/+96
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-2650-204/+68
|\|
| * Change include guards in quantum/ to pragma once (#11239)Ryan2020-12-2650-204/+68
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-252-30/+28
|\|
| * [Keyboard] Fix default keymaps for tunks/ergo33 (#11280)Drashna Jaelre2020-12-252-30/+28
| | | | | | | | | | * [Keyboard] Fix default keymap for tunks/ergo33 * Add prpro keymap too
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-253-23/+75
|\|
| * [Keymap] update rules.mk and config.h of `helix/rev2:five_rows` (#11302)Takeshi ISHII2020-12-263-23/+75
| | | | | | | | | | | | | | | | | | * update keyboards/helix/rev2/keymaps/five_rows/rules.mk: oled selection, led animation selection * add OLED_UPDATE_INTERVAL support into keyboards/helix/rev2/keymaps/five_rows/oled_display.c Support for OLED_UPDATE_INTERVAL, even for older types of OLED tasks. * Add 'HELIX=debug/no-debug' option into 'helix/rev2/keymaps/five_rows/rules.mk'
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-258-0/+291
|\|
| * First commit of Kawii9 (#11201)kiwikey2020-12-268-0/+291
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-258-0/+489
|\|
| * Adding new keyboard: Tenkey++ (tenkey_plusplus) (#11197)Jonathon Carstens2020-12-268-0/+489
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-251-1/+1
|\|
| * [Keyboard] Fix Dactyl Manuform with Trackball info.json (#11298)Drashna Jaelre2020-12-261-1/+1
| |
* | [Keyboard] Refactor Jacky's boards (Bear65 and S7 Elephant) (#10528)George Mao2020-12-2432-0/+4382
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 20:04:00 +0000