summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-12[Keyboard] Update MOJO75 to support multi version (#11790)MelGeek
* Add Z70Ultra which is a Hotsawp RGB 65% keyboard * Update keyboards/melgeek/z70ultra/z70ultra.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/rev1/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/z70ultra.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update readme.md * Update info.json update the name of layout to consistent the keyboard. * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/info.json Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Add Z70Ultra * Support Z70Ultra [Modified] info.json to support two different layouts [Add] rules.mk to support default folder * Update keyboards/melgeek/z70ultra/rev1/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * remove excessive arguments from LAYOUT_split_space * Update keyboards/melgeek/z70ultra/info.json Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/info.json Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/z70ultra.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/z70ultra.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/rev1/rules.mk Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Use macro replace with the literal for CS & SW * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Drashna Jaelre <drashna@live.com> * [Keyboard] Support MJ61 which is a 60% ANSI STD Hotswap RGB keyboard * Update keyboards/melgeek/mj61/mj61.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/melgeek/mj61/mj61.c Co-authored-by: Drashna Jaelre <drashna@live.com> * [Keyboard] MJ61 Add license header for files and the link for readme * Update keyboards/melgeek/mj61/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/mj61/rev1/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/mj61/rev1/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/mj61/mj61.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/mj61/mj61.c Co-authored-by: Ryan <fauxpark@gmail.com> * Add GPL for files * Update keymaps/default/keymap.c * Update keymaps/via/keymap.c * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Drashna Jaelre <drashna@live.com> * [Keyboard] Update MOJO75 to support multi version and Update the LED's ID of RGB Matrix 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>
2021-02-13Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-12[Keyboard] tunks/ergo33: define RGBLight config at kb level (#11855)James Young
2021-02-12Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-12[Docs] Add EEP_RST keycode to "Wiping the EEPROM" section (#11830)Carlos
2021-02-12Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-12[Keyboard] geminate60 keyboard (#11670)Weirdo
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-02-12Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-12Adding custom keymap for Quark keyboard (#11744)Brian Marsh
* adding pezhore keymap * Adding sarcasm/irony mark, unicode emoji * removing numpad layer enum Co-authored-by: Brian Marsh <brian.marsh@rangelabs.io>
2021-02-12Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-12Add stuartfong1 Planck Layout (#11814)Stuart Fong
* 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>
2021-02-12Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-12Rename ki folder to kifinnsson (#11853)Christian Gurholt
In preparation for migrating keymaps to userspace
2021-02-12Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-12added dear_vehicle_owner meme keymap to planck keyboard (#11478)Timothy Beck
* 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
2021-02-12Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-11[Keyboard] Add bastyl mini keyboard (#11782)Quentin
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>
2021-02-12Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-11[Keyboard] Fix noxary Product IDs (#11771)Rozakiin
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ruari <ruari.armstrong@gmail.com>
2021-02-12Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-11[Keyboard] Support MJ65 - a 65% RGB Hotswap keyboard (#11764)MelGeek
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>
2021-02-11Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-11[Docs] Update feature_haptic_feedback.md (#11859)Kyle McCreery
Arduino playground link to wiring diagram no longer works. Changed the link to point to the correct Adafruit hosted diagram pdf.
2021-02-10Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-10[Keymap] add noroadsleft userspace; add and update keymaps (#11686)James Young
2021-02-10Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-10[Keymap] Added german_gaming keymap for hidtech/bastyl (#11446)Joschua Gandert
* Added german_gaming keymap for hidtech/bastyl * Apply suggestions from code review * Added missing brace
2021-02-10Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-10Userspace updates (#11841)stanrc85
* 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
2021-02-10Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-09[Keyboard] Add keyboard yun65 (#11714)Spaceman
2021-02-10Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-09[Keyboard] Add sowbug/68keys and sowbug/ansi_tkl (#11589)Mike Tsao
2021-02-10Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-09Play Keyboard Helen 80: fix matrix mapping (#11585)LSChyi
2021-02-09Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-10Fix VENDOR_ID for ymd67 (#11838)Konstantin Shpits
2021-02-09Remove FAUXCLICKY feature (deprecated) (#11829)Drashna Jaelre
2021-02-09Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-09[Keyboard] Add Splitty keyboard (#11613)Nicolas Schodet
2021-02-09Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-09Simplify NIBBLE encoder code and clean up keymaps (#11808)Jay Greco
* 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
2021-02-08Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-09ws2812: Fix number of nops for AVR at 8 MHz (#9559)Sergey Vlasov
* 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.
2021-02-08remove deprecated qmk json-keymap (#11823)Zach White
2021-02-08Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-08Fix RGBLIGHT_LIMIT_VAL typo (#11826)Ryan
2021-02-07Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-07Migrate some tmk_core files to quantum (#11791)Joel Challis
* Migrate some tmk_core files to quantum * Fix build errors
2021-02-07Merge remote-tracking branch 'origin/master' into developQMK Bot