Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-12 | 1 | -1/+1 |
|\ | |||||
| * | [Docs] Add EEP_RST keycode to "Wiping the EEPROM" section (#11830) | Carlos | 2021-02-12 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-12 | 11 | -0/+867 |
|\| | |||||
| * | [Keyboard] geminate60 keyboard (#11670) | Weirdo | 2021-02-12 | 11 | -0/+867 |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-12 | 2 | -0/+214 |
|\| | |||||
| * | Adding custom keymap for Quark keyboard (#11744) | Brian Marsh | 2021-02-12 | 2 | -0/+214 |
| | | | | | | | | | | | | | | | | | | * adding pezhore keymap * Adding sarcasm/irony mark, unicode emoji * removing numpad layer enum Co-authored-by: Brian Marsh <brian.marsh@rangelabs.io> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-12 | 4 | -0/+419 |
|\| | |||||
| * | Add stuartfong1 Planck Layout (#11814) | Stuart Fong | 2021-02-12 | 4 | -0/+419 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add files via upload * Update readme.md * Update readme.md * Add GPL2+ compatible license header to config.h * Update keyboards/planck/keymaps/stuartfong1/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 develop | QMK Bot | 2021-02-12 | 4 | -0/+0 |
|\| | |||||
| * | Rename ki folder to kifinnsson (#11853) | Christian Gurholt | 2021-02-12 | 4 | -0/+0 |
| | | | | | | In preparation for migrating keymaps to userspace | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-12 | 4 | -0/+421 |
|\| | |||||
| * | added dear_vehicle_owner meme keymap to planck keyboard (#11478) | Timothy Beck | 2021-02-12 | 4 | -0/+421 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * added default as a starting point * added readme per guidelines * made necessary changed to keymap to follow guidelines * changed debounce mode for more smooth usage at the cost of mem * increased polling interval * Revert "made necessary changed to keymap to follow guidelines" yikes! I modified the WRONG directory. reverted. This reverts commit 8ba3d97af538796d765c47b48537dbcf55c3dbc1. * reverted commit that modified file in incorrect directory. modified intended file. * added license tp config.h | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-12 | 7 | -0/+273 |
|\| | |||||
| * | [Keyboard] Add bastyl mini keyboard (#11782) | Quentin | 2021-02-11 | 7 | -0/+273 |
| | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: NullSense <matas234@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-12 | 6 | -7/+9 |
|\| | |||||
| * | [Keyboard] Fix noxary Product IDs (#11771) | Rozakiin | 2021-02-11 | 6 | -7/+9 |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ruari <ruari.armstrong@gmail.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-12 | 11 | -0/+493 |
|\| | |||||
| * | [Keyboard] Support MJ65 - a 65% RGB Hotswap keyboard (#11764) | MelGeek | 2021-02-11 | 11 | -0/+493 |
| | | | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com> | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-11 | 1 | -1/+1 |
|\| | |||||
| * | [Docs] Update feature_haptic_feedback.md (#11859) | Kyle McCreery | 2021-02-11 | 1 | -1/+1 |
| | | | | | | Arduino playground link to wiring diagram no longer works. Changed the link to point to the correct Adafruit hosted diagram pdf. | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-10 | 16 | -488/+757 |
|\| | |||||
| * | [Keymap] add noroadsleft userspace; add and update keymaps (#11686) | James Young | 2021-02-10 | 16 | -488/+757 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-10 | 3 | -0/+115 |
|\| | |||||
| * | [Keymap] Added german_gaming keymap for hidtech/bastyl (#11446) | Joschua Gandert | 2021-02-10 | 3 | -0/+115 |
| | | | | | | | | | | | | | | | | * Added german_gaming keymap for hidtech/bastyl * Apply suggestions from code review * Added missing brace | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-10 | 8 | -34/+98 |
|\| | |||||
| * | Userspace updates (#11841) | stanrc85 | 2021-02-10 | 8 | -34/+98 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * enable LTO for smaller firmware size * delete since this was added to userspace rules.mk * readme updates and new images * Add -j to compile and flash commands in userpsace * Enable NKRO * Enable NKRO, VIA, LTO by default * Stanrc85-ansi readme update * Stanrc85-alice readme * quick RGB layer indicator fix in keymap | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-10 | 9 | -0/+194 |
|\| | |||||
| * | [Keyboard] Add keyboard yun65 (#11714) | Spaceman | 2021-02-09 | 9 | -0/+194 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-10 | 22 | -0/+3591 |
|\| | |||||
| * | [Keyboard] Add sowbug/68keys and sowbug/ansi_tkl (#11589) | Mike Tsao | 2021-02-09 | 22 | -0/+3591 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-10 | 1 | -1/+1 |
|\| | |||||
| * | Play Keyboard Helen 80: fix matrix mapping (#11585) | LSChyi | 2021-02-09 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-09 | 1 | -1/+1 |
|\| | |||||
| * | Fix VENDOR_ID for ymd67 (#11838) | Konstantin Shpits | 2021-02-10 | 1 | -1/+1 |
| | | |||||
* | | Remove FAUXCLICKY feature (deprecated) (#11829) | Drashna Jaelre | 2021-02-09 | 483 | -750/+48 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-09 | 12 | -0/+400 |
|\| | |||||
| * | [Keyboard] Add Splitty keyboard (#11613) | Nicolas Schodet | 2021-02-09 | 12 | -0/+400 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-09 | 10 | -436/+77 |
|\| | |||||
| * | Simplify NIBBLE encoder code and clean up keymaps (#11808) | Jay Greco | 2021-02-09 | 10 | -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 develop | QMK Bot | 2021-02-08 | 1 | -21/+17 |
|\| | |||||
| * | ws2812: Fix number of nops for AVR at 8 MHz (#9559) | Sergey Vlasov | 2021-02-09 | 1 | -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 White | 2021-02-08 | 3 | -22/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-08 | 4 | -4/+4 |
|\| | |||||
| * | Fix RGBLIGHT_LIMIT_VAL typo (#11826) | Ryan | 2021-02-08 | 4 | -4/+4 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-07 | 14 | -50/+22 |
|\| | |||||
| * | Migrate some tmk_core files to quantum (#11791) | Joel Challis | 2021-02-07 | 14 | -50/+22 |
| | | | | | | | | | | * Migrate some tmk_core files to quantum * Fix build errors | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-07 | 4 | -2/+62 |
|\| | |||||
| * | via support for bat43 (#11729) | yfuku | 2021-02-07 | 4 | -2/+62 |
| | | | | | | | | | | * via support for bat43 * add adjust layer for via | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-02-07 | 1 | -5/+8 |
|\| | |||||
| * | [Update] Allow APM32 on TrinityXTtkl (#11715) | Xelus22 | 2021-02-07 | 1 | -5/+8 |
| | | | | | | | | | | * amp32 initial change * fix spacing |