~ruther/qmk_firmware: master

730a736e — fauxpark 5 years ago

Set proper ASCII character for KC_NUHS in iWRAP code (#7434)

a8320f20 — fauxpark 5 years ago

Improve support and docs for ADC driver (#7191)

* Improve support and docs for ADC driver

* Comment ADC channels

* Move to Makers and Modders section, and fix usage instructions

* Flesh out intro

* Superscript 328P note

* Fix pin_to_mux LUT

* Support USB64/1287 as well

* analogReadPin() defaults to 0V mux on invalid pin

* Update pinToMux() function documentation

* Dot

* Accept (some of) the `qmk cformat` changes

* Do clang-format properly

* More wording tweaks

* Link to encoder docs

f275ffbd — osjuga 5 years ago

Minor grammar and filename fixes in docs (#7559)

Grammar in coding_conventions_c.md and coding_conventions_python.md

`rule.mk` to `rules.mk` in feature_haptic_feedback.md and feature_rgb_matrix.md

36a6e269 — Eric Bunton 5 years ago

Port SPLIT_USB_DETECT to helix/rev2 (#7385)

* Port SPLIT_USB_DETECT to helix/rev2

* Remove debug toggles.

* Rename is_keyboard_master to has_usb in split_util

e8efc46e — Gregory Gubarev 5 years ago

[Docs] Creating RU version of getting_started_introduction (#7224)

* Creating RU version of getting_started_introduction

* Update docs/ru-ru/getting_started_introduction.md

Update "предполагается"

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

* Update docs/ru-ru/getting_started_introduction.md

Co-Authored-By: Nikita Titov <nekit94-08@mail.ru>

1b08a19e — Gregory Gubarev 5 years ago

[Docs] Create RU ver of becoming_a_qmk_collaborator (#7226)

* Create RU ver of becoming_a_qmk_collaborator

* Updated

* Updated - collaborator to соавтор

* Update docs/ru-ru/becoming_a_qmk_collaborator.md

* Update docs/ru-ru/becoming_a_qmk_collaborator.md

* Update docs/ru-ru/becoming_a_qmk_collaborator.md

* Update docs/ru-ru/becoming_a_qmk_collaborator.md

* Update docs/ru-ru/becoming_a_qmk_collaborator.md

* Update docs/ru-ru/becoming_a_qmk_collaborator.md

* Update docs/ru-ru/becoming_a_qmk_collaborator.md

Co-Authored-By: Nikita Titov <nekit94-08@mail.ru>

419128bf — Danny 5 years ago

[Keyboard] Fix missing item in Ergodicity macro (#7553)

2d256f48 — coseyfannitutti 5 years ago

Add keyboard - MYSTERIUM (#7547)

* Create config.h

* Create info.json

* Create keymap.c

* Create keymap.c

* Create mysterium.c

* Create mysterium.h

* Create readme.md

* Create rules.mk

* Create usbconfig.h

* Update keyboards/coseyfannitutti/mysterium/readme.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/coseyfannitutti/mysterium/readme.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/coseyfannitutti/mysterium/readme.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/coseyfannitutti/mysterium/usbconfig.h

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/coseyfannitutti/mysterium/usbconfig.h

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/coseyfannitutti/mysterium/usbconfig.h

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update mysterium.c

* Update rules.mk

* Update usbconfig.h

* Update keyboards/coseyfannitutti/mysterium/rules.mk

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/coseyfannitutti/mysterium/rules.mk

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/coseyfannitutti/mysterium/rules.mk

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/coseyfannitutti/mysterium/rules.mk

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/coseyfannitutti/mysterium/rules.mk

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/coseyfannitutti/mysterium/rules.mk

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/coseyfannitutti/mysterium/rules.mk

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/coseyfannitutti/mysterium/rules.mk

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/coseyfannitutti/mysterium/rules.mk

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update rules.mk

* Update keyboards/coseyfannitutti/mysterium/usbconfig.h

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/coseyfannitutti/mysterium/rules.mk

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update config.h

* Update info.json

* Update keymap.c

* Update mysterium.h

* Update rules.mk

380e05ad — arlenk 5 years ago

Update getting_started_make_guide.md (#7538)

* Update getting_started_make_guide.md

clarifying that NO_PRINT and USER_PRINT should not be used at the same time.

* Update docs/getting_started_make_guide.md

Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>

de4eb79c — Joel Challis 5 years ago

Fix breathing toggle when rgb is disabled (#7550)

be47f91b — jotix 5 years ago

Jotix (#7549)

* jotix_layout_adjustment

* TT(_LOWER)

* config.h

* jotix_layout

* jotix_layout

8030c17d — squirrelsRduck 5 years ago

[Keymap] Dactyl Manuform computer scientist's layout with split RGB enabled (#7519)

* Added my Dactyl Manuform layout

* Added my Dactyl Manuform layout

* finalized key layout, added reset code, no LED yet

* finalized key layout, added reset code, no LED yet

* enabled RGB backlight

* enabled RGB backlight

* enabled RGB backlight

* supporting split rgb

* supporting split rgb

* supporting split rgb

* added media controls

* allowing ctrl/command to fallthrough from mouse layer so we can ctrl scroll to zoom in/out

* addressed PR comments, and make a couple last minute adjustments to the layout, to add in the Forwards Delete keycode

* decreased brightness even more

9c8e66dc — Ahmed Elshafey 5 years ago

[Keymap] Added Massdrop ctrl keymap (#7491)

* massdrop ctrl endgame keymap first commit

* massdrop ctrl endgame keymap update

Added double dance functions to toggle mouse layer while keeping LGUI key functionality.
Added led config and related functionality.
Added RGB indicators for effective keys on layers.
Fixed RGB timeout ignoring user set LED flags.
At current state, layer RGB indicators ignore RGB brightness value, will add toggle key later to toggle between current keyboard brightness and max brightness as it's nice to have the indicator RGB at max brightness but still too bright at times.

* updated documentation and added RGB indicator for ctrl and shift in function layer

* Update keyboards/massdrop/ctrl/keymaps/endgame/keymap.c

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Update keyboards/massdrop/ctrl/keymaps/endgame/keymap.c

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* Various fixes and changes.

Removed backslashed at end of layouts, better looking.
Changed layout names from macro definitions to enum.
Replaced MOD_BIT with MOD_MASK macros.

3ad389de — fauxpark 5 years ago

Add short aliases for Magic keycodes (#7541)

* Add short alias for `MAGIC_TOGGLE_NKRO`

* Add aliases for the other Bootmagic keycodes

* Replace long form in default keymaps

66040506 — Jeong Arm 5 years ago

[Keymap] [preonic/kjwon15] Support led key (#7543)

d598f01c — Joel Challis 5 years ago

Relocate magic keycode processing (#7512)

* Move magic keycode processing to own file

* Save some bytes

* Update comments

* Update define to one thats not already used...

* Fix audio

1718dfa6 — Joel Challis 5 years ago

Increase matrix scanning speed on xd84 (#7517)

* Increase matrix scanning speed

* Fix func name in failure output

1c8208ad — MechMerlin 5 years ago

Add J-01 ISO Support (#7527)

* Add ISO support

* Update keyboards/jae/j01/info.json

Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>

583be4a5 — MakotoKurauchi 5 years ago

Helix default keymap update (#7465)

* add RGBRST key into helix/pico:default keymap ADJUST layer

* update helix/rev2:default keymap's OLED display contents

 * add RGBRST key to HELIX_ROWS == 4 ADJUST layer
 * add CAPS key to RAISE, LOWER layer
 * add layer status display on slave side oled
 * add RGB LED status display on both side oled
 * save stack memory size

24507ddc — halvves 5 years ago

[Keymap] add halvves kumo (minivan) keymap (#7534)

* [Keymap] add halvves kumo (minivan) keymap

* adjust tapping

* remove RGBLIGHT_TIMER