summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-109-0/+194
|\
| * [Keyboard] Add keyboard yun65 (#11714)Spaceman2021-02-099-0/+194
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-1022-0/+3591
|\|
| * [Keyboard] Add sowbug/68keys and sowbug/ansi_tkl (#11589)Mike Tsao2021-02-0922-0/+3591
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-101-1/+1
|\|
| * Play Keyboard Helen 80: fix matrix mapping (#11585)LSChyi2021-02-091-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-091-1/+1
|\|
| * Fix VENDOR_ID for ymd67 (#11838)Konstantin Shpits2021-02-101-1/+1
| |
* | Remove FAUXCLICKY feature (deprecated) (#11829)Drashna Jaelre2021-02-09483-750/+48
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-0912-0/+400
|\|
| * [Keyboard] Add Splitty keyboard (#11613)Nicolas Schodet2021-02-0912-0/+400
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-0910-436/+77
|\|
| * Simplify NIBBLE encoder code and clean up keymaps (#11808)Jay Greco2021-02-0910-436/+77
| | | | | | | | | | | | | | | | | | * Simplify encoder code and clean up keymaps. -Removed overly complex VIA encoder code. It wasn't adding any value and was confusing users who were trying to customize encoder functionality on VIA keymaps. -Replaced KC_TILDE with KC_HOME in all keymaps, as KC_TILDE sends a left shift, which was confusing some folks as they tested their build. -Move layer names to enum * Change encoder_update_kb to encoder_update_user per PR feedback
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-081-21/+17
|\|
| * ws2812: Fix number of nops for AVR at 8 MHz (#9559)Sergey Vlasov2021-02-091-21/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ws2812: Fix number of nops for AVR at 8 MHz When trying to calculate the number of nops for AVR running at 8 MHz, the value of `w3` is expected to be negative; however, because `F_CPU` is defined in tmk_core/avr.mk with the `UL` suffix, the preprocessor performs its calculations using `unsigned long`, getting a very large positive number instead of the expected negative number; this then results in generating code with a huge number of nops. Fix the broken calculations by performing a comparison before subtraction, so that the unsigned number wraparound does not occur. The keyboard which triggers the problem is `handwired/promethium`; the buggy code silently compiles, but the resulting timings would be completely wrong. * ws2812: Clean up the code after the 8 MHz fix Remove old code which was unsuccessfully trying to clamp negative w1, w2 and w3 values to 0, and set w1_nops, w2_nops and w3_nops directly.
* | remove deprecated qmk json-keymap (#11823)Zach White2021-02-083-22/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-084-4/+4
|\|
| * Fix RGBLIGHT_LIMIT_VAL typo (#11826)Ryan2021-02-084-4/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-0714-50/+22
|\|
| * Migrate some tmk_core files to quantum (#11791)Joel Challis2021-02-0714-50/+22
| | | | | | | | | | * Migrate some tmk_core files to quantum * Fix build errors
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-074-2/+62
|\|
| * via support for bat43 (#11729)yfuku2021-02-074-2/+62
| | | | | | | | | | * via support for bat43 * add adjust layer for via
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-071-5/+8
|\|
| * [Update] Allow APM32 on TrinityXTtkl (#11715)Xelus222021-02-071-5/+8
| | | | | | | | | | * amp32 initial change * fix spacing
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-074-20/+16
|\|
| * Allow flash/compile to accept relative json paths (#11767)Joel Challis2021-02-074-20/+16
| | | | | | | | | | | | | | | | | | | | | | * Allow flash/compile to accept relative paths * Review suggestions * Review comments * Put back exists check otherwise stdin fails * fix lint
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-02-0821-106/+2415
|\|
| * Add DSP40 (#11579)Danny2021-02-0719-0/+2193
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * Rework I2C driver docs (#11658)Ryan2021-02-082-106/+222
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-079-0/+307
|\|
| * [Keyboard] Add The Stick keyboard (#11745)Danny2021-02-079-0/+307
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-071-0/+10
|\|
| * [Docs] Update isp_flashing_guide.md (#11777)moritz-john2021-02-071-0/+10
| | | | | | Added wiring for USBasp and changed the order of the documentation accordingly
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-072-2/+1
|\|
| * [Keymap] Update keymap for keebio/nyquist (#11734)George Petri2021-02-072-2/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-072-0/+92
|\|
| * [Keymap] Shadyproject/bfo9000 (#11753)Chris M2021-02-072-0/+92
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-072-290/+297
|\|
| * [Keymap] Update community ortholinear 4x12 keymap: junonum (#11757)Juno Nguyen2021-02-072-290/+297
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-074-0/+109
|\|
| * [Keyboard] Add my keymap for Mark65 (#11717)stanrc852021-02-074-0/+109
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-0713-0/+636
|\|
| * [Keyboard] Add nknl7jp keyboard (#11591)Salicylic-acid32021-02-0713-0/+636
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add nknl7jp keyboard A 73 keys JIS Layout split keyboard. Salicylic-acid3 * Keymap Update Fixed default keymap. * Update keyboards/nknl7jp/keymaps/salicylic/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/nknl7jp/keymaps/salicylic/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/nknl7jp/keymaps/salicylic/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/nknl7jp/keymaps/salicylic/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-0713-0/+637
|\|
| * [Keyboard] Add nknl7en keyboard (#11590)Salicylic-acid32021-02-0713-0/+637
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add nknl7en keyboard A 70 keys ANSI Layout split keyboard. Salicylic-acid3 * Update readme.md The name, photo, and link were wrong, so they have been corrected. * Update keyboards/nknl7en/keymaps/salicylic/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/nknl7en/keymaps/salicylic/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/nknl7en/keymaps/salicylic/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/nknl7en/keymaps/salicylic/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-0713-0/+606
|\|
| * [Keyboard] Add ergoarrows keyboard (#11592)Salicylic-acid32021-02-0713-0/+606
| | | | | | | | A 76 keys Ergo Layout split keyboard. Salicylic-acid3
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-078-0/+287
|\|
| * [Keyboard] Add Hi-Tek AIM-65 keyboard (#11623)Matteo Bonora2021-02-078-0/+287
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add Hi-Tek AIM-65 keyboard * Add bootloader selection * Update keyboards/handwired/aim65/readme.md Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/handwired/aim65/rules.mk Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboard image Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/handwired/aim65/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/handwired/aim65/keymaps/bonnee/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/handwired/aim65/keymaps/default/keymap.c Fix indentation Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/handwired/aim65/keymaps/default/keymap.c Fix indentation Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/handwired/aim65/keymaps/bonnee/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/handwired/aim65/readme.md Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/handwired/aim65/keymaps/bonnee/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/handwired/aim65/keymaps/bonnee/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/handwired/aim65/keymaps/default/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/handwired/aim65/config.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-078-0/+278
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 02:39:33 +0000