summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-01-01Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-01[Keyboard] Pos78 update (#11274)smssmssms
* Added LED hardware pin numbers CAPS and NUM lock LEDs * Added "LED_PIN_ON_STATE 1" * Make MATRIX_ROW/COL pins match reality
2021-01-01Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-01[Keyboard] Add GKB-M16 Macro Pad (#11262)gkeyboard
* 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>
2021-01-01Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-01[Keyboard] New Keyboard - Mercutio (#11214)Kyle McCreery
* 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>
2021-01-01Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-01[Keyboard] Rebound, adding files for VIA compat (#11193)Ross Montsinger
* changes for via * add manu to product name * remove manu from product value * remove description * i m licensed
2021-01-01Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-01speed up list_keyboards.shMURAOKA Taro
2021-01-01Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-01O4L 5x12 refactor (#11392)Ryan
* O4L 5x12 refactor * Remove config.h
2021-01-01Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-01Fix rart4x4 info.json (#11390)Ryan
2021-01-01Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-01Fix typo in hand wiring guide (#11388)s-maurice
ridid -> rigid
2021-01-01Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-02Manta60 refactor (#11378)Ryan
2021-01-01Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-01Fix layout ortho_4x12 macro for montsinger/rebound/rev4 (#11382)Joel Challis
2021-01-01Merge remote-tracking branch 'upstream/master' into developfauxpark
2021-01-01Quark refactor (#11377)Ryan
2021-01-01Manually run formatting CI process (#11375)Joel Challis
2020-12-31Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-31Quark PCB for Planck/Preonic (#11206)npspears
* 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>
2020-12-31Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-31Fixed typo in readme.md (#11333)Chas
* Fixed typo in readme.md censor -> sensor * Censor -> Sensor in the Ploopy Trackball Readme
2020-12-31Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-31Change PRODUCT_ID descriptors for M80S and M80H (#11371)Álvaro A. Volpato
* Change PRODUCT_ID descriptors for M80S and M80H * Update config.h * Update config.h * Update config.h * Remove PRODUCT_ID from root config.h
2020-12-31Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-31Add target 'check-md5' to `build_keyboard.mk` (#11338)Takeshi ISHII
* 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>
2020-12-30Configure keyboard matrix from info.json (#10817)Zach White
* 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>
2020-12-30Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-30Zadig docs: add APM32 device name (#11356)Ryan
2020-12-30Correct encoder pins on BDN9v2 (#11357)Nick Blyumberg
* Update config.h Wrong pin used for the left encoder, should be A4 * Update config.h Added a media keys fix as well
2020-12-30Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-30Missed a couple more `#pragma once`s (#11351)Ryan
2020-12-30Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-30Add Arch / Manjaro section for Linux setup instructions (#10509)Reibl János Dániel
2020-12-30Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-30Remove useless wait in AVR suspend code (#11352)Ryan
2020-12-30Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-30[Keymap] Yd60mq add 64 key layout (#11207)Enoch
* 64 key layout * add license * add license add name
2020-12-30Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-30Add libusb-devel dependency for fedora (#11287)Maurizio Porrato
On fedora 33, libusb-devel is required to build BootloadHID
2020-12-30Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-29[Keyboard] Add support to Kyria for the 2x2u layout (#11227)swampmonster
* Adding support for the 2 x 2u layout. This adds a macro to support the 2 x 2u layout which facilitates a cleaner looking layout configuration for the people using it. * Update keyboards/kyria/kyria.h Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: swampmonster <> Co-authored-by: Drashna Jaelre <drashna@live.com>
2020-12-30Merge remote-tracking branch 'origin/master' into developQMK Bot
2020-12-29Added mac variant of portuguese keymap extras (#11260)André Cruz
* Added mac variant of portuguese keymap This keymap is very similar to the existing portuguese keymap, but some symbols are moved around. Apply suggestions from code review Corrected whitespace and implemented some suggested changes. Co-authored-by: Ryan <fauxpark@gmail.com> Converted some spaces to nbsp Added sendstring ISO version * Apply suggestions from code review Added suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> * Replaced space with nbsp * Corrected 2 chars in ascii_to_shift_lut { and } require shift Co-authored-by: Ryan <fauxpark@gmail.com>
2020-12-30Merge remote-tracking branch 'origin/master' into developQMK Bot
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 00:19:06 +0000