summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix broken keyboards (#11412)Zach White2021-01-034-14/+20
| | | | | * Fix a couple errors * add a dependency for the generated headers
* Fix compiling on develop (#11409)Zach White2021-01-021-2/+2
|
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-022-2/+4
|\
| * Return the make exit code for qmk compile and flash (#11402)Zach White2021-01-022-2/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-029-0/+381
|\|
| * [Keyboard] Added LDK65 based off BKS65 (#11335)Felix Jen2021-01-029-0/+381
| |
* | Improved Language Specific Keycodes for US International and Extended ↵Joshua Diamond2021-01-027-13/+594
| | | | | | | | | | Layouts (#11307) Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-021-1/+1
|\|
| * Update quark pin config (#11398)npspears2021-01-021-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-021-1/+1
|\|
| * [Docs] Fix typo in hand_wire.md (#11297)Michael Overman2021-01-011-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-0219-0/+1039
|\|
| * [Keyboard] Added Phantom Solder PCB and KBD8X HS PCB Variants (#11282)Felix Jen2021-01-0119-0/+1039
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added config for phantom solder all layout via only * fixed matrix def * Added KBD8X * changed info name * lowercase instances of LAYOUT_ALL and edited rules.mk * edited kbd8x results * fixed kbd8x rules * removed trailing comma in kbd8x info * Update keyboards/lucid/kbd8x_hs/config.h Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/lucid/kbd8x_hs/kbd8x_hs.h Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/lucid/kbd8x_hs/readme.md Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/lucid/kbd8x_hs/rules.mk Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/lucid/phantom_solder/info.json Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/lucid/phantom_solder/readme.md Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/lucid/phantom_solder/rules.mk Co-authored-by: Joel Challis <git@zvecr.com> * Fixed info.json key mismatch Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-011-2/+7
|\|
| * [Keyboard] Pos78 update (#11274)smssmssms2021-01-011-2/+7
| | | | | | | | | | | | | | | | | | * Added LED hardware pin numbers CAPS and NUM lock LEDs * Added "LED_PIN_ON_STATE 1" * Make MATRIX_ROW/COL pins match reality
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-0111-0/+399
|\|
| * [Keyboard] Add GKB-M16 Macro Pad (#11262)gkeyboard2021-01-0111-0/+399
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add GKB-M16 Macro Pad Add GKB-M16 (gkb_m16) Macro Pad under gkeyboard * Update keyboards/gkeyboard/gkb_m16/config.h Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/gkeyboard/gkb_m16/keymaps/via/keymap.c Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/gkeyboard/gkb_m16/info.json Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/gkeyboard/gkb_m16/keymaps/default/keymap.c 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 Bot2021-01-0112-0/+622
|\|
| * [Keyboard] New Keyboard - Mercutio (#11214)Kyle McCreery2021-01-0112-0/+622
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Initial commit on new clean branch. Testing out functionality of oled and encoder for default features. * Cleaned up the initial push and removed the fancy keymap until the extra features and functionality can be tested and made more user friendly. * Cleaned up the readme some more, compiled and tested both default and via keymaps, and did another round of checks to prepare for starting the PR. * Cleaning up the keymap to meet expected formatting in a couple places and also adding in the TAP_CODE_DELAY after newly encoutnered encoder issues and inconsistencies. * Apply suggestions from code review Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/mechwild/mercutio/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Fixing json syntax. * Update keyboards/mechwild/mercutio/rules.mk 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 Bot2021-01-013-1/+120
|\|
| * [Keyboard] Rebound, adding files for VIA compat (#11193)Ross Montsinger2021-01-013-1/+120
| | | | | | | | | | | | | | | | | | | | | | * changes for via * add manu to product name * remove manu from product value * remove description * i m licensed
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-011-3/+1
|\|
| * speed up list_keyboards.shMURAOKA Taro2021-01-011-3/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-019-458/+513
|\|
| * O4L 5x12 refactor (#11392)Ryan2021-01-019-458/+513
| | | | | | | | | | * O4L 5x12 refactor * Remove config.h
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-011-28/+28
|\|
| * Fix rart4x4 info.json (#11390)Ryan2021-01-011-28/+28
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-011-1/+1
|\|
| * Fix typo in hand wiring guide (#11388)s-maurice2021-01-011-1/+1
| | | | | | ridid -> rigid
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-018-256/+268
|\|
| * Manta60 refactor (#11378)Ryan2021-01-028-256/+268
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-011-12/+12
|\|
| * Fix layout ortho_4x12 macro for montsinger/rebound/rev4 (#11382)Joel Challis2021-01-011-12/+12
| |
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-01-0133-719/+1071
|\|
| * Quark refactor (#11377)Ryan2021-01-0130-700/+1052
| |
| * Manually run formatting CI process (#11375)Joel Challis2021-01-014-44/+44
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-3121-0/+899
|\|
| * Quark PCB for Planck/Preonic (#11206)npspears2020-12-3121-0/+899
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Quark PCB for Planck/Preonic Quark provides alternate bottom row layouts for both the OLKB Planck and Preonic * Rename rules.mk.txt to rules.mk * added Tapping Toggle removed tapping toggle from keymap level * Update info.json took out } as requested * update config.h added GPL2+ license and #pragma once * update info.json again cleaned up syntax * Apply suggestions from code review Co-authored-by: Drashna Jaelre <drashna@live.com> * update config.h added GPL2+ License * Update info.json - and again fixed it - oops Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-312-2/+2
|\|
| * Fixed typo in readme.md (#11333)Chas2020-12-312-2/+2
| | | | | | | | | | | | | | * Fixed typo in readme.md censor -> sensor * Censor -> Sensor in the Ploopy Trackball Readme
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-313-1/+2
|\|
| * Change PRODUCT_ID descriptors for M80S and M80H (#11371)Álvaro A. Volpato2020-12-313-1/+2
| | | | | | | | | | | | | | | | | | | | | | * Change PRODUCT_ID descriptors for M80S and M80H * Update config.h * Update config.h * Update config.h * Remove PRODUCT_ID from root config.h
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-313-7/+17
|\|
| * Add target 'check-md5' to `build_keyboard.mk` (#11338)Takeshi ISHII2020-12-313-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add target 'build-for-compare' to `build_keyboard.mk` The `build-for-compare` target provides an easy way to check the md5 checksum of the generated binary. You can easily see if there is any change in the generated binaries between the two versions, as in the example below. ``` $ git checkout 0.11.0 M build_keyboard.mk M tmk_core/rules.mk Note: checking out '0.11.0'. HEAD is now at c66df1664 2020 November 28 Breaking Changes Update (#11053) $ make helix:all:build-for-compare | grep ^MD5 MD5 (.build/helix_rev2_default.hex) = 5c3606562c944bb4d18832e601b45d4a MD5 (.build/helix_rev2_edvorakjp.hex) = 9e43d13d389d518ba7e99cd7337e28d6 MD5 (.build/helix_rev2_five_rows.hex) = 8bcb61c2fd5d237c2997f2fa007d4934 MD5 (.build/helix_rev2_five_rows_jis.hex) = b97cd818d52f73ca2d4e78c86d90a791 MD5 (.build/helix_rev2_froggy.hex) = c492172364188f4e2918b10bf0f3a0a6 MD5 (.build/helix_rev2_froggy_106.hex) = b0861fd735a8f81881a8c02730641a2b MD5 (.build/helix_rev2_led_test.hex) = 5c97d982a5da5cfb3dacb28a8934b81d MD5 (.build/helix_rev2_xulkal.hex) = 01f603dc46bcf9094d7e106831d8f5b1 MD5 (.build/helix_rev2_yshrsmz.hex) = 5a008bca2d0c5790a151c02834c529ba $ git checkout 0.11.1 M build_keyboard.mk M tmk_core/rules.mk Previous HEAD position was c66df1664 2020 November 28 Breaking Changes Update (#11053) HEAD is now at cc08e3082 nix-shell: add milc dependency (#11086) $ make helix:all:build-for-compare | grep ^MD5 MD5 (.build/helix_rev2_default.hex) = 5c3606562c944bb4d18832e601b45d4a MD5 (.build/helix_rev2_edvorakjp.hex) = 9e43d13d389d518ba7e99cd7337e28d6 MD5 (.build/helix_rev2_five_rows.hex) = 8bcb61c2fd5d237c2997f2fa007d4934 MD5 (.build/helix_rev2_five_rows_jis.hex) = b97cd818d52f73ca2d4e78c86d90a791 MD5 (.build/helix_rev2_froggy.hex) = c492172364188f4e2918b10bf0f3a0a6 MD5 (.build/helix_rev2_froggy_106.hex) = b0861fd735a8f81881a8c02730641a2b MD5 (.build/helix_rev2_led_test.hex) = 5c97d982a5da5cfb3dacb28a8934b81d MD5 (.build/helix_rev2_xulkal.hex) = d848383adfd7463b138c6da179cf1436 MD5 (.build/helix_rev2_yshrsmz.hex) = 5a008bca2d0c5790a151c02834c529ba ``` * make builds reproducable by default * update build_keyboard.mk: remove 'build-for-compare' target * GNU make (3.81) on macOS 10.14(Mojave) does not have the 'undefine' directive. * Adopted fauxpark's suggestion. * Update tmk_core/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * update tmk_core/rules.mk * fix tmk_core/rules.mk Co-authored-by: Zach White <skullydazed@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Configure keyboard matrix from info.json (#10817)Zach White2020-12-3079-3897/+4787
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Make parameters from info.json available to the build system * move all clueboard settings to info.json * code formatting * make flake8 happy * make flake8 happy * make qmk lint happy * Add support for specifying led indicators in json * move led indicators to the clueboard info.json * Apply suggestions from code review Co-authored-by: Erovia <Erovia@users.noreply.github.com> * add missing docstring Co-authored-by: Erovia <Erovia@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-302-2/+3
|\|
| * Zadig docs: add APM32 device name (#11356)Ryan2020-12-301-1/+1
| |
| * Correct encoder pins on BDN9v2 (#11357)Nick Blyumberg2020-12-301-1/+2
| | | | | | | | | | | | | | | | | | * Update config.h Wrong pin used for the left encoder, should be A4 * Update config.h Added a media keys fix as well
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-302-7/+2
|\|
| * Missed a couple more `#pragma once`s (#11351)Ryan2020-12-302-7/+2
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-21 04:54:24 +0000