summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-301-1/+9
|\|
| * Add Arch / Manjaro section for Linux setup instructions (#10509)Reibl János Dániel2020-12-301-1/+9
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-301-3/+0
|\|
| * Remove useless wait in AVR suspend code (#11352)Ryan2020-12-301-3/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-301-0/+44
|\|
| * [Keymap] Yd60mq add 64 key layout (#11207)Enoch2020-12-301-0/+44
| | | | | | | | | | | | | | | | | | * 64 key layout * add license * add license add name
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-301-1/+1
|\|
| * Add libusb-devel dependency for fedora (#11287)Maurizio Porrato2020-12-301-1/+1
| | | | | | On fedora 33, libusb-devel is required to build BootloadHID
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-301-0/+17
|\|
| * [Keyboard] Add support to Kyria for the 2x2u layout (#11227)swampmonster2020-12-291-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-304-0/+336
|\|
| * Added mac variant of portuguese keymap extras (#11260)André Cruz2020-12-294-0/+336
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-307-0/+316
|\|
| * [Keyboard] Polarity works CRBN support (#11107)ReFil2020-12-297-0/+316
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Initial CRBN compatibility Updated readme.md too * formatting tweaks to meet requirements * Update crbn.c * Create readme.md * Required fixes and licence header * Fixes * Apply suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/crbn/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update crbn.c * Update keyboards/crbn/crbn.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Licence headers * Create info.json * Apply suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> * Configurator support * Update keymap.c * Update keymap.c 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-304-0/+287
|\|
| * [Keymap] spidey3 keymap for DMQDesign Spin (#11194)Joshua Diamond2020-12-294-0/+287
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * My first cut at firmware for te DMQDesign Spin * Turn off underglow when computer sleeps * dmqdesigns spin - a little more refined keymap now * a few more refinements for spin * missing key up event for CH_CPNL and CH_ASST * better naming for keymap * cformat * Apply suggestions from code review Co-authored-by: Drashna Jaelre <drashna@live.com> * Old #include habits die hard... :) Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Update ADB impelemtation in TMK Core (#11168)siggie08152020-12-292-85/+229
| | | | | | | | | | | | | | | | | | * Update ADB impelmentation in tmk_core to recent version. Pcked from tmk_keyboard repository revision: 48d696443857512d45f9a7329e0dd0a76345860f * Restore convenient ADB functions used in QMK port. * Do cformat.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-301-1/+1
|\|
| * Add missing Debian/Ubuntu dependency to the install script (#11348)Jonathan Paugh2020-12-301-1/+1
| | | | | | | | | | To successfully compile bootloadHID, we must have the libusb-config tool, which comes from the libusb-dev package. This package is available in both Ubuntu Groovy and Debian Buster Co-authored-by: Jonathan Paugh <jpaugh@gmx.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-309-0/+250
|\|
| * Add Axolstudio Helpo (#11117)kb-elmo2020-12-309-0/+250
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add axolstudio helpo * reverse matrix * fix path in readme * Apply suggestions from code review Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/axolstudio/helpo/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.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-3012-0/+703
|\|
| * The mark: 65 (#11060)cole smith2020-12-3012-0/+703
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * added main keyboard files * working default and iso maps * add via config * made default ansi map * fixed info.json and made readme * renamed folders * reincluding the folders I renamed * Apply suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> * I made a change before PR to clean up VIA map that broke it now its fixed * Apply suggestions from code review Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/boardsource/the_mark/the_mark.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 20:30:43 +0000