summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | Implement kinetic mouse movement algorithm (#6739)Jan Christoph Ebersbach2020-12-243-3/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Implement kinetic mouse movement algorithm * Adjust mouse wheel speed * Remove unused math.h include * Wrap mouse_timer definition in ifdef * Replace double space by single space * Clarify documentation of kinetic mouse speed Co-Authored-By: lf <software@lfcode.ca> * Clarify documentation of kinetic mouse speed Co-Authored-By: lf <software@lfcode.ca> * Remove superfluous definition of speed * fix(variable): remove unused variable Co-authored-by: lf <software@lfcode.ca>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-249-0/+323
|\|
| * new repo: create cmm.studio folder, add saka qmk firmware (#11248)CMMS-Freather2020-12-249-0/+323
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-245-10/+10
|\|
| * `qmk fileformat`: only print complaints, and fix some of them (#11278)Ryan2020-12-245-10/+10
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-2410-0/+1692
|\|
| * [Keyboard] misterknife/knife66_iso (#11010)Thierry Michel Philippe Kleist2020-12-2310-0/+1692
| | | | | | * feat: added new variant of knife66
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-231-0/+1
|\|
| * docs: add Gentoo to newbs_getting_started.md (#11241)Boris Faure2020-12-231-0/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-2310-0/+373
|\|
| * Helen 80 addition (#11133)Barry Huang2020-12-2310-0/+373
| | | | | | | | Co-authored-by: james sa <james@keto.tw> Co-authored-by: James Sa <james.sa.2013@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-233-0/+75
|\|
| * [keymap] Adds tofu65 with split spacebar (#10831)Perry Hargrave2020-12-223-0/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [keymap] Adds tofu65 with split spacebar * Update keyboards/kbdfans/kbd67/rev2/keymaps/ansi_split_space/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/kbdfans/kbd67/rev2/keymaps/ansi_split_space/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/kbdfans/kbd67/rev2/keymaps/ansi_split_space/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/kbdfans/kbd67/rev2/rev2.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/kbdfans/kbd67/rev2/keymaps/ansi_split_space/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/kbdfans/kbd67/rev2/keymaps/ansi_split_space/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/kbdfans/kbd67/rev2/keymaps/ansi_split_space/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/kbdfans/kbd67/rev2/keymaps/ansi_split_space/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * keymap:tofu65: remove unneeded config.h * Update keyboards/kbdfans/kbd67/rev2/keymaps/ansi_split_space/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-231-1/+1
|\|
| * [Docs] Update links in main README.md (#11284)Nick Blyumberg2020-12-221-1/+1
| | | | | | | | | | | | It looks like features.md was deprecated and content was split into other files. This results in a broken link on the main page which, if removed, would have no impact to the remainder of the documentation. This would also: resolve #9239 resolve #10293 resolve #10447
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-239-0/+473
|\|
| * [Keyboard] Portico: Initial support for TKC Portico (#11215)TerryMathews2020-12-229-0/+473
| | | | | | | | | | | | | | | | | | | | | | * Portico: Initial support for TKC Portico * Portico: added GPL header to keymap files * Update keyboards/tkc/portico/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-231-1/+1
|\|
| * [Keyboard] HID Technologies vendor id correction (#11225)Anthony Marin2020-12-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add bastyl * no need to copy the folder anymore * clean up according to PR rules * remove via, fix disposition * add reset button on right half * Update readme.md * Update keyboards/hidtech/bastyl/bastyl.h Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/hidtech/bastyl/rules.mk Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/hidtech/bastyl/config.h Co-authored-by: Joel Challis <git@zvecr.com> * move json, remove via files * Update keyboards/hidtech/bastyl/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/hidtech/bastyl/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/hidtech/bastyl/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/hidtech/bastyl/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * add GPL to c and h files * Update keyboards/hidtech/bastyl/info.json Change order to match layout macro Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/hidtech/bastyl/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * serial define can be ommited, is used by default * Corrected VENDOR_ID Incorrect VENDOR_ID has been updated to the correct one. Co-authored-by: Quentin <qlebastard@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-233-0/+55
|\|
| * [Keyboard] Scarlet numpad VIA support added (#11188)Blake2020-12-223-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Initial test version of Scarlet keyboard * First commit of DElec Scarlet * Change to new Draytronics branding * Update to keyboard details Update to keyboard details and link to Draytronics website. * Update keyboards/draytronics/scarlet/scarlet.h Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/draytronics/scarlet/rules.mk Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/draytronics/scarlet/readme.md Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/draytronics/scarlet/keymaps/default/keymap.c Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/draytronics/scarlet/config.h Co-authored-by: Joel Challis <git@zvecr.com> * Update keymap.c * Update config.h * Update scarlet.h * Update keyboards/draytronics/scarlet/config.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/draytronics/scarlet/config.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/draytronics/scarlet/scarlet.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/draytronics/scarlet/keymaps/default/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * provide info.json layout to fix qmk configurator * Correctly name keyboard in info.json * Added website and layout key labels to info.json * VIA support. Thanks sirdicholas * Readme change, link to VIA design file. Co-authored-by: Blake Drayson <blake@Euclid.ghost7.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-231-0/+6
|\|
| * [Docs] Add clarification on use of custom RGB Matrix effect (#11176)Daniele De Vincenti2020-12-221-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update feature_rgb_matrix.md Added more clarification on how to use a newly created rgb effect as it was unclear that the prefix 'RGB_MATRIX_CUSTOM_' had to be added. Also included an example consistent with the documentation example. * Update docs/feature_rgb_matrix.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update docs/feature_rgb_matrix.md Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-236-2/+208
|\|
| * [Keyboard] corrected VID/PID and layout for squiggle (#11198)Ibnu Daru Aji2020-12-226-2/+208
| | | | | | | | | | * corrected the pid and added a new layout. * following drashna's suggestion.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-232-123/+81
|\|
| * ergodox_ez/stamm update (#11236)Rustam Zagirov2020-12-232-123/+81
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-01 09:31:02 +0000