1
0
Fork 0
forked from forks/qmk_firmware
Commit graph

15972 commits

Author SHA1 Message Date
Ryan a716517705
Fix line endings for geminate60.[ch] (#11878) 2021-02-12 22:35:32 -05:00
QMK Bot 6680aa6bdf Merge remote-tracking branch 'origin/master' into develop 2021-02-13 02:35:08 +00:00
MelGeek c2b0bd2a0a
[Keyboard] Update MOJO75 to support multi version (#11790)
* 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-12 21:34:34 -05:00
QMK Bot 5e3cd884eb Merge remote-tracking branch 'origin/master' into develop 2021-02-13 00:59:41 +00:00
James Young 6e74abc643
[Keyboard] tunks/ergo33: define RGBLight config at kb level (#11855) 2021-02-12 16:59:10 -08:00
QMK Bot c93dc18ddc Merge remote-tracking branch 'origin/master' into develop 2021-02-12 23:57:06 +00:00
Carlos bf1c40d682
[Docs] Add EEP_RST keycode to "Wiping the EEPROM" section (#11830) 2021-02-12 15:56:36 -08:00
QMK Bot 0edb99a255 Merge remote-tracking branch 'origin/master' into develop 2021-02-12 22:55:06 +00:00
Weirdo 548b874a16
[Keyboard] geminate60 keyboard (#11670)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-02-12 14:54:37 -08:00
QMK Bot 06a28d024f Merge remote-tracking branch 'origin/master' into develop 2021-02-12 20:51:59 +00:00
Brian Marsh 519032c61b
Adding custom keymap for Quark keyboard (#11744)
* adding pezhore keymap

* Adding sarcasm/irony mark, unicode emoji

* removing numpad layer enum

Co-authored-by: Brian Marsh <brian.marsh@rangelabs.io>
2021-02-12 15:51:23 -05:00
QMK Bot 85dd86c64e Merge remote-tracking branch 'origin/master' into develop 2021-02-12 19:16:13 +00:00
Stuart Fong bedb72b0bc
Add stuartfong1 Planck Layout (#11814)
* 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-12 14:15:38 -05:00
QMK Bot e617f1cfcc Merge remote-tracking branch 'origin/master' into develop 2021-02-12 18:47:01 +00:00
Christian Gurholt 22368ee49e
Rename ki folder to kifinnsson (#11853)
In preparation for migrating keymaps to userspace
2021-02-12 13:46:27 -05:00
QMK Bot b3c647bf7c Merge remote-tracking branch 'origin/master' into develop 2021-02-12 18:44:55 +00:00
Timothy Beck 3f71bc8e79
added dear_vehicle_owner meme keymap to planck keyboard (#11478)
* 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 8ba3d97af5.

* reverted commit that modified file in incorrect directory. modified intended file.

* added license tp config.h
2021-02-12 13:43:52 -05:00
QMK Bot 393f1ea38a Merge remote-tracking branch 'origin/master' into develop 2021-02-12 02:34:22 +00:00
Quentin 550359a4b4
[Keyboard] Add bastyl mini keyboard (#11782)
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-11 18:33:50 -08:00
QMK Bot 0b68c7441a Merge remote-tracking branch 'origin/master' into develop 2021-02-12 01:03:00 +00:00
Rozakiin bc74027f39
[Keyboard] Fix noxary Product IDs (#11771)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ruari <ruari.armstrong@gmail.com>
2021-02-11 17:02:28 -08:00
QMK Bot 02654ad2d7 Merge remote-tracking branch 'origin/master' into develop 2021-02-12 00:56:39 +00:00
MelGeek 068e11f7e2
[Keyboard] Support MJ65 - a 65% RGB Hotswap keyboard (#11764)
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-11 16:56:07 -08:00
QMK Bot 055cd47ba0 Merge remote-tracking branch 'origin/master' into develop 2021-02-11 18:54:29 +00:00
Kyle McCreery 6a5f29208e
[Docs] Update feature_haptic_feedback.md (#11859)
Arduino playground link to wiring diagram no longer works. Changed the link to point to the correct Adafruit hosted diagram pdf.
2021-02-11 10:53:55 -08:00
QMK Bot 986dc7f0e9 Merge remote-tracking branch 'origin/master' into develop 2021-02-10 19:18:29 +00:00
James Young 5a73558a21
[Keymap] add noroadsleft userspace; add and update keymaps (#11686) 2021-02-10 20:17:42 +01:00
QMK Bot 7ff713f35f Merge remote-tracking branch 'origin/master' into develop 2021-02-10 19:06:05 +00:00
Joschua Gandert 4b2ab84c71
[Keymap] Added german_gaming keymap for hidtech/bastyl (#11446)
* Added german_gaming keymap for hidtech/bastyl

* Apply suggestions from code review

* Added missing brace
2021-02-10 11:05:20 -08:00
QMK Bot 8d06a230c2 Merge remote-tracking branch 'origin/master' into develop 2021-02-10 14:22:21 +00:00
stanrc85 7ef4aba52c
Userspace updates (#11841)
* 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-10 09:21:46 -05:00
QMK Bot 0cd00b6c09 Merge remote-tracking branch 'origin/master' into develop 2021-02-10 05:19:52 +00:00
Spaceman 0aed8746be
[Keyboard] Add keyboard yun65 (#11714) 2021-02-09 21:18:53 -08:00
QMK Bot 527cf2f3cf Merge remote-tracking branch 'origin/master' into develop 2021-02-10 04:46:39 +00:00
Mike Tsao 872f656c3b
[Keyboard] Add sowbug/68keys and sowbug/ansi_tkl (#11589) 2021-02-09 20:45:42 -08:00
QMK Bot ded7b215be Merge remote-tracking branch 'origin/master' into develop 2021-02-10 02:00:17 +00:00
LSChyi fb9f619d89
Play Keyboard Helen 80: fix matrix mapping (#11585) 2021-02-09 17:58:59 -08:00
QMK Bot 36c7c66831 Merge remote-tracking branch 'origin/master' into develop 2021-02-09 22:40:48 +00:00
Konstantin Shpits 955eb58af5
Fix VENDOR_ID for ymd67 (#11838) 2021-02-10 09:40:16 +11:00
Drashna Jaelre 7161d65070
Remove FAUXCLICKY feature (deprecated) (#11829) 2021-02-09 09:49:05 -08:00
QMK Bot 738bd263c1 Merge remote-tracking branch 'origin/master' into develop 2021-02-09 17:11:54 +00:00
Nicolas Schodet 7d5902752e
[Keyboard] Add Splitty keyboard (#11613) 2021-02-09 09:10:54 -08:00
QMK Bot 9aed856d78 Merge remote-tracking branch 'origin/master' into develop 2021-02-09 14:59:41 +00:00
Jay Greco 4107856b70
Simplify NIBBLE encoder code and clean up keymaps (#11808)
* 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-09 14:50:16 +00:00
QMK Bot 39ed48f7a7 Merge remote-tracking branch 'origin/master' into develop 2021-02-08 21:33:45 +00:00
Sergey Vlasov 627ceebef3
ws2812: Fix number of nops for AVR at 8 MHz (#9559)
* 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-09 08:33:04 +11:00
Zach White 448cc1acd5
remove deprecated qmk json-keymap (#11823) 2021-02-08 11:03:08 +00:00
QMK Bot 248413489f Merge remote-tracking branch 'origin/master' into develop 2021-02-08 09:13:10 +00:00
Ryan d2f204c1e3
Fix RGBLIGHT_LIMIT_VAL typo (#11826) 2021-02-08 20:12:33 +11:00
QMK Bot 3a98bd75c8 Merge remote-tracking branch 'origin/master' into develop 2021-02-07 23:16:47 +00:00